From fb2d7b9bf48340b5065611a8159840d8667c70c5 Mon Sep 17 00:00:00 2001
From: admin <salome-admin@opencascade.com>
Date: Mon, 24 May 2010 11:54:42 +0000
Subject: [PATCH] This commit was generated by cvs2git to create branch
 'BR_Prepare_to_SALOME_6x'.

Sprout from V6_main 2010-05-24 11:54:38 UTC inv <inv@opencascade.com> 'Changing version to 6.1.0'
Cherrypick from master 2009-03-06 09:28:28 UTC secher <secher> 'debug: forget of TRI6':
    adm_local/unix/config_files/check_libxml.m4
    adm_local_without_kernel/unix/config_files/check_pthreads.m4
    adm_local_without_kernel/unix/config_files/config.guess
    adm_local_without_kernel/unix/config_files/config.sub
    adm_local_without_kernel/unix/config_files/install-sh
    adm_local_without_kernel/unix/config_files/libtool.m4
    adm_local_without_kernel/unix/config_files/ltconfig
    adm_local_without_kernel/unix/config_files/ltmain.sh
    resources/Deff_fdt_5.8_castem_efmh_diff_conc_dom.med
    resources/Deff_fdt_5.8_castem_vf_diff_conc_dom.med
    resources/MED.config
    resources/MED_en.xml
    resources/Old_Deff_fdt_5.8_castem_efmh_diff_conc_dom.med
    resources/Old_Deff_fdt_5.8_castem_vf_diff_conc_dom.med
    src/INTERP_KERNEL/Geometric2D/AbstractEdge.cxx
    src/INTERP_KERNEL/Geometric2D/AbstractEdge.hxx
    src/INTERP_KERNEL/Geometric2D/Bounds.cxx
    src/INTERP_KERNEL/Geometric2D/Bounds.hxx
    src/INTERP_KERNEL/Geometric2D/ComposedEdge.cxx
    src/INTERP_KERNEL/Geometric2D/ComposedEdge.hxx
    src/INTERP_KERNEL/Geometric2D/Edge.cxx
    src/INTERP_KERNEL/Geometric2D/Edge.hxx
    src/INTERP_KERNEL/Geometric2D/Edge.txx
    src/INTERP_KERNEL/Geometric2D/EdgeArcCircle.cxx
    src/INTERP_KERNEL/Geometric2D/EdgeArcCircle.hxx
    src/INTERP_KERNEL/Geometric2D/EdgeInfLin.cxx
    src/INTERP_KERNEL/Geometric2D/EdgeInfLin.hxx
    src/INTERP_KERNEL/Geometric2D/EdgeLin.cxx
    src/INTERP_KERNEL/Geometric2D/EdgeLin.hxx
    src/INTERP_KERNEL/Geometric2D/ElementaryEdge.cxx
    src/INTERP_KERNEL/Geometric2D/ElementaryEdge.hxx
    src/INTERP_KERNEL/Geometric2D/Node.cxx
    src/INTERP_KERNEL/Geometric2D/Node.hxx
    src/INTERP_KERNEL/Geometric2D/Precision.cxx
    src/INTERP_KERNEL/Geometric2D/Precision.hxx
    src/INTERP_KERNEL/Geometric2D/QuadraticPolygon.cxx
    src/INTERP_KERNEL/Geometric2D/QuadraticPolygon.hxx
    src/INTERP_KERNEL/PolyhedronIntersector.hxx
    src/INTERP_KERNEL/PolyhedronIntersector.txx
    src/INTERP_KERNELTest/RemapperTest.hxx
    src/MEDCoupling/MEDCouplingSMesh.cxx
    src/MEDCoupling/MEDCouplingSMesh.hxx
    src/MEDCoupling/MemArray.cxx
    src/MEDCoupling/MemArray.hxx
    src/MEDCoupling/MemArray.txx
    src/MEDCoupling/RefCountObject.hxx
    src/MEDCoupling/TimeLabel.cxx
    src/MEDCoupling/TimeLabel.hxx
    src/MEDGUI/MED_images.po
    src/MEDGUI/MED_msg_en.po
    src/MEDGUI/MED_msg_fr.po
    src/MEDMEM/PointLocatorAlgos.txx
    src/MEDMEM/Remapper.cxx
    src/MEDMEM/Remapper.hxx
    src/ParaMEDMEM/IntersectionDEC.cxx
    src/ParaMEDMEM/IntersectionDEC.hxx
    src/ParaMEDMEM/MEDLoader/MEDLoader.cxx
    src/ParaMEDMEM/MEDLoader/MEDLoader.hxx
    src/ParaMEDMEM/MEDLoader/Makefile.am
    src/ParaMEDMEM/Test/MPIAccessDECTest.cxx
    src/ParaMEDMEM/Test/MPIAccessDECTest.hxx
    src/ParaMEDMEM/Test/MPIAccessTest.cxx
    src/ParaMEDMEM/Test/MPIAccessTest.hxx
    src/ParaMEDMEM/Test/MPIMainTest.hxx
    src/ParaMEDMEM/Test/Makefile.am
    src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx
    src/ParaMEDMEM/Test/ParaMEDMEMTest.hxx
    src/ParaMEDMEM/Test/ParaMEDMEMTest_BlockTopology.cxx
    src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx
    src/ParaMEDMEM/Test/ParaMEDMEMTest_MPIProcessorGroup.cxx
    src/ParaMEDMEM/Test/ParaMEDMEMTest_NonCoincidentDEC.cxx
    src/ParaMEDMEM/Test/ParaMEDMEMTest_StructuredCoincidentDEC.cxx
    src/ParaMEDMEM/Test/TestMPIAccess.cxx
    src/ParaMEDMEM/Test/TestMPIAccessDEC.cxx
    src/ParaMEDMEM/Test/TestParaMEDMEM.cxx
    src/ParaMEDMEM/Test/test_AllToAllDEC.cxx
    src/ParaMEDMEM/Test/test_AllToAllTimeDEC.cxx
    src/ParaMEDMEM/Test/test_AllToAllvDEC.cxx
    src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx
    src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx
    src/ParaMEDMEM/Test/test_MPI_Access_Cancel.cxx
    src/ParaMEDMEM/Test/test_MPI_Access_Cyclic_ISend_IRecv.cxx
    src/ParaMEDMEM/Test/test_MPI_Access_Cyclic_Send_Recv.cxx
    src/ParaMEDMEM/Test/test_MPI_Access_IProbe.cxx
    src/ParaMEDMEM/Test/test_MPI_Access_ISendRecv.cxx
    src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv.cxx
    src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_BottleNeck.cxx
    src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_Length.cxx
    src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_Length_1.cxx
    src/ParaMEDMEM/Test/test_MPI_Access_Probe.cxx
    src/ParaMEDMEM/Test/test_MPI_Access_SendRecv.cxx
    src/ParaMEDMEM/Test/test_MPI_Access_Send_Recv.cxx
    src/ParaMEDMEM/Test/test_MPI_Access_Send_Recv_Length.cxx
    src/ParaMEDMEM/Test/test_MPI_Access_Time.cxx
    src/ParaMEDMEM/Test/test_MPI_Access_Time_0.cxx
    src/ParaMEDMEM_Swig/test_IntersectionDEC.py
Delete:
    adm_local/cmake_files/FindXDR.cmake
    adm_local/unix/config_files/check_GUI.m4
    adm_local/unix/config_files/renumber.m4
    adm_local_without_kernel/cmake_files/FindMPI.cmake
    adm_local_without_kernel/cmake_files/FindPLATFORM.cmake
    adm_local_without_kernel/cmake_files/am2cmake.py
    adm_local_without_kernel/unix/config_files/DEPRECATED/check_pthreads.m4
    adm_local_without_kernel/unix/config_files/DEPRECATED/config.guess
    adm_local_without_kernel/unix/config_files/DEPRECATED/config.sub
    adm_local_without_kernel/unix/config_files/DEPRECATED/install-sh
    adm_local_without_kernel/unix/config_files/DEPRECATED/libtool.m4
    adm_local_without_kernel/unix/config_files/DEPRECATED/ltconfig
    adm_local_without_kernel/unix/config_files/DEPRECATED/ltmain.sh
    adm_local_without_kernel/unix/config_files/acx_pthread.m4
    adm_local_without_kernel/unix/config_files/check_htmlgen.m4
    adm_local_without_kernel/unix/config_files/check_libxml.m4
    adm_local_without_kernel/unix/config_files/local_install.m4
    doc/doxygen/images/head.png
    doc/doxygen/medcoupling.dox
    doc/doxygen/static/doxygen.css
    doc/doxygen/static/footer.html
    doc/doxygen/static/header.html.in
    doc/salome/tui/images/head.png
    doc/salome/tui/input/index.doc
    doc/salome/tui/static/header.html.in
    idl/MEDCouplingCorbaServant.idl
    idl/MEDCouplingCorbaServantTest.idl
    idl/ParaMEDCouplingCorbaServant.idl
    idl/ParaMEDMEMComponent.idl
    resources/Mesh3D_10_2d1.med
    resources/Mesh3D_10_2d2.med
    resources/Mesh3D_11.med
    resources/Test2D.med
    resources/Test2Dpoly.med
    resources/Test3D.med
    resources/Test3Dpoly.med
    resources/testStructCart3D.med
    src/INTERP_KERNEL/Bases/InterpKernelHashFun.hxx
    src/INTERP_KERNEL/Bases/InterpKernelHashMap.hxx
    src/INTERP_KERNEL/Bases/InterpKernelHashTable.hxx
    src/INTERP_KERNEL/Bases/InterpKernelStlExt.hxx
    src/INTERP_KERNEL/CurveIntersector.hxx
    src/INTERP_KERNEL/CurveIntersector.txx
    src/INTERP_KERNEL/CurveIntersectorP0P0.hxx
    src/INTERP_KERNEL/CurveIntersectorP0P0.txx
    src/INTERP_KERNEL/CurveIntersectorP0P1.hxx
    src/INTERP_KERNEL/CurveIntersectorP0P1.txx
    src/INTERP_KERNEL/CurveIntersectorP1P0.hxx
    src/INTERP_KERNEL/CurveIntersectorP1P0.txx
    src/INTERP_KERNEL/CurveIntersectorP1P1.hxx
    src/INTERP_KERNEL/CurveIntersectorP1P1.txx
    src/INTERP_KERNEL/DirectedBoundingBox.cxx
    src/INTERP_KERNEL/DirectedBoundingBox.hxx
    src/INTERP_KERNEL/ExprEval/INTERPKERNELEXPREVALDefines.hxx
    src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.cxx
    src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.hxx
    src/INTERP_KERNEL/ExprEval/InterpKernelFunction.cxx
    src/INTERP_KERNEL/ExprEval/InterpKernelFunction.hxx
    src/INTERP_KERNEL/ExprEval/InterpKernelUnit.cxx
    src/INTERP_KERNEL/ExprEval/InterpKernelUnit.hxx
    src/INTERP_KERNEL/ExprEval/InterpKernelValue.cxx
    src/INTERP_KERNEL/ExprEval/InterpKernelValue.hxx
    src/INTERP_KERNEL/ExprEval/Makefile.am
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DAbstractEdge.cxx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DAbstractEdge.hxx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DBounds.cxx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DBounds.hxx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DComposedEdge.cxx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DComposedEdge.hxx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.cxx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.hxx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.txx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeArcCircle.cxx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeArcCircle.hxx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeInfLin.cxx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeInfLin.hxx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeLin.cxx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeLin.hxx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DElementaryEdge.cxx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DElementaryEdge.hxx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.cxx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DPrecision.cxx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DPrecision.hxx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DQuadraticPolygon.cxx
    src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DQuadraticPolygon.hxx
    src/INTERP_KERNEL/IntegralUniformIntersector.hxx
    src/INTERP_KERNEL/IntegralUniformIntersector.txx
    src/INTERP_KERNEL/Interpolation.txx
    src/INTERP_KERNEL/Interpolation1D.hxx
    src/INTERP_KERNEL/Interpolation1D.txx
    src/INTERP_KERNEL/Interpolation2DCurve.hxx
    src/INTERP_KERNEL/Interpolation2DCurve.txx
    src/INTERP_KERNEL/InterpolationCC.hxx
    src/INTERP_KERNEL/InterpolationCC.txx
    src/INTERP_KERNEL/InterpolationCU.hxx
    src/INTERP_KERNEL/InterpolationCU.txx
    src/INTERP_KERNEL/InterpolationCurve.hxx
    src/INTERP_KERNEL/InterpolationCurve.txx
    src/INTERP_KERNEL/InterpolationOptions.cxx
    src/INTERP_KERNEL/Intersector3DP1P0Bary.hxx
    src/INTERP_KERNEL/Intersector3DP1P0Bary.txx
    src/INTERP_KERNEL/Intersector3DP1P1.hxx
    src/INTERP_KERNEL/Intersector3DP1P1.txx
    src/INTERP_KERNEL/IntersectorCU.hxx
    src/INTERP_KERNEL/IntersectorCU.txx
    src/INTERP_KERNEL/IntersectorCU1D.hxx
    src/INTERP_KERNEL/IntersectorCU1D.txx
    src/INTERP_KERNEL/IntersectorCU2D.hxx
    src/INTERP_KERNEL/IntersectorCU2D.txx
    src/INTERP_KERNEL/IntersectorCU3D.hxx
    src/INTERP_KERNEL/IntersectorCU3D.txx
    src/INTERP_KERNEL/PlanarIntersectorP0P1PL.hxx
    src/INTERP_KERNEL/PlanarIntersectorP0P1PL.txx
    src/INTERP_KERNEL/PlanarIntersectorP1P0Bary.hxx
    src/INTERP_KERNEL/PlanarIntersectorP1P0Bary.txx
    src/INTERP_KERNEL/PlanarIntersectorP1P0PL.hxx
    src/INTERP_KERNEL/PlanarIntersectorP1P0PL.txx
    src/INTERP_KERNEL/PlanarIntersectorP1P1.hxx
    src/INTERP_KERNEL/PlanarIntersectorP1P1.txx
    src/INTERP_KERNEL/PlanarIntersectorP1P1PL.hxx
    src/INTERP_KERNEL/PlanarIntersectorP1P1PL.txx
    src/INTERP_KERNEL/PointLocator2DIntersector.hxx
    src/INTERP_KERNEL/PointLocator2DIntersector.txx
    src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.hxx
    src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.txx
    src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.hxx
    src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.txx
    src/INTERP_KERNEL/PointLocator3DIntersectorP1P0.hxx
    src/INTERP_KERNEL/PointLocator3DIntersectorP1P0.txx
    src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.hxx
    src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.txx
    src/INTERP_KERNEL/PointLocatorAlgos.txx
    src/INTERP_KERNEL/PolyhedronIntersectorP0P0.hxx
    src/INTERP_KERNEL/PolyhedronIntersectorP0P0.txx
    src/INTERP_KERNEL/PolyhedronIntersectorP1P0Bary.hxx
    src/INTERP_KERNEL/PolyhedronIntersectorP1P0Bary.txx
    src/INTERP_KERNEL/PolyhedronIntersectorP1P1.hxx
    src/INTERP_KERNEL/PolyhedronIntersectorP1P1.txx
    src/INTERP_KERNEL/VolSurfUser.hxx
    src/INTERP_KERNEL/VolSurfUser.txx
    src/INTERP_KERNELTest/ExprEvalInterpTest.cxx
    src/INTERP_KERNELTest/ExprEvalInterpTest.hxx
    src/INTERP_KERNELTest/InterpKernelTestExport.hxx
    src/INTERP_KERNELTest/TestInterpKernelUtils.cxx
    src/INTERP_KERNELTest/TestInterpKernelUtils.hxx
    src/MEDCoupling/MEDCoupling.hxx
    src/MEDCoupling/MEDCouplingCMesh.cxx
    src/MEDCoupling/MEDCouplingCMesh.hxx
    src/MEDCoupling/MEDCouplingExtrudedMesh.cxx
    src/MEDCoupling/MEDCouplingExtrudedMesh.hxx
    src/MEDCoupling/MEDCouplingFieldDiscretization.cxx
    src/MEDCoupling/MEDCouplingFieldDiscretization.hxx
    src/MEDCoupling/MEDCouplingMemArray.cxx
    src/MEDCoupling/MEDCouplingMemArray.hxx
    src/MEDCoupling/MEDCouplingMemArray.txx
    src/MEDCoupling/MEDCouplingMesh.cxx
    src/MEDCoupling/MEDCouplingNatureOfField.hxx
    src/MEDCoupling/MEDCouplingNormalizedCartesianMesh.hxx
    src/MEDCoupling/MEDCouplingNormalizedCartesianMesh.txx
    src/MEDCoupling/MEDCouplingPointSet.cxx
    src/MEDCoupling/MEDCouplingPointSet.hxx
    src/MEDCoupling/MEDCouplingPointSet.txx
    src/MEDCoupling/MEDCouplingRefCountObject.cxx
    src/MEDCoupling/MEDCouplingRefCountObject.hxx
    src/MEDCoupling/MEDCouplingRemapper.cxx
    src/MEDCoupling/MEDCouplingRemapper.hxx
    src/MEDCoupling/MEDCouplingTimeDiscretization.cxx
    src/MEDCoupling/MEDCouplingTimeDiscretization.hxx
    src/MEDCoupling/MEDCouplingTimeLabel.cxx
    src/MEDCoupling/MEDCouplingTimeLabel.hxx
    src/MEDCoupling/MEDCouplingUMeshDesc.cxx
    src/MEDCoupling/MEDCouplingUMeshDesc.hxx
    src/MEDCoupling/Test/MEDCouplingBasicsTest0.cxx
    src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx
    src/MEDCoupling/Test/MEDCouplingBasicsTestData1.hxx
    src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx
    src/MEDCoupling/Test/MEDCouplingRemapperTest.cxx
    src/MEDCoupling/Test/MEDCouplingRemapperTest.hxx
    src/MEDCoupling/Test/TestMEDCouplingRemapper.cxx
    src/MEDCouplingCorba/Client/MEDCouplingClient.hxx
    src/MEDCouplingCorba/Client/MEDCouplingFieldDoubleClient.cxx
    src/MEDCouplingCorba/Client/MEDCouplingFieldDoubleClient.hxx
    src/MEDCouplingCorba/Client/MEDCouplingMeshClient.cxx
    src/MEDCouplingCorba/Client/MEDCouplingMeshClient.hxx
    src/MEDCouplingCorba/Client/MEDCouplingUMeshClient.cxx
    src/MEDCouplingCorba/Client/MEDCouplingUMeshClient.hxx
    src/MEDCouplingCorba/Client/Makefile.am
    src/MEDCouplingCorba/MEDCouplingCorba.hxx
    src/MEDCouplingCorba/MEDCouplingFieldDoubleServant.cxx
    src/MEDCouplingCorba/MEDCouplingFieldDoubleServant.hxx
    src/MEDCouplingCorba/MEDCouplingFieldServant.cxx
    src/MEDCouplingCorba/MEDCouplingFieldServant.hxx
    src/MEDCouplingCorba/MEDCouplingMeshServant.cxx
    src/MEDCouplingCorba/MEDCouplingMeshServant.hxx
    src/MEDCouplingCorba/MEDCouplingPointSetServant.cxx
    src/MEDCouplingCorba/MEDCouplingPointSetServant.hxx
    src/MEDCouplingCorba/MEDCouplingRefCountServant.cxx
    src/MEDCouplingCorba/MEDCouplingRefCountServant.hxx
    src/MEDCouplingCorba/MEDCouplingUMeshServant.cxx
    src/MEDCouplingCorba/MEDCouplingUMeshServant.hxx
    src/MEDCouplingCorba/Makefile.am
    src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponent.cxx
    src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponent.hxx
    src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponentClt.cxx
    src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponentClt.hxx
    src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponentServ.cxx
    src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponentServ.hxx
    src/MEDCouplingCorba/Test/Makefile.am
    src/MEDCouplingCorba/Test/TestMEDCouplingCorbaClt.cxx
    src/MEDCouplingCorba/Test/TestMEDCouplingCorbaServ.cxx
    src/MEDCouplingCorba_Swig/Client/Makefile.am
    src/MEDCouplingCorba_Swig/Client/libMEDCouplingClient_Swig.i
    src/MEDCouplingCorba_Swig/MEDCouplingCorbaSwigTest.py
    src/MEDCouplingCorba_Swig/MEDCouplingCorbaSwigTestClt.py
    src/MEDCouplingCorba_Swig/MEDCouplingCorbaSwigTestServ.py
    src/MEDCouplingCorba_Swig/Makefile.am
    src/MEDCouplingCorba_Swig/TestMEDCouplingCorbaClt.py
    src/MEDCouplingCorba_Swig/TestMEDCouplingCorbaServ.py
    src/MEDCouplingCorba_Swig/libMEDCouplingClient_Swig.i
    src/MEDCouplingCorba_Swig/libMEDCouplingCorba_Swig.i
    src/MEDCoupling_Swig/MEDCouplingBasicsTest.py
    src/MEDCoupling_Swig/MEDCouplingRemapperTest.py
    src/MEDCoupling_Swig/MEDCouplingTypemaps.i
    src/MEDCoupling_Swig/Makefile.am
    src/MEDCoupling_Swig/libMEDCouplingRemapper_Swig.i
    src/MEDCoupling_Swig/libMEDCoupling_Swig.i
    src/MEDLoader/MEDLoader.cxx
    src/MEDLoader/MEDLoader.hxx
    src/MEDLoader/MEDLoaderBase.cxx
    src/MEDLoader/MEDLoaderBase.hxx
    src/MEDLoader/Makefile.am
    src/MEDLoader/Swig/Makefile.am
    src/MEDLoader/Swig/libMEDLoader_Swig.i
    src/MEDMEM/MEDMEM_RCBase.cxx
    src/MEDMEM/MEDMEM_Remapper.cxx
    src/MEDMEM/MEDMEM_Remapper.hxx
    src/MEDMEMBinTest/dumpInterpolation.cxx
    src/MEDMEMCppTest/MEDMEMCppTestExport.hxx
    src/MEDMEMCppTest/MEDMEMTest_DesactivateFacesComputation.cxx
    src/MEDMEMCppTest/MEDMEMTest_GetVolumeAbs.cxx
    src/MEDMEMCppTest/MEDMEMTest_PartialDescendingConnectivity.cxx
    src/MEDMEMCppTest/MEDMEMTest_Remapper.cxx
    src/MEDMEMCppTest/MEDMEMTest_Utils.cxx
    src/MEDMEMCppTest/MEDMEMTest_Utils.hxx
    src/MEDMEM_SWIG/avs2med
    src/MEDMEM_SWIG/med2sauv
    src/MEDMEM_SWIG/medutilities.py
    src/MEDMEM_SWIG/sauv2med
    src/MedClient/src/MEDClient.hxx
    src/ParaMEDCouplingCorba/Makefile.am
    src/ParaMEDCouplingCorba/ParaMEDCouplingFieldDoubleServant.cxx
    src/ParaMEDCouplingCorba/ParaMEDCouplingFieldDoubleServant.hxx
    src/ParaMEDCouplingCorba/ParaMEDCouplingUMeshServant.cxx
    src/ParaMEDCouplingCorba/ParaMEDCouplingUMeshServant.hxx
    src/ParaMEDLoader/Makefile.am
    src/ParaMEDLoader/ParaMEDLoader.cxx
    src/ParaMEDLoader/ParaMEDLoader.hxx
    src/ParaMEDMEM/ICoCoField.cxx
    src/ParaMEDMEM/ICoCoTrioField.cxx
    src/ParaMEDMEM/InterpKernelDEC.cxx
    src/ParaMEDMEM/InterpKernelDEC.hxx
    src/ParaMEDMEMComponent/MPIMEDCouplingFieldDoubleServant.cxx
    src/ParaMEDMEMComponent/MPIMEDCouplingFieldDoubleServant.hxx
    src/ParaMEDMEMComponent/Makefile.am
    src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.cxx
    src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.hxx
    src/ParaMEDMEMTest/MPIAccessDECTest.cxx
    src/ParaMEDMEMTest/MPIAccessDECTest.hxx
    src/ParaMEDMEMTest/MPIAccessTest.cxx
    src/ParaMEDMEMTest/MPIAccessTest.hxx
    src/ParaMEDMEMTest/MPIMainTest.hxx
    src/ParaMEDMEMTest/Makefile.am
    src/ParaMEDMEMTest/ParaMEDMEMTest.cxx
    src/ParaMEDMEMTest/ParaMEDMEMTest.hxx
    src/ParaMEDMEMTest/ParaMEDMEMTest_BlockTopology.cxx
    src/ParaMEDMEMTest/ParaMEDMEMTest_FabienAPI.cxx
    src/ParaMEDMEMTest/ParaMEDMEMTest_Gauthier1.cxx
    src/ParaMEDMEMTest/ParaMEDMEMTest_ICocoTrio.cxx
    src/ParaMEDMEMTest/ParaMEDMEMTest_InterpKernelDEC.cxx
    src/ParaMEDMEMTest/ParaMEDMEMTest_MEDLoader.cxx
    src/ParaMEDMEMTest/ParaMEDMEMTest_MPIProcessorGroup.cxx
    src/ParaMEDMEMTest/ParaMEDMEMTest_NonCoincidentDEC.cxx
    src/ParaMEDMEMTest/ParaMEDMEMTest_StructuredCoincidentDEC.cxx
    src/ParaMEDMEMTest/TestMPIAccess.cxx
    src/ParaMEDMEMTest/TestMPIAccessDEC.cxx
    src/ParaMEDMEMTest/TestParaMEDMEM.cxx
    src/ParaMEDMEMTest/test_AllToAllDEC.cxx
    src/ParaMEDMEMTest/test_AllToAllTimeDEC.cxx
    src/ParaMEDMEMTest/test_AllToAllvDEC.cxx
    src/ParaMEDMEMTest/test_AllToAllvTimeDEC.cxx
    src/ParaMEDMEMTest/test_AllToAllvTimeDoubleDEC.cxx
    src/ParaMEDMEMTest/test_MPI_Access_Cancel.cxx
    src/ParaMEDMEMTest/test_MPI_Access_Cyclic_ISend_IRecv.cxx
    src/ParaMEDMEMTest/test_MPI_Access_Cyclic_Send_Recv.cxx
    src/ParaMEDMEMTest/test_MPI_Access_IProbe.cxx
    src/ParaMEDMEMTest/test_MPI_Access_ISendRecv.cxx
    src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv.cxx
    src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_BottleNeck.cxx
    src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length.cxx
    src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length_1.cxx
    src/ParaMEDMEMTest/test_MPI_Access_Probe.cxx
    src/ParaMEDMEMTest/test_MPI_Access_SendRecv.cxx
    src/ParaMEDMEMTest/test_MPI_Access_Send_Recv.cxx
    src/ParaMEDMEMTest/test_MPI_Access_Send_Recv_Length.cxx
    src/ParaMEDMEMTest/test_MPI_Access_Time.cxx
    src/ParaMEDMEMTest/test_MPI_Access_Time_0.cxx
    src/ParaMEDMEMTest/test_perf.cxx
    src/ParaMEDMEM_Swig/test_InterpKernelDEC.py
    src/RENUMBER/Makefile.am
    src/RENUMBER/RENUMBER_BOOSTRenumbering.cxx
    src/RENUMBER/RENUMBER_BOOSTRenumbering.hxx
    src/RENUMBER/RENUMBER_METISRenumbering.cxx
    src/RENUMBER/RENUMBER_METISRenumbering.hxx
    src/RENUMBER/RENUMBER_Renumbering.cxx
    src/RENUMBER/RENUMBER_Renumbering.hxx
    src/RENUMBER/RenumberingFactory.cxx
    src/RENUMBER/RenumberingFactory.hxx
    src/RENUMBER/renumbering.cxx
    src/RENUMBER/testRenumbering.py
---
 adm_local/unix/config_files/renumber.m4       |   57 -
 doc/doxygen/images/head.png                   |  Bin 78545 -> 0 bytes
 doc/doxygen/medcoupling.dox                   |  411 ---
 doc/doxygen/static/doxygen.css                |  468 ----
 doc/doxygen/static/footer.html                |   13 -
 doc/doxygen/static/header.html.in             |   10 -
 doc/salome/tui/images/head.png                |  Bin 78545 -> 0 bytes
 doc/salome/tui/input/index.doc                |   13 -
 doc/salome/tui/static/header.html.in          |   14 -
 resources/Mesh3D_11.med                       |  Bin 153532 -> 0 bytes
 resources/Test2D.med                          |  Bin 30380 -> 0 bytes
 resources/Test2Dpoly.med                      |  Bin 22084 -> 0 bytes
 resources/Test3D.med                          |  Bin 27300 -> 0 bytes
 resources/Test3Dpoly.med                      |  Bin 16680 -> 0 bytes
 .../Bases/InterpKernelHashFun.hxx             |  135 -
 .../Bases/InterpKernelHashMap.hxx             |  403 ---
 .../Bases/InterpKernelHashTable.hxx           |  995 --------
 .../Bases/InterpKernelStlExt.hxx              |   43 -
 src/INTERP_KERNEL/CurveIntersector.hxx        |   74 -
 src/INTERP_KERNEL/CurveIntersector.txx        |  397 ---
 src/INTERP_KERNEL/CurveIntersectorP0P0.hxx    |   47 -
 src/INTERP_KERNEL/CurveIntersectorP0P0.txx    |   77 -
 src/INTERP_KERNEL/CurveIntersectorP0P1.hxx    |   47 -
 src/INTERP_KERNEL/CurveIntersectorP0P1.txx    |   95 -
 src/INTERP_KERNEL/CurveIntersectorP1P0.hxx    |   45 -
 src/INTERP_KERNEL/CurveIntersectorP1P0.txx    |   95 -
 src/INTERP_KERNEL/CurveIntersectorP1P1.hxx    |   47 -
 src/INTERP_KERNEL/CurveIntersectorP1P1.txx    |   90 -
 src/INTERP_KERNEL/DirectedBoundingBox.cxx     |  749 ------
 src/INTERP_KERNEL/DirectedBoundingBox.hxx     |  118 -
 .../ExprEval/INTERPKERNELEXPREVALDefines.hxx  |   41 -
 .../ExprEval/InterpKernelExprParser.cxx       |  693 ------
 .../ExprEval/InterpKernelExprParser.hxx       |  117 -
 .../ExprEval/InterpKernelFunction.cxx         |  568 -----
 .../ExprEval/InterpKernelFunction.hxx         |  253 --
 .../ExprEval/InterpKernelUnit.cxx             |  372 ---
 .../ExprEval/InterpKernelUnit.hxx             |  117 -
 .../ExprEval/InterpKernelValue.cxx            |  425 ----
 .../ExprEval/InterpKernelValue.hxx            |  157 --
 src/INTERP_KERNEL/ExprEval/Makefile.am        |   55 -
 ...Geo2DAbstractEdge.cxx => AbstractEdge.cxx} |    9 +-
 ...Geo2DAbstractEdge.hxx => AbstractEdge.hxx} |   11 +-
 ...InterpKernelGeo2DBounds.cxx => Bounds.cxx} |   13 +-
 ...InterpKernelGeo2DBounds.hxx => Bounds.hxx} |    9 +-
 ...Geo2DComposedEdge.cxx => ComposedEdge.cxx} |  101 +-
 ...Geo2DComposedEdge.hxx => ComposedEdge.hxx} |   11 +-
 .../{InterpKernelGeo2DEdge.cxx => Edge.cxx}   |   36 +-
 .../{InterpKernelGeo2DEdge.hxx => Edge.hxx}   |   13 +-
 .../{InterpKernelGeo2DEdge.txx => Edge.txx}   |    8 +-
 ...o2DEdgeArcCircle.cxx => EdgeArcCircle.cxx} |   14 +-
 ...o2DEdgeArcCircle.hxx => EdgeArcCircle.hxx} |   16 +-
 ...rnelGeo2DEdgeInfLin.cxx => EdgeInfLin.cxx} |    5 +-
 ...rnelGeo2DEdgeInfLin.hxx => EdgeInfLin.hxx} |    9 +-
 ...terpKernelGeo2DEdgeLin.cxx => EdgeLin.cxx} |   12 +-
 ...terpKernelGeo2DEdgeLin.hxx => EdgeLin.hxx} |   12 +-
 ...DElementaryEdge.cxx => ElementaryEdge.cxx} |    7 +-
 ...DElementaryEdge.hxx => ElementaryEdge.hxx} |   11 +-
 .../{InterpKernelGeo2DNode.cxx => Node.cxx}   |    8 +-
 .../{InterpKernelGeo2DNode.hxx => Node.hxx}   |    9 +-
 ...KernelGeo2DPrecision.cxx => Precision.cxx} |    5 +-
 ...KernelGeo2DPrecision.hxx => Precision.hxx} |    7 +-
 ...draticPolygon.cxx => QuadraticPolygon.cxx} |  176 +-
 ...draticPolygon.hxx => QuadraticPolygon.hxx} |   17 +-
 .../IntegralUniformIntersector.hxx            |   71 -
 .../IntegralUniformIntersector.txx            |  155 --
 src/INTERP_KERNEL/Interpolation.txx           |   76 -
 src/INTERP_KERNEL/Interpolation1D.txx         |   26 -
 src/INTERP_KERNEL/Interpolation2DCurve.hxx    |   38 -
 src/INTERP_KERNEL/Interpolation2DCurve.txx    |   63 -
 src/INTERP_KERNEL/InterpolationCC.hxx         |   51 -
 src/INTERP_KERNEL/InterpolationCC.txx         |  248 --
 src/INTERP_KERNEL/InterpolationCU.hxx         |   47 -
 src/INTERP_KERNEL/InterpolationCU.txx         |  237 --
 src/INTERP_KERNEL/InterpolationCurve.hxx      |   43 -
 src/INTERP_KERNEL/InterpolationCurve.txx      |  176 --
 src/INTERP_KERNEL/InterpolationOptions.cxx    |  209 --
 src/INTERP_KERNEL/Intersector3DP1P0Bary.hxx   |   37 -
 src/INTERP_KERNEL/Intersector3DP1P0Bary.txx   |   45 -
 src/INTERP_KERNEL/Intersector3DP1P1.hxx       |   37 -
 src/INTERP_KERNEL/Intersector3DP1P1.txx       |   45 -
 src/INTERP_KERNEL/IntersectorCU.hxx           |   78 -
 src/INTERP_KERNEL/IntersectorCU.txx           |  163 --
 src/INTERP_KERNEL/IntersectorCU1D.hxx         |   47 -
 src/INTERP_KERNEL/IntersectorCU1D.txx         |   82 -
 src/INTERP_KERNEL/IntersectorCU2D.hxx         |   47 -
 src/INTERP_KERNEL/IntersectorCU2D.txx         |   76 -
 src/INTERP_KERNEL/IntersectorCU3D.hxx         |   55 -
 src/INTERP_KERNEL/IntersectorCU3D.txx         |  156 --
 src/INTERP_KERNEL/PlanarIntersectorP0P1PL.hxx |   43 -
 src/INTERP_KERNEL/PlanarIntersectorP0P1PL.txx |   83 -
 .../PlanarIntersectorP1P0Bary.hxx             |   54 -
 .../PlanarIntersectorP1P0Bary.txx             |  116 -
 src/INTERP_KERNEL/PlanarIntersectorP1P0PL.hxx |   43 -
 src/INTERP_KERNEL/PlanarIntersectorP1P0PL.txx |  107 -
 src/INTERP_KERNEL/PlanarIntersectorP1P1.hxx   |   48 -
 src/INTERP_KERNEL/PlanarIntersectorP1P1.txx   |  100 -
 src/INTERP_KERNEL/PlanarIntersectorP1P1PL.hxx |   43 -
 src/INTERP_KERNEL/PlanarIntersectorP1P1PL.txx |   98 -
 .../PointLocator2DIntersector.hxx             |   55 -
 .../PointLocator2DIntersector.txx             |  164 --
 .../PointLocator3DIntersectorP0P0.hxx         |   45 -
 .../PointLocator3DIntersectorP0P0.txx         |   77 -
 .../PointLocator3DIntersectorP0P1.hxx         |   45 -
 .../PointLocator3DIntersectorP0P1.txx         |   80 -
 .../PointLocator3DIntersectorP1P0.hxx         |   45 -
 .../PointLocator3DIntersectorP1P0.txx         |   98 -
 .../PointLocator3DIntersectorP1P1.hxx         |   45 -
 .../PointLocator3DIntersectorP1P1.txx         |  101 -
 src/INTERP_KERNEL/PointLocatorAlgos.txx       |  222 --
 ...ctorP0P0.hxx => PolyhedronIntersector.hxx} |   13 +-
 ...ctorP0P0.txx => PolyhedronIntersector.txx} |   16 +-
 .../PolyhedronIntersectorP1P0Bary.hxx         |   64 -
 .../PolyhedronIntersectorP1P0Bary.txx         |  153 --
 .../PolyhedronIntersectorP1P1.hxx             |   55 -
 .../PolyhedronIntersectorP1P1.txx             |  133 -
 src/INTERP_KERNEL/VolSurfUser.hxx             |   34 -
 src/INTERP_KERNEL/VolSurfUser.txx             |  168 --
 src/INTERP_KERNELTest/ExprEvalInterpTest.cxx  |  380 ---
 src/INTERP_KERNELTest/ExprEvalInterpTest.hxx  |   54 -
 .../InterpKernelTestExport.hxx                |   33 -
 .../RemapperTest.hxx}                         |   43 +-
 .../TestInterpKernelUtils.cxx                 |   44 -
 .../TestInterpKernelUtils.hxx                 |   34 -
 src/MEDCoupling/MEDCoupling.hxx               |   47 -
 src/MEDCoupling/MEDCouplingCMesh.cxx          |  366 ---
 src/MEDCoupling/MEDCouplingCMesh.hxx          |   77 -
 src/MEDCoupling/MEDCouplingExtrudedMesh.cxx   |  472 ----
 src/MEDCoupling/MEDCouplingExtrudedMesh.hxx   |   88 -
 .../MEDCouplingFieldDiscretization.cxx        |  315 ---
 .../MEDCouplingFieldDiscretization.hxx        |  106 -
 src/MEDCoupling/MEDCouplingMemArray.cxx       |  389 ---
 src/MEDCoupling/MEDCouplingMemArray.hxx       |  170 --
 src/MEDCoupling/MEDCouplingMesh.cxx           |  149 --
 src/MEDCoupling/MEDCouplingNatureOfField.hxx  |   35 -
 .../MEDCouplingNormalizedCartesianMesh.hxx    |   52 -
 .../MEDCouplingNormalizedCartesianMesh.txx    |   57 -
 src/MEDCoupling/MEDCouplingPointSet.cxx       |  715 ------
 src/MEDCoupling/MEDCouplingPointSet.hxx       |  102 -
 src/MEDCoupling/MEDCouplingPointSet.txx       |   68 -
 src/MEDCoupling/MEDCouplingRemapper.cxx       |  567 -----
 src/MEDCoupling/MEDCouplingRemapper.hxx       |   87 -
 src/MEDCoupling/MEDCouplingSMesh.cxx          |  164 ++
 src/MEDCoupling/MEDCouplingSMesh.hxx          |   53 +
 .../MEDCouplingTimeDiscretization.cxx         | 1064 --------
 .../MEDCouplingTimeDiscretization.hxx         |  260 --
 src/MEDCoupling/MEDCouplingUMeshDesc.cxx      |  389 ---
 src/MEDCoupling/MEDCouplingUMeshDesc.hxx      |   85 -
 src/MEDCoupling/MemArray.cxx                  |   82 +
 src/MEDCoupling/MemArray.hxx                  |  116 +
 .../{MEDCouplingMemArray.txx => MemArray.txx} |   77 +-
 ...gRefCountObject.hxx => RefCountObject.hxx} |   33 +-
 .../Test/MEDCouplingBasicsTest0.cxx           |  688 -----
 .../Test/MEDCouplingBasicsTest1.cxx           | 1881 --------------
 .../Test/MEDCouplingBasicsTestData1.hxx       | 1166 ---------
 .../Test/MEDCouplingBasicsTestInterp.cxx      | 2213 -----------------
 .../Test/MEDCouplingRemapperTest.cxx          |  986 --------
 .../Test/MEDCouplingRemapperTest.hxx          |   58 -
 .../Test/TestMEDCouplingRemapper.cxx          |   25 -
 ...MEDCouplingTimeLabel.cxx => TimeLabel.cxx} |    9 +-
 ...MEDCouplingTimeLabel.hxx => TimeLabel.hxx} |    9 +-
 src/MEDCoupling_Swig/MEDCouplingBasicsTest.py |   85 -
 .../MEDCouplingRemapperTest.py                |   86 -
 src/MEDCoupling_Swig/MEDCouplingTypemaps.i    |  128 -
 src/MEDCoupling_Swig/Makefile.am              |   61 -
 .../libMEDCouplingRemapper_Swig.i             |   42 -
 src/MEDCoupling_Swig/libMEDCoupling_Swig.i    |  242 --
 src/MEDLoader/MEDLoader.cxx                   | 1347 ----------
 src/MEDLoader/MEDLoader.hxx                   |   98 -
 src/MEDLoader/MEDLoaderBase.cxx               |   61 -
 src/MEDLoader/MEDLoaderBase.hxx               |   35 -
 src/MEDLoader/Makefile.am                     |   44 -
 src/MEDLoader/Swig/Makefile.am                |   54 -
 src/MEDLoader/Swig/libMEDLoader_Swig.i        |   71 -
 src/ParaMEDLoader/ParaMEDLoader.cxx           |   64 -
 src/ParaMEDLoader/ParaMEDLoader.hxx           |   41 -
 src/ParaMEDMEM/ICoCoField.cxx                 |   51 -
 src/ParaMEDMEM/ICoCoTrioField.cxx             |  265 --
 ...nterpKernelDEC.cxx => IntersectionDEC.cxx} |   98 +-
 ...nterpKernelDEC.hxx => IntersectionDEC.hxx} |   18 +-
 src/ParaMEDMEM/MEDLoader/MEDLoader.cxx        |  418 ++++
 src/ParaMEDMEM/MEDLoader/MEDLoader.hxx        |   69 +
 .../MEDLoader}/Makefile.am                    |   31 +-
 .../Test}/MPIAccessDECTest.cxx                |    3 +-
 .../Test}/MPIAccessDECTest.hxx                |    3 +-
 .../Test}/MPIAccessTest.cxx                   |    3 +-
 .../Test}/MPIAccessTest.hxx                   |    3 +-
 .../Test}/MPIMainTest.hxx                     |   10 +-
 src/ParaMEDMEM/Test/Makefile.am               |  102 +
 .../Test/ParaMEDMEMTest.cxx}                  |   40 +-
 src/ParaMEDMEM/Test/ParaMEDMEMTest.hxx        |  136 +
 .../Test}/ParaMEDMEMTest_BlockTopology.cxx    |    3 +-
 .../Test/ParaMEDMEMTest_IntersectionDEC.cxx   |  541 ++++
 .../ParaMEDMEMTest_MPIProcessorGroup.cxx      |    3 +-
 .../Test}/ParaMEDMEMTest_NonCoincidentDEC.cxx |   23 +-
 ...ParaMEDMEMTest_StructuredCoincidentDEC.cxx |   33 +-
 .../Test}/TestMPIAccess.cxx                   |    4 +-
 .../Test}/TestMPIAccessDEC.cxx                |    4 +-
 .../Test}/TestParaMEDMEM.cxx                  |    4 +-
 .../Test}/test_AllToAllDEC.cxx                |    3 +-
 .../Test}/test_AllToAllTimeDEC.cxx            |    3 +-
 .../Test}/test_AllToAllvDEC.cxx               |    3 +-
 .../Test}/test_AllToAllvTimeDEC.cxx           |   23 +-
 .../Test}/test_AllToAllvTimeDoubleDEC.cxx     |   41 +-
 .../Test}/test_MPI_Access_Cancel.cxx          |    3 +-
 .../test_MPI_Access_Cyclic_ISend_IRecv.cxx    |    3 +-
 .../test_MPI_Access_Cyclic_Send_Recv.cxx      |    3 +-
 .../Test}/test_MPI_Access_IProbe.cxx          |    3 +-
 .../Test}/test_MPI_Access_ISendRecv.cxx       |    3 +-
 .../Test}/test_MPI_Access_ISend_IRecv.cxx     |    3 +-
 ...test_MPI_Access_ISend_IRecv_BottleNeck.cxx |    3 +-
 .../test_MPI_Access_ISend_IRecv_Length.cxx    |    3 +-
 .../test_MPI_Access_ISend_IRecv_Length_1.cxx  |    3 +-
 .../Test}/test_MPI_Access_Probe.cxx           |    3 +-
 .../Test}/test_MPI_Access_SendRecv.cxx        |    3 +-
 .../Test}/test_MPI_Access_Send_Recv.cxx       |    3 +-
 .../test_MPI_Access_Send_Recv_Length.cxx      |    3 +-
 .../Test}/test_MPI_Access_Time.cxx            |    3 +-
 .../Test}/test_MPI_Access_Time_0.cxx          |    3 +-
 src/ParaMEDMEMTest/Makefile.am                |  107 -
 src/ParaMEDMEMTest/ParaMEDMEMTest.cxx         |  128 -
 src/ParaMEDMEMTest/ParaMEDMEMTest.hxx         |  174 --
 .../ParaMEDMEMTest_FabienAPI.cxx              |  112 -
 .../ParaMEDMEMTest_Gauthier1.cxx              |  434 ----
 .../ParaMEDMEMTest_ICocoTrio.cxx              |  271 --
 .../ParaMEDMEMTest_InterpKernelDEC.cxx        | 1752 -------------
 .../ParaMEDMEMTest_MEDLoader.cxx              |  457 ----
 src/ParaMEDMEMTest/test_perf.cxx              |  337 ---
 src/ParaMEDMEM_Swig/test_InterpKernelDEC.py   |  121 -
 src/ParaMEDMEM_Swig/test_IntersectionDEC.py   |  148 ++
 src/RENUMBER/Makefile.am                      |   94 -
 src/RENUMBER/RENUMBER_BOOSTRenumbering.cxx    |   53 -
 src/RENUMBER/RENUMBER_BOOSTRenumbering.hxx    |   31 -
 src/RENUMBER/RENUMBER_METISRenumbering.cxx    |   34 -
 src/RENUMBER/RENUMBER_METISRenumbering.hxx    |   31 -
 src/RENUMBER/RENUMBER_Renumbering.cxx         |   19 -
 src/RENUMBER/RENUMBER_Renumbering.hxx         |   30 -
 src/RENUMBER/RenumberingFactory.cxx           |   83 -
 src/RENUMBER/RenumberingFactory.hxx           |   31 -
 src/RENUMBER/renumbering.cxx                  |  366 ---
 src/RENUMBER/testRenumbering.py               |  321 ---
 240 files changed, 2283 insertions(+), 33517 deletions(-)
 delete mode 100644 adm_local/unix/config_files/renumber.m4
 delete mode 100755 doc/doxygen/images/head.png
 delete mode 100644 doc/doxygen/medcoupling.dox
 delete mode 100644 doc/doxygen/static/doxygen.css
 delete mode 100755 doc/doxygen/static/footer.html
 delete mode 100755 doc/doxygen/static/header.html.in
 delete mode 100755 doc/salome/tui/images/head.png
 delete mode 100644 doc/salome/tui/input/index.doc
 delete mode 100755 doc/salome/tui/static/header.html.in
 delete mode 100644 resources/Mesh3D_11.med
 delete mode 100644 resources/Test2D.med
 delete mode 100644 resources/Test2Dpoly.med
 delete mode 100644 resources/Test3D.med
 delete mode 100644 resources/Test3Dpoly.med
 delete mode 100644 src/INTERP_KERNEL/Bases/InterpKernelHashFun.hxx
 delete mode 100644 src/INTERP_KERNEL/Bases/InterpKernelHashMap.hxx
 delete mode 100644 src/INTERP_KERNEL/Bases/InterpKernelHashTable.hxx
 delete mode 100644 src/INTERP_KERNEL/Bases/InterpKernelStlExt.hxx
 delete mode 100644 src/INTERP_KERNEL/CurveIntersector.hxx
 delete mode 100644 src/INTERP_KERNEL/CurveIntersector.txx
 delete mode 100644 src/INTERP_KERNEL/CurveIntersectorP0P0.hxx
 delete mode 100644 src/INTERP_KERNEL/CurveIntersectorP0P0.txx
 delete mode 100644 src/INTERP_KERNEL/CurveIntersectorP0P1.hxx
 delete mode 100644 src/INTERP_KERNEL/CurveIntersectorP0P1.txx
 delete mode 100644 src/INTERP_KERNEL/CurveIntersectorP1P0.hxx
 delete mode 100644 src/INTERP_KERNEL/CurveIntersectorP1P0.txx
 delete mode 100644 src/INTERP_KERNEL/CurveIntersectorP1P1.hxx
 delete mode 100644 src/INTERP_KERNEL/CurveIntersectorP1P1.txx
 delete mode 100644 src/INTERP_KERNEL/DirectedBoundingBox.cxx
 delete mode 100644 src/INTERP_KERNEL/DirectedBoundingBox.hxx
 delete mode 100644 src/INTERP_KERNEL/ExprEval/INTERPKERNELEXPREVALDefines.hxx
 delete mode 100644 src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.cxx
 delete mode 100644 src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.hxx
 delete mode 100644 src/INTERP_KERNEL/ExprEval/InterpKernelFunction.cxx
 delete mode 100644 src/INTERP_KERNEL/ExprEval/InterpKernelFunction.hxx
 delete mode 100644 src/INTERP_KERNEL/ExprEval/InterpKernelUnit.cxx
 delete mode 100644 src/INTERP_KERNEL/ExprEval/InterpKernelUnit.hxx
 delete mode 100644 src/INTERP_KERNEL/ExprEval/InterpKernelValue.cxx
 delete mode 100644 src/INTERP_KERNEL/ExprEval/InterpKernelValue.hxx
 delete mode 100644 src/INTERP_KERNEL/ExprEval/Makefile.am
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DAbstractEdge.cxx => AbstractEdge.cxx} (94%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DAbstractEdge.hxx => AbstractEdge.hxx} (88%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DBounds.cxx => Bounds.cxx} (92%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DBounds.hxx => Bounds.hxx} (94%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DComposedEdge.cxx => ComposedEdge.cxx} (72%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DComposedEdge.hxx => ComposedEdge.hxx} (92%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DEdge.cxx => Edge.cxx} (95%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DEdge.hxx => Edge.hxx} (98%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DEdge.txx => Edge.txx} (85%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DEdgeArcCircle.cxx => EdgeArcCircle.cxx} (99%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DEdgeArcCircle.hxx => EdgeArcCircle.hxx} (92%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DEdgeInfLin.cxx => EdgeInfLin.cxx} (91%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DEdgeInfLin.hxx => EdgeInfLin.hxx} (88%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DEdgeLin.cxx => EdgeLin.cxx} (97%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DEdgeLin.hxx => EdgeLin.hxx} (91%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DElementaryEdge.cxx => ElementaryEdge.cxx} (97%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DElementaryEdge.hxx => ElementaryEdge.hxx} (93%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DNode.cxx => Node.cxx} (96%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DNode.hxx => Node.hxx} (95%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DPrecision.cxx => Precision.cxx} (93%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DPrecision.hxx => Precision.hxx} (89%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DQuadraticPolygon.cxx => QuadraticPolygon.cxx} (77%)
 rename src/INTERP_KERNEL/Geometric2D/{InterpKernelGeo2DQuadraticPolygon.hxx => QuadraticPolygon.hxx} (89%)
 delete mode 100644 src/INTERP_KERNEL/IntegralUniformIntersector.hxx
 delete mode 100644 src/INTERP_KERNEL/IntegralUniformIntersector.txx
 delete mode 100644 src/INTERP_KERNEL/Interpolation.txx
 delete mode 100644 src/INTERP_KERNEL/Interpolation1D.txx
 delete mode 100644 src/INTERP_KERNEL/Interpolation2DCurve.hxx
 delete mode 100644 src/INTERP_KERNEL/Interpolation2DCurve.txx
 delete mode 100644 src/INTERP_KERNEL/InterpolationCC.hxx
 delete mode 100644 src/INTERP_KERNEL/InterpolationCC.txx
 delete mode 100644 src/INTERP_KERNEL/InterpolationCU.hxx
 delete mode 100644 src/INTERP_KERNEL/InterpolationCU.txx
 delete mode 100644 src/INTERP_KERNEL/InterpolationCurve.hxx
 delete mode 100644 src/INTERP_KERNEL/InterpolationCurve.txx
 delete mode 100644 src/INTERP_KERNEL/InterpolationOptions.cxx
 delete mode 100644 src/INTERP_KERNEL/Intersector3DP1P0Bary.hxx
 delete mode 100644 src/INTERP_KERNEL/Intersector3DP1P0Bary.txx
 delete mode 100644 src/INTERP_KERNEL/Intersector3DP1P1.hxx
 delete mode 100644 src/INTERP_KERNEL/Intersector3DP1P1.txx
 delete mode 100644 src/INTERP_KERNEL/IntersectorCU.hxx
 delete mode 100644 src/INTERP_KERNEL/IntersectorCU.txx
 delete mode 100644 src/INTERP_KERNEL/IntersectorCU1D.hxx
 delete mode 100644 src/INTERP_KERNEL/IntersectorCU1D.txx
 delete mode 100644 src/INTERP_KERNEL/IntersectorCU2D.hxx
 delete mode 100644 src/INTERP_KERNEL/IntersectorCU2D.txx
 delete mode 100644 src/INTERP_KERNEL/IntersectorCU3D.hxx
 delete mode 100644 src/INTERP_KERNEL/IntersectorCU3D.txx
 delete mode 100644 src/INTERP_KERNEL/PlanarIntersectorP0P1PL.hxx
 delete mode 100644 src/INTERP_KERNEL/PlanarIntersectorP0P1PL.txx
 delete mode 100644 src/INTERP_KERNEL/PlanarIntersectorP1P0Bary.hxx
 delete mode 100644 src/INTERP_KERNEL/PlanarIntersectorP1P0Bary.txx
 delete mode 100644 src/INTERP_KERNEL/PlanarIntersectorP1P0PL.hxx
 delete mode 100644 src/INTERP_KERNEL/PlanarIntersectorP1P0PL.txx
 delete mode 100644 src/INTERP_KERNEL/PlanarIntersectorP1P1.hxx
 delete mode 100644 src/INTERP_KERNEL/PlanarIntersectorP1P1.txx
 delete mode 100644 src/INTERP_KERNEL/PlanarIntersectorP1P1PL.hxx
 delete mode 100644 src/INTERP_KERNEL/PlanarIntersectorP1P1PL.txx
 delete mode 100644 src/INTERP_KERNEL/PointLocator2DIntersector.hxx
 delete mode 100644 src/INTERP_KERNEL/PointLocator2DIntersector.txx
 delete mode 100644 src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.hxx
 delete mode 100644 src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.txx
 delete mode 100644 src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.hxx
 delete mode 100644 src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.txx
 delete mode 100644 src/INTERP_KERNEL/PointLocator3DIntersectorP1P0.hxx
 delete mode 100644 src/INTERP_KERNEL/PointLocator3DIntersectorP1P0.txx
 delete mode 100644 src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.hxx
 delete mode 100644 src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.txx
 delete mode 100644 src/INTERP_KERNEL/PointLocatorAlgos.txx
 rename src/INTERP_KERNEL/{PolyhedronIntersectorP0P0.hxx => PolyhedronIntersector.hxx} (82%)
 rename src/INTERP_KERNEL/{PolyhedronIntersectorP0P0.txx => PolyhedronIntersector.txx} (80%)
 delete mode 100644 src/INTERP_KERNEL/PolyhedronIntersectorP1P0Bary.hxx
 delete mode 100644 src/INTERP_KERNEL/PolyhedronIntersectorP1P0Bary.txx
 delete mode 100644 src/INTERP_KERNEL/PolyhedronIntersectorP1P1.hxx
 delete mode 100644 src/INTERP_KERNEL/PolyhedronIntersectorP1P1.txx
 delete mode 100644 src/INTERP_KERNEL/VolSurfUser.hxx
 delete mode 100644 src/INTERP_KERNEL/VolSurfUser.txx
 delete mode 100644 src/INTERP_KERNELTest/ExprEvalInterpTest.cxx
 delete mode 100644 src/INTERP_KERNELTest/ExprEvalInterpTest.hxx
 delete mode 100644 src/INTERP_KERNELTest/InterpKernelTestExport.hxx
 rename src/{INTERP_KERNEL/Interpolation1D.hxx => INTERP_KERNELTest/RemapperTest.hxx} (57%)
 mode change 100755 => 100644
 delete mode 100644 src/INTERP_KERNELTest/TestInterpKernelUtils.cxx
 delete mode 100644 src/INTERP_KERNELTest/TestInterpKernelUtils.hxx
 delete mode 100644 src/MEDCoupling/MEDCoupling.hxx
 delete mode 100644 src/MEDCoupling/MEDCouplingCMesh.cxx
 delete mode 100644 src/MEDCoupling/MEDCouplingCMesh.hxx
 delete mode 100644 src/MEDCoupling/MEDCouplingExtrudedMesh.cxx
 delete mode 100644 src/MEDCoupling/MEDCouplingExtrudedMesh.hxx
 delete mode 100644 src/MEDCoupling/MEDCouplingFieldDiscretization.cxx
 delete mode 100644 src/MEDCoupling/MEDCouplingFieldDiscretization.hxx
 delete mode 100644 src/MEDCoupling/MEDCouplingMemArray.cxx
 delete mode 100644 src/MEDCoupling/MEDCouplingMemArray.hxx
 delete mode 100644 src/MEDCoupling/MEDCouplingMesh.cxx
 delete mode 100644 src/MEDCoupling/MEDCouplingNatureOfField.hxx
 delete mode 100644 src/MEDCoupling/MEDCouplingNormalizedCartesianMesh.hxx
 delete mode 100644 src/MEDCoupling/MEDCouplingNormalizedCartesianMesh.txx
 delete mode 100644 src/MEDCoupling/MEDCouplingPointSet.cxx
 delete mode 100644 src/MEDCoupling/MEDCouplingPointSet.hxx
 delete mode 100644 src/MEDCoupling/MEDCouplingPointSet.txx
 delete mode 100644 src/MEDCoupling/MEDCouplingRemapper.cxx
 delete mode 100644 src/MEDCoupling/MEDCouplingRemapper.hxx
 create mode 100644 src/MEDCoupling/MEDCouplingSMesh.cxx
 create mode 100644 src/MEDCoupling/MEDCouplingSMesh.hxx
 delete mode 100644 src/MEDCoupling/MEDCouplingTimeDiscretization.cxx
 delete mode 100644 src/MEDCoupling/MEDCouplingTimeDiscretization.hxx
 delete mode 100644 src/MEDCoupling/MEDCouplingUMeshDesc.cxx
 delete mode 100644 src/MEDCoupling/MEDCouplingUMeshDesc.hxx
 create mode 100644 src/MEDCoupling/MemArray.cxx
 create mode 100644 src/MEDCoupling/MemArray.hxx
 rename src/MEDCoupling/{MEDCouplingMemArray.txx => MemArray.txx} (52%)
 rename src/MEDCoupling/{MEDCouplingRefCountObject.hxx => RefCountObject.hxx} (62%)
 delete mode 100644 src/MEDCoupling/Test/MEDCouplingBasicsTest0.cxx
 delete mode 100644 src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx
 delete mode 100644 src/MEDCoupling/Test/MEDCouplingBasicsTestData1.hxx
 delete mode 100644 src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx
 delete mode 100644 src/MEDCoupling/Test/MEDCouplingRemapperTest.cxx
 delete mode 100644 src/MEDCoupling/Test/MEDCouplingRemapperTest.hxx
 delete mode 100644 src/MEDCoupling/Test/TestMEDCouplingRemapper.cxx
 rename src/MEDCoupling/{MEDCouplingTimeLabel.cxx => TimeLabel.cxx} (91%)
 rename src/MEDCoupling/{MEDCouplingTimeLabel.hxx => TimeLabel.hxx} (88%)
 delete mode 100644 src/MEDCoupling_Swig/MEDCouplingBasicsTest.py
 delete mode 100644 src/MEDCoupling_Swig/MEDCouplingRemapperTest.py
 delete mode 100644 src/MEDCoupling_Swig/MEDCouplingTypemaps.i
 delete mode 100644 src/MEDCoupling_Swig/Makefile.am
 delete mode 100644 src/MEDCoupling_Swig/libMEDCouplingRemapper_Swig.i
 delete mode 100644 src/MEDCoupling_Swig/libMEDCoupling_Swig.i
 delete mode 100644 src/MEDLoader/MEDLoader.cxx
 delete mode 100644 src/MEDLoader/MEDLoader.hxx
 delete mode 100644 src/MEDLoader/MEDLoaderBase.cxx
 delete mode 100644 src/MEDLoader/MEDLoaderBase.hxx
 delete mode 100755 src/MEDLoader/Makefile.am
 delete mode 100644 src/MEDLoader/Swig/Makefile.am
 delete mode 100644 src/MEDLoader/Swig/libMEDLoader_Swig.i
 delete mode 100644 src/ParaMEDLoader/ParaMEDLoader.cxx
 delete mode 100644 src/ParaMEDLoader/ParaMEDLoader.hxx
 delete mode 100644 src/ParaMEDMEM/ICoCoField.cxx
 delete mode 100644 src/ParaMEDMEM/ICoCoTrioField.cxx
 rename src/ParaMEDMEM/{InterpKernelDEC.cxx => IntersectionDEC.cxx} (78%)
 rename src/ParaMEDMEM/{InterpKernelDEC.hxx => IntersectionDEC.hxx} (75%)
 create mode 100644 src/ParaMEDMEM/MEDLoader/MEDLoader.cxx
 create mode 100644 src/ParaMEDMEM/MEDLoader/MEDLoader.hxx
 rename src/{ParaMEDLoader => ParaMEDMEM/MEDLoader}/Makefile.am (58%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/MPIAccessDECTest.cxx (96%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/MPIAccessDECTest.hxx (98%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/MPIAccessTest.cxx (96%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/MPIAccessTest.hxx (98%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/MPIMainTest.hxx (93%)
 create mode 100644 src/ParaMEDMEM/Test/Makefile.am
 rename src/{MEDCoupling/MEDCouplingRefCountObject.cxx => ParaMEDMEM/Test/ParaMEDMEMTest.cxx} (53%)
 create mode 100644 src/ParaMEDMEM/Test/ParaMEDMEMTest.hxx
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/ParaMEDMEMTest_BlockTopology.cxx (98%)
 create mode 100644 src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/ParaMEDMEMTest_MPIProcessorGroup.cxx (99%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/ParaMEDMEMTest_NonCoincidentDEC.cxx (92%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/ParaMEDMEMTest_StructuredCoincidentDEC.cxx (84%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/TestMPIAccess.cxx (95%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/TestMPIAccessDEC.cxx (95%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/TestParaMEDMEM.cxx (95%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/test_AllToAllDEC.cxx (99%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/test_AllToAllTimeDEC.cxx (99%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/test_AllToAllvDEC.cxx (99%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/test_AllToAllvTimeDEC.cxx (96%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/test_AllToAllvTimeDoubleDEC.cxx (90%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/test_MPI_Access_Cancel.cxx (99%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/test_MPI_Access_Cyclic_ISend_IRecv.cxx (99%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/test_MPI_Access_Cyclic_Send_Recv.cxx (99%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/test_MPI_Access_IProbe.cxx (99%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/test_MPI_Access_ISendRecv.cxx (99%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/test_MPI_Access_ISend_IRecv.cxx (99%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/test_MPI_Access_ISend_IRecv_BottleNeck.cxx (99%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/test_MPI_Access_ISend_IRecv_Length.cxx (99%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/test_MPI_Access_ISend_IRecv_Length_1.cxx (99%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/test_MPI_Access_Probe.cxx (98%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/test_MPI_Access_SendRecv.cxx (99%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/test_MPI_Access_Send_Recv.cxx (99%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/test_MPI_Access_Send_Recv_Length.cxx (99%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/test_MPI_Access_Time.cxx (99%)
 rename src/{ParaMEDMEMTest => ParaMEDMEM/Test}/test_MPI_Access_Time_0.cxx (99%)
 delete mode 100644 src/ParaMEDMEMTest/Makefile.am
 delete mode 100644 src/ParaMEDMEMTest/ParaMEDMEMTest.cxx
 delete mode 100644 src/ParaMEDMEMTest/ParaMEDMEMTest.hxx
 delete mode 100644 src/ParaMEDMEMTest/ParaMEDMEMTest_FabienAPI.cxx
 delete mode 100644 src/ParaMEDMEMTest/ParaMEDMEMTest_Gauthier1.cxx
 delete mode 100644 src/ParaMEDMEMTest/ParaMEDMEMTest_ICocoTrio.cxx
 delete mode 100644 src/ParaMEDMEMTest/ParaMEDMEMTest_InterpKernelDEC.cxx
 delete mode 100644 src/ParaMEDMEMTest/ParaMEDMEMTest_MEDLoader.cxx
 delete mode 100644 src/ParaMEDMEMTest/test_perf.cxx
 delete mode 100755 src/ParaMEDMEM_Swig/test_InterpKernelDEC.py
 create mode 100755 src/ParaMEDMEM_Swig/test_IntersectionDEC.py
 delete mode 100644 src/RENUMBER/Makefile.am
 delete mode 100644 src/RENUMBER/RENUMBER_BOOSTRenumbering.cxx
 delete mode 100644 src/RENUMBER/RENUMBER_BOOSTRenumbering.hxx
 delete mode 100644 src/RENUMBER/RENUMBER_METISRenumbering.cxx
 delete mode 100644 src/RENUMBER/RENUMBER_METISRenumbering.hxx
 delete mode 100644 src/RENUMBER/RENUMBER_Renumbering.cxx
 delete mode 100644 src/RENUMBER/RENUMBER_Renumbering.hxx
 delete mode 100644 src/RENUMBER/RenumberingFactory.cxx
 delete mode 100644 src/RENUMBER/RenumberingFactory.hxx
 delete mode 100644 src/RENUMBER/renumbering.cxx
 delete mode 100755 src/RENUMBER/testRenumbering.py

diff --git a/adm_local/unix/config_files/renumber.m4 b/adm_local/unix/config_files/renumber.m4
deleted file mode 100644
index b62ec3eeb..000000000
--- a/adm_local/unix/config_files/renumber.m4
+++ /dev/null
@@ -1,57 +0,0 @@
-dnl  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
-dnl
-dnl  This library is free software; you can redistribute it and/or
-dnl  modify it under the terms of the GNU Lesser General Public
-dnl  License as published by the Free Software Foundation; either
-dnl  version 2.1 of the License.
-dnl
-dnl  This library is distributed in the hope that it will be useful,
-dnl  but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-dnl  Lesser General Public License for more details.
-dnl
-dnl  You should have received a copy of the GNU Lesser General Public
-dnl  License along with this library; if not, write to the Free Software
-dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-dnl
-dnl  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-dnl
-
-dnl define macros :
-dnl AC_ENABLE_RENUMBER AC_DISABLE_RENUMBER
-dnl author Vincent BERGEAUD
-dnl
-# AC_ENABLE_RENUMBER
-AC_DEFUN([AC_ENABLE_RENUMBER], [dnl
-define([AC_ENABLE_RENUMBER_DEFAULT], ifelse($1, yes, yes, no))dnl
-AC_ARG_ENABLE(renumber,
-changequote(<<, >>)dnl
-<<  --enable-renumber[=PKGS]  build with renumber tool [default=>>AC_ENABLE_RENUMBER_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_renumber=yes ;;
-no) enable_renumber=no ;;
-*)
-  enable_renumber=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_renumber=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_renumber=AC_ENABLE_RENUMBER_DEFAULT)dnl
-
-if test "X$enable_renumber" = "Xyes"; then
-  ENABLE_RENUMBER="yes"
-  AC_SUBST(ENABLE_RENUMBER)
-fi
-])
-
-# AC_DISABLE_RENUMBER - set the default flag to --disable-renumber
-AC_DEFUN([AC_DISABLE_RENUMBER], [AC_ENABLE_RENUMBER(no)])
-
diff --git a/doc/doxygen/images/head.png b/doc/doxygen/images/head.png
deleted file mode 100755
index 307d9ef9a4c07f8fba2c8721309a978433bcf63c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 78545
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
D4zrO!

diff --git a/doc/doxygen/medcoupling.dox b/doc/doxygen/medcoupling.dox
deleted file mode 100644
index cd5fdb3d1..000000000
--- a/doc/doxygen/medcoupling.dox
+++ /dev/null
@@ -1,411 +0,0 @@
-/*!
-\page medcoupling MEDCoupling
-
-\section MEDCouplingIntro Introduction
-
-The MEDCoupling module is presented under the form of a library
-libmedcoupling and interfaces. This module MEDCoupling represents the
-DataStructure designed to be exchanged by processors as well in
-parallel case in SPMD paradigm ( \ref paramedmem "ParaMEDMEM" ), as in
-distributed paradigm using CORBA. This DataStructure is \b fully
-deconnected from \ref medmem "MEDMEM". This DataStructure is light in
-order to minimize as much as possible the number of prerequisites needed
-to use it. The idea is that as this DataStructure is intended to be
-linked with all of code candidate for coupling ; the number of
-prerequisites of medcoupling has to be threfore tiny. MEDCoupling has
-been developped to comply with ICOCO API, \ref interpkernel
-"conservative interpolators" and VTK visualization
-DataStructure. The MEDCoupling DataStructures have been
-developped to be compatible with HPC constraints (compact structures,
-limitation of copies and launching of CPU consuming algorithms only when
-absolutely needed ).
-
-\section MEDCouplingMainConc Main Concepts
-
-- \ref MEDCouplingMeshesP "Meshes"
-- \ref MEDCouplingFieldsP "Fields"
-
-\section MEDCouplingFirstSteps1 Building an array from scratch
-
-All of exemples given here make the assumption that the \c ParaMEDMEM
-namespace is visible ( by calling for example \c using \c
-namespace \c ParaMEDMEM; ).
-
-Here a description of typical usages to use MEDCoupling arrays.
-In this example we will create arrays with 12 tuples constituted each
-of 3 components. These arrays will be created using different ways.
-
-\code
-
-const int nbOfNodes=12;
-double coords[3*nbOfNodes]={ ... };
-
-DataArrayDouble *myCoords=0;
-double *tmp=0;
-\endcode
-
-- no copy no ownership
-\code
-myCoords=DataArrayDouble::New();
-myCoords->useArray(coords,false,CPP_DEALLOC,nbOfNodes,3);
-//now use myCoords as you need
-...
-//myCoords is no more usefully here : release it
-myCoords->decrRef();
-\endcode
-
-
-- no copy and ownership C++
-\code
-myCoords=DataArrayDouble::New();
-tmp=new double[3*nbOfNodes];
-std::copy(coords,coords+3*nbOfNodes,tmp);
-myCoords->useArray(tmp,true,CPP_DEALLOC,nbOfNodes,3);
-//now use myCoords as you need
-...
-//myCoords is no more usefully, release it
-myCoords->decrRef();
-\endcode
-
-- no copy and ownership C
-\code
-myCoords=DataArrayDouble::New();
-tmp=(double *)malloc(3*nbOfNodes*sizeof(double));
-std::copy(coords,coords+3*nbOfNodes,tmp);
-myCoords->useArray(tmp,true,C_DEALLOC,nbOfNodes,3);
-//now use myCoords as you need
-...
-//myCoords is no more usefully here : release it
-myCoords->decrRef();
-\endcode
-
-- copy
-\code
-myCoords=DataArrayDouble::New();
-myCoords->alloc(nbOfNodes,3);
-tmp=myCoords->getPointer();
-std::copy(coords,coords+3*nbOfNodes,tmp);
-myCoords->declareAsNew();//you have modified data pointed by internal pointer notify object
-//now use myCoords as you need
-...
-//myCoords is no more usefully here : release it
-myCoords->decrRef();
-\endcode
-
-\section MEDCouplingFirstSteps2 Building unstructured mesh from scratch
-
-All of exemples given here make the assumption that the \c ParaMEDMEM
-namespace is visible ( by calling for example \c using \c
-namespace \c ParaMEDMEM; ).
-
-Here we will create a mesh with spacedim==2 and meshdim==2 too with 5
-cells and 9 nodes.
-
-You can notice that it is possible to mix cell
-types as you want as long as the dimension of cell is exactly equal to
-meshDim to respect \ref MEDCouplingMeshes "this rule".
-
-\code
-
-double coords[18]={-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 };
-int conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
-MEDCouplingUMesh *mesh=MEDCouplingUMesh::New();
-mesh->setName("My2DMesh");
-mesh->setMeshDimension(2);
-mesh->allocateCells(5);//You can put more than 5 if you want but not less.
-mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);
-mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,conn+4);
-mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,conn+7);
-mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+10);
-mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+14);
-mesh->finishInsertingCells();
-DataArrayDouble *myCoords=DataArrayDouble::New();
-myCoords->alloc(9,2);//here myCoords are declared to have 2 components, mesh will deduce that spaceDim==2
-std::copy(coords,coords+18,myCoords->getPointer());
-mesh->setCoords(myCoords);
-myCoords->decrRef();
-//mesh is now usable
-...
-//mesh is no more usefully here : release it
-mesh->decrRef();  
-
-\endcode
-
-\section MEDCouplingFirstSteps3 Building a field from scratch
-
-All of exemples given here make the assumption that the \c ParaMEDMEM
-namespace is visible ( by calling for example \c using \c
-namespace \c ParaMEDMEM; ).
-
-Here we will make the assumption that an instance of \c MEDCouplingMesh
-called \c mesh has been created.
-
-- create a tensor field with 9 components on cells with no time step
-\code
-MEDCouplingFieldDouble* fieldOnCells=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
-fieldOnCells->setName("MyTensorFieldOnCellNoTime");
-fieldOnCells->setMesh(mesh);
-DataArrayDouble *array=DataArrayDouble::New();
-array->alloc(mesh->getNumberOfCells(),9);//Implicitely fieldOnCells will be a 9 components field.
-fieldOnCells->setArray(array);
-tmp=array->getPointer();
-std::fill(tmp,tmp+9*mesh->getNumberOfCells(),7.);
-array->declareAsNew();
-array->decrRef();
-//fieldOnCells is now usable
-...
-//fieldOnCells is no more usefully here : release it
-fieldOnCells->decrRef();
-\endcode
-- create a scalar field on nodes with no time step
-\code
-MEDCouplingFieldDouble* fieldOnNodes=MEDCouplingFieldDouble::New(ON_NODES,NO_TIME);
-fieldOnNodes->setName("MyScalarFieldOnNodeNoTime");
-fieldOnNodes->setMesh(mesh);
-DataArrayDouble *array=DataArrayDouble::New();
-array->alloc(mesh->getNumberOfNodes(),1);//Implicitely fieldOnNodes will be a scalar field.
-fieldOnNodes->setArray(array);
-tmp=array->getPointer();
-std::fill(tmp,tmp+mesh->getNumberOfNodes(),7.);
-array->declareAsNew();
-array->decrRef();
-//fieldOnNodes is now usable
-...
-//fieldOnNodes is no more usefully here : release it
-fieldOnNodes->decrRef();
-\endcode
-- create a 2 components-vector field on cells with one time step and no interval
-\code
-MEDCouplingFieldDouble* fieldOnCells=MEDCouplingFieldDouble::New(ON_CELLS,ONE_TIME);
-fieldOnCells->setName("MyVecFieldOnCellWithTime");
-fieldOnCells->setMesh(mesh);
-fieldOnCells->setTime(4.22,2,-1);
-DataArrayDouble *array=DataArrayDouble::New();
-array->alloc(mesh->getNumberOfCells(),2);//Implicitely fieldOnCells will be a 2 components field.
-fieldOnCells->setArray(array);
-tmp=array->getPointer();
-std::fill(tmp,tmp+2*mesh->getNumberOfCells(),7.);
-array->declareAsNew();
-array->decrRef();
-//fieldOnCells is now usable
-...
-//fieldOnCells is no more usefully here : release it
-fieldOnCells->decrRef();
-\endcode
-- create a 3 components-vector field on nodes with a time interval where hied is constant
-\code
-MEDCouplingFieldDouble* fieldOnNodes=MEDCouplingFieldDouble::New(ON_NODES,CONST_ON_TIME_INTERVAL);
-fieldOnNodes->setName("MyVecFieldOnNodeWithConstTime");
-fieldOnNodes->setMesh(mesh);
-fieldOnNodes->setStartTime(4.22,2,-1);
-fieldOnNodes->setEndTime(6.44,4,-1);
-DataArrayDouble *array=DataArrayDouble::New();
-array->alloc(mesh->getNumberOfNodes(),3);//Implicitely fieldOnNodes will be a 3 components field.
-fieldOnNodes->setArray(array);
-tmp=array->getPointer();
-std::fill(tmp,tmp+3*mesh->getNumberOfNodes(),7.);
-array->declareAsNew();
-array->decrRef();
-//fieldOnNodes is now usable
-...
-//fieldOnNodes is no more usefully here : release it
-fieldOnNodes->decrRef();
-\endcode
-
-\section MEDCouplingSecondStep0 Operations on Fields
-Here we will make the assumption that an instance of \ref ParaMEDMEM::MEDCouplingMesh "MEDCouplingMesh"
-called \c mesh has been created with spaceDim==2.
-Here some exemple of more advanced use of \ref ParaMEDMEM::MEDCouplingFieldDouble "MEDCouplingFieldDouble".
-\code
-MEDCouplingFieldDouble *f1=mesh->fillFromAnalytic(ON_NODES,1,"x*x+y*y*3+2.*x");//f1 is scalar
-MEDCouplingFieldDouble *f2=mesh->fillFromAnalytic(ON_NODES,1,"cos(x+y/x)");//f2 is scalar too
-MEDCouplingFieldDouble *f2bis=mesh->fillFromAnalytic(ON_NODES,2,"x*x*IVec+3*y*JVec");//f2bis is a vectors field
-MEDCouplingFieldDouble *f3=(*f1)+(*f2);//f3 scalar
-MEDCouplingFieldDouble *f4=(*f3)/(*f2);//f4 scalar
-f2bis->applyFunc(1,"sqrt(x*x+y*y)");//f2bis becomes scalar
-MEDCouplingFieldDouble *f5=(*f2bis)*(*f4);//f5 scalar
-const double pos1[2]={0.25,0.};
-double res;
-f4->getValueOn(pos1,&res);//f4 is scalar so the returned value is of size 1.
-//
-...
-//f1, f2, f2bis, f3, f4, f5 are no more usefully here : release them
-f1->decrRef();
-f2->decrRef();
-f2bis->decrRef();
-f3->decrRef();
-f4->decrRef();
-f5->decrRef();
-\endcode
-*/
-
-/*!
-  \page MEDCouplingMeshesP Meshes in MEDCoupling
-
-\section MEDCouplingMeshes Common concept shared by all type of Meshes
-
-A mesh has a the following properties :
-
-- name
-- a dimension (called mesh dimension) and only one (it implies that \b all cells constituting
-mesh have the same dimension)
-- a space dimension (relative to coordinates)
-- a number of nodes
-- a number of cells 
-
-The class that incarnates the concept described above is :
-\ref ParaMEDMEM::MEDCouplingMesh.
-
-\section MEDCouplingUMeshes Unstructured meshes
-
-An unstructured mesh is defined by :
-
-- a point clouds where the explicit
-coordinates of each point must be specified. 
-- nodal connectivity that specifies for each cell, the points in the
-previous point clouds that constitutes the cell.
-
-As unstructured mesh is dynamically defined enough, this struture is
-used by MEDCoupling to instanciate degenerated meshes as :
-
-- points cloud only meshes. This type of mesh will have mesh dimension
-  == 0
-- abstract meshes containing only one cell that covers a potentially
-  infinite space. This abstract mesh is used as support of fields
-  containing only one integrated value. This is typically used to
-  represent fields used by system code. This type of mesh will have
-  mesh dimension equal to -1.
-
-The norm used for cells connectivity of different types, is the same as specified in MED file execpt
-that connectivities are in represented in \b C \b format and \b not \b in
-\b FORTRAN \b format !
-
-The class in charge to dealt with the described concept is \ref
-ParaMEDMEM::MEDCouplingUMesh. This class inherits
-from \ref MEDCouplingPointSets "PointSet" abstract meshes.
-
-\section MEDCouplingPointSets PointSet
-
-This is a \b non \b instanciable class that deals with set of points without
-any connectivity aspect.
-
-The class that incarnates this concept in
-MEDCoupling is : \ref ParaMEDMEM::MEDCouplingPointSet.
-
-This class is in charge to perform whole or part of algorithms of
-its subclasses (\ref
-ParaMEDMEM::MEDCouplingUMesh "MEDCouplingUMesh" and \ref
-ParaMEDMEM::MEDCouplingUMeshDesc "MEDCouplingUMeshDesc") for
-factorization reasons.
-
-Some of most important implemented methods are :
-
-- \ref ParaMEDMEM::MEDCouplingPointSet::getSpaceDimension "getSpaceDimension"
-- \ref ParaMEDMEM::MEDCouplingPointSet::getNumberOfNodes "getNumberOfNodes"
-- \ref ParaMEDMEM::MEDCouplingPointSet::rotate "rotate"
-- \ref ParaMEDMEM::MEDCouplingPointSet::translate "translate"
-- \ref ParaMEDMEM::MEDCouplingPointSet::scale "scale"
-- \ref ParaMEDMEM::MEDCouplingPointSet::findCommonNodes "findCommonNodes"
-- \ref ParaMEDMEM::MEDCouplingPointSet::renumberNodes "renumberNodes"
-- \ref ParaMEDMEM::MEDCouplingPointSet::getBoundingBox "getBoundingBox"
-
-\section MEDCouplingCMeshs Cartesian Mesh
-
-A cartesian mesh is a mesh that represents structured mesh whose nodes
-are arranged along axes of trihedron. To instanciate an object of this
-type, only n arrays are needed. In this type of mesh space dimension
-\b and mesh dimension are equals and the value is n. The n arrays will have only one component and the values
-contained in these arrays will be ascendantly sorted.
-
-The class that incarnates this concept in MEDCoupling is : \ref ParaMEDMEM::MEDCouplingCMesh.
-
-\section MEDCouplingExtrudedMeshes Extruded Mesh
-
-An extruded mesh is a mesh also called 2.5 D. It a convolution of 2D
-unstructured mesh with 1D unstructured mesh. The problem is that this
-type of mesh is not managed by any file format that's why to build an
-instance of this mesh you need 3D unstructured mesh and a 2D
-unstructured mesh lying on the same coordinates. The advantage of this
-structure is that the interpolation time is optimized.
-
-The class that incarnates this concept in MEDCoupling is : \ref ParaMEDMEM::MEDCouplingExtrudedMesh.
-*/
-
-/*!
-\page MEDCouplingFieldsP Fields in MEDCoupling
-
-\section MEDCouplingFields Field concept
-
-A field in MEDCoupling point of view, is a structure that allows to
-store a discretization of a physical value on a defined discretized spatial and
-possibly temporal support.
-
-The spatial support is a \ref MEDCouplingMeshesP "mesh".
-A field is lying on an entity that will be specified by the spatial
-discretization of the field. For exemple a field on node will lie on
-all nodes of its mesh.
-
-A field on cell will lie on all cells of its mesh.
-
-Fields in MEDCoupling follow the two following rules :
-
-- A field will lie on \b ALL entities of its spatial support (\ref MEDCouplingMeshesP "mesh").
-- A field has \b only \b one spatial support (\ref MEDCouplingMeshesP "mesh") on its temporal support.
-
-The main properties of a field are :
-
-- name
-- spatial support which is a \ref MEDCouplingMeshesP "mesh"
-- a \ref MEDCouplingSpatialDisc "spatial discretization"
-- a description of intrinsic nature of the values of field. This is important for conservative interpolation.
-- a temporal discretization that specifies, if it exists, the time interval on which the field is covering, and how.
-- number of components
-
-This definition of field in MEDCoupling allows an instance of field to
-know at any point inside its spatial-temporal support the value.
-
-The class that incarnates the concept described above is : \ref ParaMEDMEM::MEDCouplingFieldDouble.
-
-Some of most important implemented methods are :
-
-- \ref ParaMEDMEM::MEDCouplingFieldDouble::getNumberOfComponents "getNumberOfComponents"
-- \ref ParaMEDMEM::MEDCouplingFieldDouble::getValueOn "getValueOn"
-- \ref ParaMEDMEM::MEDCouplingFieldDouble::applyFunc "applyFunc"
-- \ref ParaMEDMEM::MEDCouplingFieldDouble::addFields "cross instances operations"
-
-\section MEDCouplingSpatialDisc Spatial discretization concept
-
-This is the concept that makes the link, independantly from temporal
-discretization, between the field and its spatial support(\ref MEDCouplingMeshesP "mesh"). This
-concept allows the field to make a check and interpretation of an
-array of values given a spatial support (\ref MEDCouplingMeshesP "mesh").
-
-The abstract class that incarnates the concept is : \ref ParaMEDMEM::MEDCouplingFieldDiscretization.
-
-The most important pure virtual methods are :
-
-- \ref ParaMEDMEM::MEDCouplingFieldDiscretization::getNumberOfTuples "getnumberOfTuples"
-- \ref ParaMEDMEM::MEDCouplingFieldDiscretization::getValueOn "getValueOn"
-- \ref ParaMEDMEM::MEDCouplingFieldDiscretization::getWeightingField "getWeightingField"
-
-\section MEDCouplingTemporalDisc Temporal discretization concept
-
-This information allows, independantly from spatial discretization, to
-associate a time interval, if it exists, on which the field will be
-defined. This concept is able to give the value at any time of
-the definition interval (if any).
-
-The abstract class \ref ParaMEDMEM::MEDCouplingTimeDiscretization
-incarnates this described concept.
-
-This classes and its subclasses are responsible in storing the arrays
-of the aggregating field.
-
-The most important methods are :
-
-- \ref ParaMEDMEM::MEDCouplingTimeDiscretization::setTime "setTime" and \ref ParaMEDMEM::MEDCouplingTimeDiscretization::getTime "getTime"
-- \ref ParaMEDMEM::MEDCouplingTimeDiscretization::getArray "getArray" and \ref ParaMEDMEM::MEDCouplingTimeDiscretization::setArray "setArray"
-- \ref ParaMEDMEM::MEDCouplingTimeDiscretization::getArraysForTime "getArraysForTime"
-- \ref ParaMEDMEM::MEDCouplingTimeDiscretization::getValueForTime "getValueForTime"
-
-*/
diff --git a/doc/doxygen/static/doxygen.css b/doc/doxygen/static/doxygen.css
deleted file mode 100644
index d8991647e..000000000
--- a/doc/doxygen/static/doxygen.css
+++ /dev/null
@@ -1,468 +0,0 @@
-body {
-   font-family: Arial, Helvetica, sans-serif;
-   background-color: #ffffff;
-}
-
-h1 { 
-   text-align: center; 
-   text-decoration: none;
-   border: none;
-   line-height: 25px;
-   text-align: center;
-//   text-transform:uppercase;
-   background: #D9f4fd;
-   font-size: 12pt;
-   font-weight: bold;
-   border: 1px solid #CCCCCC;
-   -moz-border-radius: 8px;
-   -moz-box-shadow:5px 5px 5px rgba(0, 0, 0, 0.15);
-}
-
-h2 {
-   font-size: 12pt;
-   font-weight: bold;
-}
-
-table {
-   font-size: 10pt;
-}
-
-CAPTION { 
-   font-weight: bold 
-}
-
-/* Link in the top navbar */
-A.qindex {}
-
-A.qindexRef {}
-
-/* Link to any cross-referenced Doxygen element inside a code section 
-   (ex: header)
-*/
-A.code { 
-   text-decoration: none; 
-   font-weight: normal; 
-   color: #4444ee 
-}
-
-A.codeRef { 
-   font-weight: normal; 
-   color: #4444ee 
-}
-
-A:hover { 
-   text-decoration: none; 
-   background-color: lightblue; 
-}
-
-div.contents {
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: 10pt;
-}
-
-div.navpath {
-  font-size: 11pt;
-  border: 0 none;
-  text-align: left;
-}
-
-div.version {
-   background-color:#ffffde;
-   border:1px solid #cccccc;
-   font-family: Arial, Helvetica, sans-serif;
-   font-size: 9pt;
-   text-align: center;
-   width:100px;
-   -moz-border-radius: 8px;
-//   -moz-box-shadow:5px 5px 5px rgba(0, 0, 0, 0.15);
-}
-
-div.header {
-  background: url("head.png");
-  background-color: #175783;
-  border: 1px solid;
-  height: 80px;
-  background-repeat: no-repeat;
-  margin-bottom: 10px;
-}
-
-div.tabs { 
-  text-align: justify; 
-  margin-left    : 2px;	 
-  margin-right   : 2px;  
-  margin-top     : 2px; 
-  margin-bottom  : 2px
-  font-weight: bold;
-  color: #FFFFFF;
-}
-
-div.footer {
-  background-color: #D9f4fd;
-  border: 1px solid #AAAAAA;
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: 11px;
-  padding: 10px;
-  margin-top: 15px;
-}
-
-DL.el { 
-   margin-left: -1cm 
-}
-
-/* A code fragment (ex: header) */
-div.fragment { 
-   border: none; 
-}
-
-/* In the alpha list (coumpound index), style of an alphabetical index letter */
-DIV.ah { 
-   background-color: #CCCCCC; 
-   font-weight: bold; 
-   color: #ffffff; 
-   margin-bottom: 3px; 
-   margin-top: 3px 
-}
-
-/* Method name (+ type) */
-TD.md { 
-   background-color: lightblue; 
-   font-weight: bold; 
-}
-
-/* Method parameter (some of them) */
-TD.mdname1 { 
-   background-color: lightblue; 
-   font-weight: bold; color: #602020; 
-}
-
-/* Method parameter (some of them) */
-TD.mdname { 
-   background-color: lightblue; 
-   font-weight: bold; 
-   color: #602020; 
-   width: 600px; 
-}
-
-/* Separator between methods group (usually empty, seems not supported by IE) */
-DIV.groupHeader { 
-   margin-left: 16px; 
-   margin-top: 12px; 
-   margin-bottom: 6px; 
-   font-weight: bold 
-}
-
-DIV.groupText { 
-   margin-left: 16px; 
-   font-style: italic; 
-   font-size: smaller 
-}
-
-/*div.div-page { 
-  background-color: #FFFFFF; 
-  margin-left: 1em;
-  margin-right: 1em;
-  margin-top: 1em;
-  margin-bottom: 0.1em;
-
-  padding-left: 1em;
-  padding-right: 1em;
-  padding-top: 0.5em;
-  padding-bottom: 0.5em;
-
-  border: 2px solid #0D299A; 
-  border-width: 2px;
-  border-color: #0D299A; 
-}*/
-
-div.tabs { 
-  text-align: justify; 
-  margin-left    : 2px;	 
-  margin-right   : 2px;  
-  margin-top     : 2px; 
-  margin-bottom  : 2px
-  font-weight: bold;
-  color: #FFFFFF;
-}
-
-DIV.div-footer { 
-  margin-left: 1em;
-  margin-right: 1em;
-  margin-bottom: 0.2em;
-  text-align: right;
-  font-size: 9pt; 
-}
-
-/* In File List, Coumpound List, etc, 1st column of the index */
-TD.indexkey { 
-   background-color: #CCCCCC; 
-   font-weight: bold; 
-   padding-right  : 10px; 
-   padding-top    : 2px; 
-   padding-left   : 10px; 
-   padding-bottom : 2px; 
-   margin-left    : 0px; 
-   margin-right   : 0px; 
-   margin-top     : 2px; 
-   margin-bottom  : 2px  
-}
-
-/* In File List, Coumpound List, etc, 2nd column of the index */
-TD.indexvalue { 
-   background-color: #CCCCCC; 
-   font-style: italic; 
-   padding-right  : 10px; 
-   padding-top    : 2px; 
-   padding-left   : 10px; 
-   padding-bottom : 2px; 
-   margin-left    : 0px; 
-   margin-right   : 0px; 
-   margin-top     : 2px; 
-   margin-bottom  : 2px  
-}
-
-span.keyword       { color: #008000 }
-span.keywordtype   { color: #604020 }
-span.keywordflow   { color: #e08000 }
-span.comment       { color: #800000 }
-span.preprocessor  { color: #806020 }
-span.stringliteral { color: #002080 }
-span.charliteral   { color: #008080 }
-
-/* @group Code Colorization */
-
-.fragment {
-	font-family: monospace, fixed;
-	font-size: 10pt;
-}
-
-pre.fragment {
-        width: 95%;
-	border: 1px solid #CCCCCC;
-        -moz-border-radius: 8px;
-        -moz-box-shadow:5px 5px 5px rgba(0, 0, 0, 0.15);
-        background-color:#EEF3F5;
-	padding: 4px 6px;
-	margin: 4px 1px 4px 1px;
-}
-
-/* Top Navigation style */
-
-div.navigation {
-  margin-bottom: 70px;
-}
-
-/* Left navigation panel style */
-
-body.ftvtree {
-   background-color: #D9f4fd;
-  margin: 10px;
-}
-
-div.directory {
-  margin: 0;
-}
-
-div.directory.p {
-  margin: 0;
-}
-
-h3.swap {
-   font-size: 10pt;
-   margin-bottom: 0;
-}
-
-/* Link to any cross-referenced Doxygen element */
-a.el { 
-   text-decoration: none; 
-   font-family: Arial, Helvetica, sans-serif;
-   font-weight: bold;
-   font-size: 9pt;
-   color: #551a8b;
-}
-
-a.el:hover {
-   background-color: transparent;
-}
-
-a.elRef { 
-   font-weight: normal;
-}
-
-
-#MSearchBox {
-  -moz-border-radius:8px 8px 8px 8px;
-  background-color:white;
-  border:1px solid #84B0C7;
-  margin:0;
-  padding:0;
-  white-space:nowrap;
-}
-
-div.directory img {
-  vertical-align:-30%;
-}
-
-div.directory p {
-  white-space:nowrap;
-  margin: 0;
-}
-
-div.directory-alt div {
-	display: none;
-	margin: 0px;
-}
-
-
-div.directory div {
-	display: none;
-	margin: 0px;
-}
-
-div.version {
-   background-color:#ffffde;
-   border:1px solid #cccccc;
-   font-family: Arial, Helvetica, sans-serif;
-   font-size: 9pt;
-   text-align: center;
-   width:100px;
-   -moz-border-radius: 8px;
-//   -moz-box-shadow:5px 5px 5px rgba(0, 0, 0, 0.15);
-}
-
-/* In File List, Coumpound List, etc, 1st column of the index */
-TD.indexkey { 
-   background-color: #DDDDEE; 
-   font-weight: bold; 
-   padding-right  : 10px; 
-   padding-top    : 2px; 
-   padding-left   : 10px; 
-   padding-bottom : 2px; 
-   margin-left    : 0px; 
-   margin-right   : 0px; 
-   margin-top     : 2px; 
-   margin-bottom  : 2px  
-}
-
-/* In File List, Coumpound List, etc, 2nd column of the index */
-TD.indexvalue { 
-   background-color: #EEEEFF; 
-   font-style: italic; 
-   padding-right  : 10px; 
-   padding-top    : 2px; 
-   padding-left   : 10px; 
-   padding-bottom : 2px; 
-   margin-left    : 0px; 
-   margin-right   : 0px; 
-   margin-top     : 2px; 
-   margin-bottom  : 2px  
-}
-
-
-/* @group Member Descriptions */
-
-.mdescLeft, .mdescRight,
-.memItemLeft, .memItemRight,
-.memTemplItemLeft, .memTemplItemRight, .memTemplParams {
-        background-color: #FAFAFA;
-        border: none;
-        margin: 4px;
-        padding: 1px 0 0 8px;
-}
-
-.mdescLeft, .mdescRight {
-        padding: 0px 8px 4px 8px;
-        color: #555;
-}
-
-.memItemLeft, .memItemRight, .memTemplParams {
-        border-top: 1px solid #ccc;
-}
-
-.memItemLeft, .memTemplItemLeft {
-        white-space: nowrap;
-}
-
-.memTemplParams {
-        color: #606060;
-        white-space: nowrap;
-}
-
-/* @end */
-
-/* Styles for detailed member documentation */
-
-.memtemplate {
-        font-size: 80%;
-        color: #606060;
-        font-weight: normal;
-        margin-left: 3px;
-}
-
-.memnav {
-        background-color: #e8eef2;
-        border: 1px solid #84b0c7;
-        text-align: center;
-        margin: 2px;
-        margin-right: 15px;
-        padding: 2px;
-}
-
-.memitem {
-        padding: 0;
-        margin-bottom: 10px;
-}
-
-.memname {
-        white-space: nowrap;
-        font-weight: bold;
-}
-
-.memproto, .memdoc {
-        border: 1px solid #84b0c7;
-}
-
-.memproto {
-        padding: 0;
-        background-color: #d5e1e8;
-        font-weight: bold;
-        -webkit-border-top-left-radius: 8px;
-        -webkit-border-top-right-radius: 8px;
-        -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        -moz-border-radius-topleft: 8px;
-        -moz-border-radius-topright: 8px;
-        -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-
-}
-
-
-
-.memdoc {
-        padding: 2px 5px;
-        background-color: #eef3f5;
-        border-top-width: 0;
-        -webkit-border-bottom-left-radius: 8px;
-        -webkit-border-bottom-right-radius: 8px;
-        -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        -moz-border-radius-bottomleft: 8px;
-        -moz-border-radius-bottomright: 8px;
-        -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-}
-
-.paramkey {
-        text-align: right;
-}
-
-.paramtype {
-        white-space: nowrap;
-}
-
-.paramname {
-        color: #602020;
-        white-space: nowrap;
-}
-.paramname em {
-        font-style: normal;
-}
-
-/* @end */
-
diff --git a/doc/doxygen/static/footer.html b/doc/doxygen/static/footer.html
deleted file mode 100755
index fdfb138ca..000000000
--- a/doc/doxygen/static/footer.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-</head>
-<body>
-<div class="footer">
-<div style="text-align: center;">
-Copyright &copy; 2007-2010  CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
-Copyright &copy; 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS<br>
-</div>
-</div>
-</body>
-</html>
diff --git a/doc/doxygen/static/header.html.in b/doc/doxygen/static/header.html.in
deleted file mode 100755
index bcf8c48ea..000000000
--- a/doc/doxygen/static/header.html.in
+++ /dev/null
@@ -1,10 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <title>$title</title>
-   <link href="tabs.css" rel="stylesheet" type="text/css">
-   <link href="doxygen.css" rel="stylesheet" type="text/css">
-</head>
-<div class="header"></div>
-<div align="right"><div class="version">Version: @VERSION@</div></div>
\ No newline at end of file
diff --git a/doc/salome/tui/images/head.png b/doc/salome/tui/images/head.png
deleted file mode 100755
index 307d9ef9a4c07f8fba2c8721309a978433bcf63c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 78545
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
D4zrO!

diff --git a/doc/salome/tui/input/index.doc b/doc/salome/tui/input/index.doc
deleted file mode 100644
index 50c09d9e0..000000000
--- a/doc/salome/tui/input/index.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-/*! \mainpage
-
-To browse the \b SALOME Med module Developer Documentation, follow the links below or use navigation menu at the top of the page:
-<ul>
-<li> <a href="modules.html">Modules</a> - documentation of TUI functionality.</li>
-<li> <a href="namespaces.html">Name Spaces</a> - list of TUI packages and scripts.</li>
-<li> <a href="annotated.html">Data Structures</a> - list of all data structures and classes with brief descriptions.</li>
-<li> <a href="files.html">Files</a> - list of all files with brief descriptions.</li>
-</ul>
-
-\note Documentation of 3D - part of intersection matrix calculation more or less complete
-
-*/
\ No newline at end of file
diff --git a/doc/salome/tui/static/header.html.in b/doc/salome/tui/static/header.html.in
deleted file mode 100755
index 791a37c53..000000000
--- a/doc/salome/tui/static/header.html.in
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.73 [en] (WinNT; I) [Netscape]">
-   <title>$title</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-<link href="tabs.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-<div class="header"></div>
-<div align="right"><div class="version">Version: @VERSION@</div></div>
-</body>
-</html>
diff --git a/resources/Mesh3D_11.med b/resources/Mesh3D_11.med
deleted file mode 100644
index 5088b55b3596aefb0e6ed19aae9b2f15598cd4e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 153532
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

diff --git a/resources/Test2D.med b/resources/Test2D.med
deleted file mode 100644
index 8f651af39bb6a5866b3029db395f7f4caaa1cd7e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 30380
zcmeHQPi$007@sW#wotTSH5Ge!XeAYqv}MJDBy{O+yCvP-(rvXM+8U|Bq(TjisfI%n
zJ!ry#gC>S};K0EcFkJB5gNK@M@W8<XMiM-DG3kK=H=N&m-`Bo3`}RT8KilojG;hD1
zneUr7^ZRDz&G)_8>9?6w&yH=ow<&~pt*TWGYLki3$72pRJ`ctbYhcD0WvMCta)#rX
zbaKFa)#<JJ%M_;z>C5%x3!}a1TzW9spDw6$t}vQSCRKMPsqSkg6!)hvZy-7}m`<a0
zf~`<AF|nB%8V_mj!`%;Vha@i~-I~}Ox38T$b#}cjw_$-T@TKvqtH1uGQyv6T7bE_<
zQEH8%KjyiYi9ecdted;oSU3M=V;xeVx9Pt#fhH7}!}3h#W*Y0ReBWSXyq6x_#)T~I
zQflt%Tzod9{bA*bj49d|3F8G1Fhd?#W4d*qp1u%v>hXZM-M3Aq{*XQncv1Ng|KQPa
z$ReF|uAI&_782Hv&bI_~-k^1kFtMF#I!k2XvyjWDVtSVJbjtmADH(c3NWDX}nQ4=b
zdOQ+@=j$!RbA~ChYkAxY&pGZ#T~>c0$;$Zjj}5eIirXu-&yHU_H`*>^BYZwg(UZxH
zA(0d6=ELIWLD(E8eahhGi-hrl=V|6cyAO*_MCYDPz^z(dmmH!!$%1b_4A=SC^TZqW
z$Z|Sg3!QHboe%fxb%Y5uOqtMp7&Cfp<nb!qY?|l30j5F8>Wax)!k*jfRht1KrdQwf
z8pUk#go$G{RBOI@oNtI;p-?E2>&uypQgZSrvE>HS{gHC~Xj)hc**dk$OZ8<V%Ui7f
zyx~K;<N7b9Z2*Ml^!2;Gqz@r&BLy3;p;H5<d8PCwZLe3;=BwZ}oTEhs@H(k4!K<f`
z?9XS@2fgft^Il<m(rZt6ZHJGvCysO+@;chu4tpJ)ooxrH(@EiuIs_a74grV2sv+QC
z8^bQV{$lv8qWnXbAgDvwa>}iZ*J5oP?jQON4`Cf9m{LqB@fAQ{ZEV-bbJ~`HYX41;
zr110~q<9O{1|2>3N|5Ky9*SRQO0mlNl(B*K0jp~-1nUnxkRIhnb7MoP^7>9|L+!@j
zc%GwG?xJ4(c4I%!Ytrv;vHriY`oW@f^?mC}X8Zd4)1#-;gL$-G#)R0FHfFY+ksFS-
z%c>7i*J6i&L%<>65O4^rUj$@r?CC1vnV+)WsYuPE?8cv3hzsj$J2<<se0F0g+byQH
z8C}zdQk%8)1Kr1JYRnROlWH>Yo!&9_1$3#zc9nR{PW~9b!;Tqlr94)8oaML}b^SHU
zKtAlNU0fQ(2LHQxqG%0yd{F1;y+4{c?A?U)FI#RfO{@P>a;8v}%k@6Xef%0{`0eN)
z*!~q6o5Ga1zt>I;#!=5dUJa&ggjh_`ySvi;hW4`*>wz>U{YCUx)L-@yO2~))SE|1#
zHLxo1uQne4R2Uws0<tS~4G`#?rJF3!E{+SG<@oH+CbZ4oAS(F_)XtaqP3E`bQZ7>|
zXIA3EZ{1JwpI9HcuTUvZD4s=lXN*T1<{Z3_##W-O`oc2{n+~z<0Nb^&MPY}&p3&E{
z`jUA}e_eKvy(_tV+LV<|_VLq_itf%Ew~P`$i}u%;jCz$ZRNmX>@{|r&@g9AleF)QD
zFnke=dWK1V*yRo9`b?Hx-lvwl9hdSPbqF{F90Cpjhk!$%7y-Zk1-4}~ZL?coETlWk
z_bC5M{aeJ2^@<&w|D}BX7yJFX=*F*etk3Qok(?ln(s}AI@rJEIozBar^R72ZFHKBE
zqvT_%F*ZZImr`YIK0!-<y+@VOF^=yY3i6aHm$)|0=Sulh_?5r5p~#mhKFOB12`l8U
zgpWzKt*@4kNqm#2Zz2_~XY`vyXEYDyi<a(ao=VI`+r@5&J&&;kn_cX8*!5!LFX~Ju
zE-~nzXBi3G4qsw13+$*L>W;dhj#6*<9MBH<A<!<QquxjdFXWI88Kk2xqrE6g<dEiq
zL%<>65O4@M1RMhE4}q0h@5-9SUhht@Z7FMn<-Svu`>fV_ceU~OvBL1MeFaA?|B&?P
zC|^M)LtM^RKz;$SyUTs<hi&(ZE>~&{v~Yp;oRFedgbMkv5tchAz!sq}AYWFL`fcEu
z6VXM({^?}@N-0i^gUP;9xs{u~QvF8sY4@AE+;5Oy3H@fZ@px2WcvNoBuHKqsp9%aq
zSa<Ev7yLb#zu@bE{|9?f#789iQt*7kJm}|_IQ&PDhYb8kB7-q4<zj66)8*cfZPXXa
zMZIwR7xsnVr-$H&{4RYhCCK}&lf(4mM5()!vC{rFDc4blfJ49`;1F;KI0V)n0l!}Z
z?>29o53fU%U!(Rk$zW|`2e${Je0w15b1FqQqI0YhvCeB9ksP9W&+`GS1EX~Ay-&PO
z=jHNcg`eMdhsSTLIM-OU<h!Bs`|h5iL}BS<{Wn<sfJLi{$k^!8t?ty<!wccfj~W|C
z$4JJFjdG2R@bi0y-Xp#2XDXWYkBxag*j&a&DH)NiCMsh?o*QEy1Y7?!XZ?<RL^5t{
zlxu9zZ;U-wo%|LzF-Zv{((yUpKQ`*eC{b7@S^pWUAFyau5qoT0`Y_o1?mWe#o*P%j
ziN}qNa*d7fHPz+MNH0-qs#c!YWNch!{hzh^L9ka;M=Yj2<OUZ8XSwGbh;Q3|FV@U!
zU*uy9`QNAR%l@L@Sk9~q!2NUT%-MBOC07ZDfJ49`;1F;KI0UK}fi7x#1Jfp^9@7@4
ztxWebZDTrrOqmepcq7whrY|$y%XA;p15DeQ>N9}HFHU(Me=<J7>mw{3v8I!AP;H;3
zeHK-Y4X)xdkaQtBU@r%PE%&7V(}2Am2=@6LrOx}Xj^`+fQfbBIl{)XEr~oTL$`fj3
z>*yQpVQIo|<80gbHeR{ZkP$6~GyeY&80w8T74I8r_1=}Z8eqB7XPZflh!)*9KWH+R
za$o%a5kIcjH^U~0vN4gn+j_=%FbMWJEaLkTxl&a6uWcU|weNUz`($sRUBBMsu(`Ee
nKf8T)T<Tj?kKUxoDuuJ)XV+t(r+-=Xkoq|45O4@o4+8%KY^t7T

diff --git a/resources/Test2Dpoly.med b/resources/Test2Dpoly.med
deleted file mode 100644
index 7d56fed90f35bb8b834021de70f29a1cd1a55422..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22084
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

diff --git a/resources/Test3D.med b/resources/Test3D.med
deleted file mode 100644
index 48eccd7a612e3eb3ea2e49582796a6d3544933a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 27300
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

diff --git a/resources/Test3Dpoly.med b/resources/Test3Dpoly.med
deleted file mode 100644
index 621709411bb740bde20701a387b47228d58023fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16680
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
WFWzIQR+^_4NG*_BAhke}1^xl-=xOx;

diff --git a/src/INTERP_KERNEL/Bases/InterpKernelHashFun.hxx b/src/INTERP_KERNEL/Bases/InterpKernelHashFun.hxx
deleted file mode 100644
index 0fd4102a9..000000000
--- a/src/INTERP_KERNEL/Bases/InterpKernelHashFun.hxx
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, 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
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- * Copyright (c) 1996-1998
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-#ifndef __INTERPKERNELHASHFUN_HXX__
-#define __INTERPKERNELHASHFUN_HXX__
-
-#include <cstddef>
-
-namespace INTERP_KERNEL
-{
-  template<class _Key>
-  struct hash { };
-
-  inline std::size_t __stl_hash_string(const char* __s)
-  {
-    unsigned long __h = 0;
-    for ( ; *__s; ++__s)
-      __h = 5 * __h + *__s;
-    return std::size_t(__h);
-  }
-
-  template<>
-  struct hash<char*>
-  {
-    std::size_t operator()(const char* __s) const
-    { return __stl_hash_string(__s); }
-  };
-
-  template<>
-  struct hash<const char*>
-  {
-    std::size_t operator()(const char* __s) const
-    { return __stl_hash_string(__s); }
-  };
-
-  template<>
-  struct hash<char>
-  { 
-    std::size_t operator()(char __x) const { return __x; }
-  };
-
-  template<>
-  struct hash<unsigned char>
-  { 
-    std::size_t operator()(unsigned char __x) const { return __x; }
-  };
-
-  template<>
-  struct hash<signed char>
-  {
-    std::size_t operator()(unsigned char __x) const { return __x; }
-  };
-
-  template<>
-  struct hash<short>
-  {
-    std::size_t operator()(short __x) const { return __x; }
-  };
-
-  template<>
-  struct hash<unsigned short>
-  {
-    std::size_t operator()(unsigned short __x) const { return __x; }
-  };
-
-  template<>
-  struct hash<int>
-  { 
-    std::size_t operator()(int __x) const { return __x; }
-  };
-
-  template<>
-  struct hash<unsigned int>
-  { 
-    std::size_t operator()(unsigned int __x) const { return __x; }
-  };
-
-  template<>
-  struct hash<long>
-  {
-    std::size_t operator()(long __x) const { return __x; }
-  };
-
-  template<>
-  struct hash<unsigned long>
-  {
-    std::size_t operator()(unsigned long __x) const { return __x; }
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/Bases/InterpKernelHashMap.hxx b/src/INTERP_KERNEL/Bases/InterpKernelHashMap.hxx
deleted file mode 100644
index b4cc8cfbe..000000000
--- a/src/INTERP_KERNEL/Bases/InterpKernelHashMap.hxx
+++ /dev/null
@@ -1,403 +0,0 @@
-// Copyright (C) 2001, 2002, 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, 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
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-#ifndef __INTERPKERNELHASHMAP__
-#define __INTERPKERNELHASHMAP__
-
-#include "InterpKernelStlExt.hxx"
-#include "InterpKernelHashTable.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class _Key, class _Tp, class _HashFn = hash<_Key>,
-           class _EqualKey = std::equal_to<_Key>, class _Alloc = std::allocator<_Tp> >
-  class HashMap
-  {
-  private:
-    typedef hashtable<std::pair<const _Key, _Tp>,_Key, _HashFn,
-                      STLEXT::Select1st<std::pair<const _Key, _Tp> >,
-                      _EqualKey, _Alloc> _Ht;
-
-    _Ht _M_ht;
-    
-  public:
-    typedef typename _Ht::key_type key_type;
-    typedef _Tp data_type;
-    typedef _Tp mapped_type;
-    typedef typename _Ht::value_type value_type;
-    typedef typename _Ht::hasher hasher;
-    typedef typename _Ht::key_equal key_equal;
-    
-    typedef typename _Ht::size_type size_type;
-    typedef typename _Ht::difference_type difference_type;
-    typedef typename _Ht::pointer pointer;
-    typedef typename _Ht::const_pointer const_pointer;
-    typedef typename _Ht::reference reference;
-    typedef typename _Ht::const_reference const_reference;
-    
-    typedef typename _Ht::iterator iterator;
-    typedef typename _Ht::const_iterator const_iterator;
-    
-    typedef typename _Ht::allocator_type allocator_type;
-      
-    hasher hash_funct() const { return _M_ht.hash_funct(); }
-
-    key_equal key_eq() const { return _M_ht.key_eq(); }
-    
-    allocator_type get_allocator() const { return _M_ht.get_allocator(); }
-
-    HashMap() : _M_ht(100, hasher(), key_equal(), allocator_type()) {}
-  
-    explicit HashMap(size_type __n) : _M_ht(__n, hasher(), key_equal(), allocator_type()) {}
-
-    HashMap(size_type __n, const hasher& __hf) : _M_ht(__n, __hf, key_equal(), allocator_type()) {}
-
-    HashMap(size_type __n, const hasher& __hf, const key_equal& __eql,
-            const allocator_type& __a = allocator_type()) : _M_ht(__n, __hf, __eql, __a) {}
-    
-    template<class _InputIterator>
-    HashMap(_InputIterator __f, _InputIterator __l) : _M_ht(100, hasher(), key_equal(), allocator_type())
-    { _M_ht.insert_unique(__f, __l); }
-    
-    template<class _InputIterator>
-    HashMap(_InputIterator __f, _InputIterator __l, size_type __n) : _M_ht(__n, hasher(), key_equal(), allocator_type())
-    { _M_ht.insert_unique(__f, __l); }
-
-    template<class _InputIterator>
-    HashMap(_InputIterator __f, _InputIterator __l, size_type __n, const hasher& __hf)
-      : _M_ht(__n, __hf, key_equal(), allocator_type())
-    { _M_ht.insert_unique(__f, __l); }
-    
-    template<class _InputIterator>
-    HashMap(_InputIterator __f, _InputIterator __l, size_type __n,
-            const hasher& __hf, const key_equal& __eql,
-            const allocator_type& __a = allocator_type()) : _M_ht(__n, __hf, __eql, __a)
-    { _M_ht.insert_unique(__f, __l); }
-    
-    size_type size() const { return _M_ht.size(); }
-    
-    size_type max_size() const { return _M_ht.max_size(); }
-    
-    bool empty() const { return _M_ht.empty(); }
-    
-    void swap(HashMap& __hs) { _M_ht.swap(__hs._M_ht); }
-    
-    template<class _K1, class _T1, class _HF, class _EqK, class _Al>
-    friend bool operator== (const HashMap<_K1, _T1, _HF, _EqK, _Al>&,
-                            const HashMap<_K1, _T1, _HF, _EqK, _Al>&);
-    
-    iterator begin() { return _M_ht.begin(); }
-    
-    iterator end() { return _M_ht.end(); }
-    
-    const_iterator begin() const { return _M_ht.begin(); }
-    
-    const_iterator end() const { return _M_ht.end(); }
-    
-    std::pair<iterator, bool> insert(const value_type& __obj) { return _M_ht.insert_unique(__obj); }
-    
-    template<class _InputIterator>
-    void insert(_InputIterator __f, _InputIterator __l) { _M_ht.insert_unique(__f, __l); }
-    
-    std::pair<iterator, bool>
-    insert_noresize(const value_type& __obj) { return _M_ht.insert_unique_noresize(__obj); }
-    
-    iterator find(const key_type& __key) { return _M_ht.find(__key); }
-    
-    const_iterator find(const key_type& __key) const { return _M_ht.find(__key); }
-    
-    _Tp& operator[](const key_type& __key) { return _M_ht.find_or_insert(value_type(__key, _Tp())).second; }
-    
-    size_type count(const key_type& __key) const { return _M_ht.count(__key); }
-    
-    std::pair<iterator, iterator> equal_range(const key_type& __key) { return _M_ht.equal_range(__key); }
-    
-    std::pair<const_iterator, const_iterator> equal_range(const key_type& __key) const { return _M_ht.equal_range(__key); }
-    
-    size_type erase(const key_type& __key) { return _M_ht.erase(__key); }
-    
-    void erase(iterator __it) { _M_ht.erase(__it); }
-    
-    void erase(iterator __f, iterator __l) { _M_ht.erase(__f, __l); }
-
-    void clear() { _M_ht.clear(); }
-
-    void resize(size_type __hint) { _M_ht.resize(__hint); }
-    
-    size_type bucket_count() const { return _M_ht.bucket_count(); }
-
-    size_type max_bucket_count() const { return _M_ht.max_bucket_count(); }
-    
-    size_type elems_in_bucket(size_type __n) const { return _M_ht.elems_in_bucket(__n); }
-  };
-  
-  template<class _Key, class _Tp, class _HashFn, class _EqlKey, class _Alloc>
-  inline bool operator==(const HashMap<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm1,
-                         const HashMap<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm2)
-  { return __hm1._M_ht == __hm2._M_ht; }
-  
-  template<class _Key, class _Tp, class _HashFn, class _EqlKey, class _Alloc>
-  inline bool operator!=(const HashMap<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm1,
-                         const HashMap<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm2)
-  { return !(__hm1 == __hm2); }
-  
-  template<class _Key, class _Tp, class _HashFn, class _EqlKey, class _Alloc>
-  inline void swap(HashMap<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm1,
-                   HashMap<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm2)
-  { __hm1.swap(__hm2); }
-
-  template<class _Key, class _Tp,
-           class _HashFn = hash<_Key>,
-           class _EqualKey = std::equal_to<_Key>,
-           class _Alloc = std::allocator<_Tp> >
-  class hash_multimap
-  {
-  private:
-    typedef hashtable<std::pair<const _Key, _Tp>, _Key, _HashFn,
-                      STLEXT::Select1st<std::pair<const _Key, _Tp> >, _EqualKey, _Alloc>
-    _Ht;
-    _Ht _M_ht;
-  public:
-    typedef typename _Ht::key_type key_type;
-    typedef _Tp data_type;
-    typedef _Tp mapped_type;
-    typedef typename _Ht::value_type value_type;
-    typedef typename _Ht::hasher hasher;
-    typedef typename _Ht::key_equal key_equal;
-    
-    typedef typename _Ht::size_type size_type;
-    typedef typename _Ht::difference_type difference_type;
-    typedef typename _Ht::pointer pointer;
-    typedef typename _Ht::const_pointer const_pointer;
-    typedef typename _Ht::reference reference;
-    typedef typename _Ht::const_reference const_reference;
-    
-    typedef typename _Ht::iterator iterator;
-    typedef typename _Ht::const_iterator const_iterator;
-    
-    typedef typename _Ht::allocator_type allocator_type;
-  
-    hasher hash_funct() const { return _M_ht.hash_funct(); }
-    
-    key_equal key_eq() const { return _M_ht.key_eq(); }
-    
-    allocator_type get_allocator() const { return _M_ht.get_allocator(); }
-    
-    hash_multimap() : _M_ht(100, hasher(), key_equal(), allocator_type()) { }
-    
-    explicit hash_multimap(size_type __n) : _M_ht(__n, hasher(), key_equal(), allocator_type()) {}
-    
-    hash_multimap(size_type __n, const hasher& __hf) : _M_ht(__n, __hf, key_equal(), allocator_type()) {}
-    
-    hash_multimap(size_type __n, const hasher& __hf, const key_equal& __eql,
-                  const allocator_type& __a = allocator_type()) : _M_ht(__n, __hf, __eql, __a) {}
-    
-    template<class _InputIterator>
-    hash_multimap(_InputIterator __f, _InputIterator __l) : _M_ht(100, hasher(), key_equal(), allocator_type())
-    { _M_ht.insert_equal(__f, __l); }
-    
-    template<class _InputIterator>
-    hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n) : _M_ht(__n, hasher(), key_equal(), allocator_type())
-    { _M_ht.insert_equal(__f, __l); }
-    
-    template<class _InputIterator>
-    hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n, const hasher& __hf)
-      : _M_ht(__n, __hf, key_equal(), allocator_type())
-    { _M_ht.insert_equal(__f, __l); }
-    
-    template<class _InputIterator>
-    hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n,
-                  const hasher& __hf, const key_equal& __eql,
-                  const allocator_type& __a = allocator_type())
-      : _M_ht(__n, __hf, __eql, __a)
-    { _M_ht.insert_equal(__f, __l); }
-    
-    size_type size() const { return _M_ht.size(); }
-    
-    size_type max_size() const { return _M_ht.max_size(); }
-    
-    bool empty() const { return _M_ht.empty(); }
-    
-    void swap(hash_multimap& __hs) { _M_ht.swap(__hs._M_ht); }
-    
-    template<class _K1, class _T1, class _HF, class _EqK, class _Al>
-    friend bool operator==(const hash_multimap<_K1, _T1, _HF, _EqK, _Al>&,
-                           const hash_multimap<_K1, _T1, _HF, _EqK, _Al>&);
-    
-    iterator begin() { return _M_ht.begin(); }
-    
-    iterator end() { return _M_ht.end(); }
-    
-    const_iterator begin() const { return _M_ht.begin(); }
-    
-    const_iterator end() const { return _M_ht.end(); }
-    
-    iterator insert(const value_type& __obj) { return _M_ht.insert_equal(__obj); }
-    
-    template<class _InputIterator>
-    void insert(_InputIterator __f, _InputIterator __l) { _M_ht.insert_equal(__f,__l); }
-    
-    iterator insert_noresize(const value_type& __obj) { return _M_ht.insert_equal_noresize(__obj); }
-    
-    iterator find(const key_type& __key) { return _M_ht.find(__key); }
-    
-    const_iterator find(const key_type& __key) const { return _M_ht.find(__key); }
-    
-    size_type count(const key_type& __key) const { return _M_ht.count(__key); }
-    
-    std::pair<iterator, iterator> equal_range(const key_type& __key) { return _M_ht.equal_range(__key); }
-    
-    std::pair<const_iterator, const_iterator> equal_range(const key_type& __key) const { return _M_ht.equal_range(__key); }
-    
-    size_type erase(const key_type& __key) { return _M_ht.erase(__key); }
-    
-    void erase(iterator __it) { _M_ht.erase(__it); }
-    
-    void erase(iterator __f, iterator __l) { _M_ht.erase(__f, __l); }
-    
-    void clear() { _M_ht.clear(); }
-    
-    void resize(size_type __hint) { _M_ht.resize(__hint); }
-    
-    size_type bucket_count() const { return _M_ht.bucket_count(); }
-    
-    size_type max_bucket_count() const { return _M_ht.max_bucket_count(); }
-    
-    size_type elems_in_bucket(size_type __n) const { return _M_ht.elems_in_bucket(__n); }
-  };
-  
-  template<class _Key, class _Tp, class _HF, class _EqKey, class _Alloc>
-  inline bool operator==(const hash_multimap<_Key, _Tp, _HF, _EqKey, _Alloc>& __hm1,
-                         const hash_multimap<_Key, _Tp, _HF, _EqKey, _Alloc>& __hm2)
-  { return __hm1._M_ht == __hm2._M_ht; }
-  
-  template<class _Key, class _Tp, class _HF, class _EqKey, class _Alloc>
-  inline bool operator!=(const hash_multimap<_Key, _Tp, _HF, _EqKey, _Alloc>& __hm1,
-                         const hash_multimap<_Key, _Tp, _HF, _EqKey, _Alloc>& __hm2)
-  { return !(__hm1 == __hm2); }
-  
-  template<class _Key, class _Tp, class _HashFn, class _EqlKey, class _Alloc>
-  inline void swap(hash_multimap<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm1,
-                   hash_multimap<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm2)
-  { __hm1.swap(__hm2); }
-  
-}
-
-namespace std
-{
-  // Specialization of insert_iterator so that it will work for HashMap
-  // and hash_multimap.
-  template<class _Key, class _Tp, class _HashFn,  class _EqKey, class _Alloc>
-  class insert_iterator<INTERP_KERNEL::HashMap<_Key, _Tp, _HashFn, 
-                                               _EqKey, _Alloc> >
-  {
-  protected:
-    typedef INTERP_KERNEL::HashMap<_Key, _Tp, _HashFn, _EqKey, _Alloc>
-    _Container;
-    _Container* container;
-  public:
-    typedef _Container          container_type;
-    typedef output_iterator_tag iterator_category;
-    typedef void                value_type;
-    typedef void                difference_type;
-    typedef void                pointer;
-    typedef void                reference;
-      
-    insert_iterator(_Container& __x) : container(&__x) {}
-    
-    insert_iterator(_Container& __x, typename _Container::iterator) : container(&__x) {}
-    
-    insert_iterator<_Container>& operator=(const typename _Container::value_type& __value__)
-    {
-      container->insert(__value__);
-      return *this;
-    }
-    
-    insert_iterator<_Container>& operator*() { return *this; }
-    
-    insert_iterator<_Container>& operator++() { return *this; }
-
-    insert_iterator<_Container>& operator++(int) { return *this; }
-  };
-
-  template<class _Key, class _Tp, class _HashFn,  class _EqKey, class _Alloc>
-  class insert_iterator<INTERP_KERNEL::hash_multimap<_Key, _Tp, _HashFn,
-                                                     _EqKey, _Alloc> >
-  {
-  protected:
-    typedef INTERP_KERNEL::hash_multimap<_Key, _Tp, _HashFn, _EqKey, _Alloc>
-    _Container;
-    _Container* container;
-    typename _Container::iterator iter;
-    
-  public:
-    typedef _Container          container_type;
-    typedef output_iterator_tag iterator_category;
-    typedef void                value_type;
-    typedef void                difference_type;
-    typedef void                pointer;
-    typedef void                reference;
-    
-    insert_iterator(_Container& __x) : container(&__x) {}
-
-    insert_iterator(_Container& __x, typename _Container::iterator) : container(&__x) {}
-
-    insert_iterator<_Container>& operator=(const typename _Container::value_type& __value__)
-    {
-      container->insert(__value__);
-      return *this;
-    }
-
-    insert_iterator<_Container>& operator*() { return *this; }
-
-    insert_iterator<_Container>& operator++() { return *this; }
-
-    insert_iterator<_Container>& operator++(int) { return *this; }
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/Bases/InterpKernelHashTable.hxx b/src/INTERP_KERNEL/Bases/InterpKernelHashTable.hxx
deleted file mode 100644
index 472891549..000000000
--- a/src/INTERP_KERNEL/Bases/InterpKernelHashTable.hxx
+++ /dev/null
@@ -1,995 +0,0 @@
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, 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
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-#ifndef __INTERPKERNELHASHTABLE_HXX__
-#define __INTERPKERNELHASHTABLE_HXX__
-
-#include "InterpKernelStlExt.hxx"
-#include "InterpKernelHashFun.hxx"
-
-#include <vector>
-#include <iterator>
-#include <algorithm>
-#include <functional>
-
-namespace INTERP_KERNEL
-{
-  template<class _Val>
-  struct _Hashtable_node
-  {
-    _Hashtable_node* _M_next;
-    _Val _M_val;
-  };
-
-  template<class _Val, class _Key, class _HashFcn, class _ExtractKey, 
-           class _EqualKey, class _Alloc = std::allocator<_Val> >
-  class hashtable;
-
-  template<class _Val, class _Key, class _HashFcn,
-           class _ExtractKey, class _EqualKey, class _Alloc>
-  struct _Hashtable_iterator;
-
-  template<class _Val, class _Key, class _HashFcn,
-           class _ExtractKey, class _EqualKey, class _Alloc>
-  struct _Hashtable_const_iterator;
-
-  template<class _Val, class _Key, class _HashFcn,
-           class _ExtractKey, class _EqualKey, class _Alloc>
-  struct _Hashtable_iterator
-  {
-    typedef hashtable<_Val, _Key, _HashFcn, _ExtractKey, _EqualKey, _Alloc>
-    _Hashtable;
-    typedef _Hashtable_iterator<_Val, _Key, _HashFcn,
-                                _ExtractKey, _EqualKey, _Alloc>
-    iterator;
-    typedef _Hashtable_const_iterator<_Val, _Key, _HashFcn,
-                                      _ExtractKey, _EqualKey, _Alloc>
-    const_iterator;
-    typedef _Hashtable_node<_Val> _Node;
-    typedef std::forward_iterator_tag iterator_category;
-    typedef _Val value_type;
-    typedef std::ptrdiff_t difference_type;
-    typedef std::size_t size_type;
-    typedef _Val& reference;
-    typedef _Val* pointer;
-      
-    _Node* _M_cur;
-    _Hashtable* _M_ht;
-
-    _Hashtable_iterator(_Node* __n, _Hashtable* __tab)
-      : _M_cur(__n), _M_ht(__tab) { }
-
-    _Hashtable_iterator() { }
-
-    reference
-    operator*() const
-    { return _M_cur->_M_val; }
-
-    pointer
-    operator->() const
-    { return &(operator*()); }
-
-    iterator&
-    operator++();
-
-    iterator
-    operator++(int);
-
-    bool
-    operator==(const iterator& __it) const
-    { return _M_cur == __it._M_cur; }
-
-    bool
-    operator!=(const iterator& __it) const
-    { return _M_cur != __it._M_cur; }
-  };
-
-  template<class _Val, class _Key, class _HashFcn,
-           class _ExtractKey, class _EqualKey, class _Alloc>
-  struct _Hashtable_const_iterator
-  {
-    typedef hashtable<_Val, _Key, _HashFcn, _ExtractKey, _EqualKey, _Alloc>
-    _Hashtable;
-    typedef _Hashtable_iterator<_Val,_Key,_HashFcn,
-                                _ExtractKey,_EqualKey,_Alloc>
-    iterator;
-    typedef _Hashtable_const_iterator<_Val, _Key, _HashFcn,
-                                      _ExtractKey, _EqualKey, _Alloc>
-    const_iterator;
-    typedef _Hashtable_node<_Val> _Node;
-
-    typedef std::forward_iterator_tag iterator_category;
-    typedef _Val value_type;
-    typedef std::ptrdiff_t difference_type;
-    typedef std::size_t size_type;
-    typedef const _Val& reference;
-    typedef const _Val* pointer;
-      
-    const _Node* _M_cur;
-    const _Hashtable* _M_ht;
-
-    _Hashtable_const_iterator(const _Node* __n, const _Hashtable* __tab)
-      : _M_cur(__n), _M_ht(__tab) { }
-
-    _Hashtable_const_iterator() { }
-
-    _Hashtable_const_iterator(const iterator& __it)
-      : _M_cur(__it._M_cur), _M_ht(__it._M_ht) { }
-
-    reference  operator*() const { return _M_cur->_M_val; }
-
-    pointer operator->() const { return &(operator*()); }
-
-    const_iterator& operator++();
-
-    const_iterator operator++(int);
-
-    bool operator==(const const_iterator& __it) const { return _M_cur == __it._M_cur; }
-
-    bool operator!=(const const_iterator& __it) const { return _M_cur != __it._M_cur; }
-  };
-
-  // Note: assumes long is at least 32 bits.
-  enum { _S_num_primes = 28 };
-
-  static const unsigned long __stl_prime_list[_S_num_primes] =
-    {
-      53ul,         97ul,         193ul,       389ul,       769ul,
-      1543ul,       3079ul,       6151ul,      12289ul,     24593ul,
-      49157ul,      98317ul,      196613ul,    393241ul,    786433ul,
-      1572869ul,    3145739ul,    6291469ul,   12582917ul,  25165843ul,
-      50331653ul,   100663319ul,  201326611ul, 402653189ul, 805306457ul,
-      1610612741ul, 3221225473ul, 4294967291ul
-    };
-
-  inline unsigned long
-  __stl_next_prime(unsigned long __n)
-  {
-    const unsigned long* __first = __stl_prime_list;
-    const unsigned long* __last = __stl_prime_list + (int)_S_num_primes;
-    const unsigned long* pos = std::lower_bound(__first, __last, __n);
-    return pos == __last ? *(__last - 1) : *pos;
-  }
-
-  // Forward declaration of operator==.  
-  template<class _Val, class _Key, class _HF, class _Ex,
-           class _Eq, class _All>
-  class hashtable;
-
-  template<class _Val, class _Key, class _HF, class _Ex,
-           class _Eq, class _All>
-  bool operator==(const hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>& __ht1,
-                  const hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>& __ht2);
-
-  // Hashtables handle allocators a bit differently than other
-  // containers do.  If we're using standard-conforming allocators, then
-  // a hashtable unconditionally has a member variable to hold its
-  // allocator, even if it so happens that all instances of the
-  // allocator type are identical.  This is because, for hashtables,
-  // this extra storage is negligible.  Additionally, a base class
-  // wouldn't serve any other purposes; it wouldn't, for example,
-  // simplify the exception-handling code.  
-  template<class _Val, class _Key, class _HashFcn,
-           class _ExtractKey, class _EqualKey, class _Alloc>
-  class hashtable
-  {
-  public:
-    typedef _Key key_type;
-    typedef _Val value_type;
-    typedef _HashFcn hasher;
-    typedef _EqualKey key_equal;
-
-    typedef std::size_t            size_type;
-    typedef std::ptrdiff_t         difference_type;
-    typedef value_type*       pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type&       reference;
-    typedef const value_type& const_reference;
-
-    hasher hash_funct() const { return _M_hash; }
-
-    key_equal key_eq() const { return _M_equals; }
-
-  private:
-    typedef _Hashtable_node<_Val> _Node;
-
-  public:
-    typedef typename _Alloc::template rebind<value_type>::other allocator_type;
-    allocator_type get_allocator() const { return _M_node_allocator; }
-
-  private:
-    typedef typename _Alloc::template rebind<_Node>::other _Node_Alloc;
-    typedef typename _Alloc::template rebind<_Node*>::other _Nodeptr_Alloc;
-    typedef std::vector<_Node*, _Nodeptr_Alloc> _Vector_type;
-
-    _Node_Alloc _M_node_allocator;
-
-    _Node *_M_get_node() { return _M_node_allocator.allocate(1); }
-
-    void _M_put_node(_Node* __p) { _M_node_allocator.deallocate(__p, 1); }
-
-  private:
-    hasher                _M_hash;
-    key_equal             _M_equals;
-    _ExtractKey           _M_get_key;
-    _Vector_type          _M_buckets;
-    size_type             _M_num_elements;
-      
-  public:
-    typedef _Hashtable_iterator<_Val, _Key, _HashFcn, _ExtractKey,
-                                _EqualKey, _Alloc>
-    iterator;
-    typedef _Hashtable_const_iterator<_Val, _Key, _HashFcn, _ExtractKey,
-                                      _EqualKey, _Alloc>
-    const_iterator;
-
-    friend struct
-    _Hashtable_iterator<_Val, _Key, _HashFcn, _ExtractKey, _EqualKey, _Alloc>;
-
-    friend struct
-    _Hashtable_const_iterator<_Val, _Key, _HashFcn, _ExtractKey,
-                              _EqualKey, _Alloc>;
-
-  public:
-    hashtable(size_type __n, const _HashFcn& __hf,
-              const _EqualKey& __eql, const _ExtractKey& __ext,
-              const allocator_type& __a = allocator_type())
-      : _M_node_allocator(__a), _M_hash(__hf), _M_equals(__eql),
-        _M_get_key(__ext), _M_buckets(__a), _M_num_elements(0)
-    { _M_initialize_buckets(__n); }
-
-    hashtable(size_type __n, const _HashFcn& __hf,
-              const _EqualKey& __eql,
-              const allocator_type& __a = allocator_type())
-      : _M_node_allocator(__a), _M_hash(__hf), _M_equals(__eql),
-        _M_get_key(_ExtractKey()), _M_buckets(__a), _M_num_elements(0)
-    { _M_initialize_buckets(__n); }
-
-    hashtable(const hashtable& __ht)
-      : _M_node_allocator(__ht.get_allocator()), _M_hash(__ht._M_hash),
-        _M_equals(__ht._M_equals), _M_get_key(__ht._M_get_key),
-        _M_buckets(__ht.get_allocator()), _M_num_elements(0)
-    { _M_copy_from(__ht); }
-
-    hashtable& operator= (const hashtable& __ht)
-    {
-      if (&__ht != this)
-        {
-          clear();
-          _M_hash = __ht._M_hash;
-          _M_equals = __ht._M_equals;
-          _M_get_key = __ht._M_get_key;
-          _M_copy_from(__ht);
-        }
-      return *this;
-    }
-
-    ~hashtable()
-    { clear(); }
-
-    size_type size() const { return _M_num_elements; }
-
-    size_type max_size() const { return size_type(-1); }
-
-    bool empty() const { return size() == 0; }
-
-    void swap(hashtable& __ht) 
-    {
-      std::swap(_M_hash, __ht._M_hash);
-      std::swap(_M_equals, __ht._M_equals);
-      std::swap(_M_get_key, __ht._M_get_key);
-      _M_buckets.swap(__ht._M_buckets);
-      std::swap(_M_num_elements, __ht._M_num_elements);
-    }
-
-    iterator begin()
-    {
-      for (size_type __n = 0; __n < _M_buckets.size(); ++__n)
-        if (_M_buckets[__n])
-          return iterator(_M_buckets[__n], this);
-      return end();
-    }
-
-    iterator end() { return iterator(0, this); }
-
-    const_iterator begin() const 
-    {
-      for (size_type __n = 0; __n < _M_buckets.size(); ++__n)
-        if (_M_buckets[__n])
-          return const_iterator(_M_buckets[__n], this);
-      return end();
-    }
-
-    const_iterator end() const { return const_iterator(0, this); }
-
-    template<class _Vl, class _Ky, class _HF, class _Ex, class _Eq, class _Al>
-    friend bool operator==(const hashtable<_Vl, _Ky, _HF, _Ex, _Eq, _Al>&,
-                           const hashtable<_Vl, _Ky, _HF, _Ex, _Eq, _Al>&);
-    
-  public:
-    size_type bucket_count() const { return _M_buckets.size(); }
-
-    size_type max_bucket_count() const { return __stl_prime_list[(int)_S_num_primes - 1]; }
-
-    size_type elems_in_bucket(size_type __bucket) const 
-    {
-      size_type __result = 0;
-      for (_Node* __n = _M_buckets[__bucket]; __n; __n = __n->_M_next)
-        __result += 1;
-      return __result;
-    }
-
-    std::pair<iterator, bool> insert_unique(const value_type& __obj)
-    {
-      resize(_M_num_elements + 1);
-      return insert_unique_noresize(__obj);
-    }
-
-    iterator insert_equal(const value_type& __obj)
-    {
-      resize(_M_num_elements + 1);
-      return insert_equal_noresize(__obj);
-    }
-
-    std::pair<iterator, bool> insert_unique_noresize(const value_type& __obj);
-
-    iterator insert_equal_noresize(const value_type& __obj);
-
-    template<class _InputIterator>
-    void insert_unique(_InputIterator __f, _InputIterator __l)
-    { insert_unique(__f, __l, __iterator_category(__f)); }
-
-    template<class _InputIterator>
-    void insert_equal(_InputIterator __f, _InputIterator __l)
-    { insert_equal(__f, __l, __iterator_category(__f)); }
-
-    template<class _InputIterator>
-    void insert_unique(_InputIterator __f, _InputIterator __l,
-                       std::input_iterator_tag)
-    {
-      for ( ; __f != __l; ++__f)
-        insert_unique(*__f);
-    }
-
-    template<class _InputIterator>
-    void insert_equal(_InputIterator __f, _InputIterator __l,
-                      std::input_iterator_tag)
-    {
-      for ( ; __f != __l; ++__f)
-        insert_equal(*__f);
-    }
-    
-    template<class _ForwardIterator>
-    void insert_unique(_ForwardIterator __f, _ForwardIterator __l,
-                       std::forward_iterator_tag)
-    {
-      size_type __n = std::distance(__f, __l);
-      resize(_M_num_elements + __n);
-      for ( ; __n > 0; --__n, ++__f)
-        insert_unique_noresize(*__f);
-    }
-
-    template<class _ForwardIterator>
-    void
-    insert_equal(_ForwardIterator __f, _ForwardIterator __l,
-                 std::forward_iterator_tag)
-    {
-      size_type __n = std::distance(__f, __l);
-      resize(_M_num_elements + __n);
-      for ( ; __n > 0; --__n, ++__f)
-        insert_equal_noresize(*__f);
-    }
-
-    reference find_or_insert(const value_type& __obj);
-
-    iterator find(const key_type& __key)
-    {
-      size_type __n = _M_bkt_num_key(__key);
-      _Node* __first;
-      for (__first = _M_buckets[__n];
-           __first && !_M_equals(_M_get_key(__first->_M_val), __key);
-           __first = __first->_M_next)
-        { }
-      return iterator(__first, this);
-    }
-
-    const_iterator find(const key_type& __key) const
-    {
-      size_type __n = _M_bkt_num_key(__key);
-      const _Node* __first;
-      for (__first = _M_buckets[__n];
-           __first && !_M_equals(_M_get_key(__first->_M_val), __key);
-           __first = __first->_M_next)
-        { }
-      return const_iterator(__first, this);
-    }
-
-    size_type count(const key_type& __key) const
-    {
-      const size_type __n = _M_bkt_num_key(__key);
-      size_type __result = 0;
-      for (const _Node* __cur = _M_buckets[__n]; __cur;
-           __cur = __cur->_M_next)
-        if (_M_equals(_M_get_key(__cur->_M_val), __key))
-          ++__result;
-      return __result;
-    }
-
-    std::pair<iterator, iterator> equal_range(const key_type& __key);
-
-    std::pair<const_iterator, const_iterator> equal_range(const key_type& __key) const;
-
-    size_type erase(const key_type& __key);
-      
-    void erase(const iterator& __it);
-
-    void erase(iterator __first, iterator __last);
-
-    void erase(const const_iterator& __it);
-
-    void erase(const_iterator __first, const_iterator __last);
-
-    void resize(size_type __num_elements_hint);
-
-    void clear();
-
-  private:
-    size_type _M_next_size(size_type __n) const { return __stl_next_prime(__n); }
-
-    void _M_initialize_buckets(size_type __n)
-    {
-      const size_type __n_buckets = _M_next_size(__n);
-      _M_buckets.reserve(__n_buckets);
-      _M_buckets.insert(_M_buckets.end(), __n_buckets, (_Node*) 0);
-      _M_num_elements = 0;
-    }
-
-    size_type _M_bkt_num_key(const key_type& __key) const
-    { return _M_bkt_num_key(__key, _M_buckets.size()); }
-    
-    size_type _M_bkt_num(const value_type& __obj) const
-    { return _M_bkt_num_key(_M_get_key(__obj)); }
-    
-    size_type _M_bkt_num_key(const key_type& __key, std::size_t __n) const
-    { return _M_hash(__key) % __n; }
-    
-    size_type _M_bkt_num(const value_type& __obj, std::size_t __n) const
-    { return _M_bkt_num_key(_M_get_key(__obj), __n); }
-
-    _Node* _M_new_node(const value_type& __obj)
-    {
-      _Node* __n = _M_get_node();
-      __n->_M_next = 0;
-      try
-        {
-          this->get_allocator().construct(&__n->_M_val, __obj);
-          return __n;
-        }
-      catch(...)
-        {
-          _M_put_node(__n);
-          throw;
-        }
-    }
-
-    void _M_delete_node(_Node* __n)
-    {
-      this->get_allocator().destroy(&__n->_M_val);
-      _M_put_node(__n);
-    }
-      
-    void _M_erase_bucket(const size_type __n, _Node* __first, _Node* __last);
-
-    void _M_erase_bucket(const size_type __n, _Node* __last);
-
-    void _M_copy_from(const hashtable& __ht);
-  };
-
-  template<class _Val, class _Key, class _HF, class _ExK, class _EqK, class _All>
-  _Hashtable_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>&
-  _Hashtable_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>::
-  operator++()
-  {
-    const _Node* __old = _M_cur;
-    _M_cur = _M_cur->_M_next;
-    if (!_M_cur)
-      {
-        size_type __bucket = _M_ht->_M_bkt_num(__old->_M_val);
-        while (!_M_cur && ++__bucket < _M_ht->_M_buckets.size())
-          _M_cur = _M_ht->_M_buckets[__bucket];
-      }
-    return *this;
-  }
-
-  template<class _Val, class _Key, class _HF, class _ExK, class _EqK, class _All>
-  inline _Hashtable_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>
-  _Hashtable_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>::
-  operator++(int)
-  {
-    iterator __tmp = *this;
-    ++*this;
-    return __tmp;
-  }
-
-  template<class _Val, class _Key, class _HF, class _ExK, class _EqK, class _All>
-  _Hashtable_const_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>&
-  _Hashtable_const_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>::
-  operator++()
-  {
-    const _Node* __old = _M_cur;
-    _M_cur = _M_cur->_M_next;
-    if (!_M_cur)
-      {
-        size_type __bucket = _M_ht->_M_bkt_num(__old->_M_val);
-        while (!_M_cur && ++__bucket < _M_ht->_M_buckets.size())
-          _M_cur = _M_ht->_M_buckets[__bucket];
-      }
-    return *this;
-  }
-
-  template<class _Val, class _Key, class _HF, class _ExK, class _EqK,
-           class _All>
-  inline _Hashtable_const_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>
-  _Hashtable_const_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>::
-  operator++(int)
-  {
-    const_iterator __tmp = *this;
-    ++*this;
-    return __tmp;
-  }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-  bool operator==(const hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>& __ht1,
-                  const hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>& __ht2)
-  {
-    typedef typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::_Node _Node;
-    
-    if (__ht1._M_buckets.size() != __ht2._M_buckets.size())
-      return false;
-    
-    for (std::size_t __n = 0; __n < __ht1._M_buckets.size(); ++__n)
-      {
-        _Node* __cur1 = __ht1._M_buckets[__n];
-        _Node* __cur2 = __ht2._M_buckets[__n];
-        // Check same length of lists
-        for (; __cur1 && __cur2;
-             __cur1 = __cur1->_M_next, __cur2 = __cur2->_M_next)
-          { } 
-        if (__cur1 || __cur2)
-          return false;
-        // Now check one's elements are in the other
-        for (__cur1 = __ht1._M_buckets[__n] ; __cur1;
-             __cur1 = __cur1->_M_next)
-          {
-            bool _found__cur1 = false;
-            for (__cur2 = __ht2._M_buckets[__n];
-                 __cur2; __cur2 = __cur2->_M_next)
-              {
-                if (__cur1->_M_val == __cur2->_M_val)
-                  {
-                    _found__cur1 = true;
-                    break;
-                  }
-              }
-            if (!_found__cur1)
-              return false;
-          }
-      }
-    return true;
-  }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-  inline bool operator!=(const hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>& __ht1,
-                         const hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>& __ht2)
-  { return !(__ht1 == __ht2); }
-
-  template<class _Val, class _Key, class _HF, class _Extract, class _EqKey, class _All>
-  inline void swap(hashtable<_Val, _Key, _HF, _Extract, _EqKey, _All>& __ht1,
-                   hashtable<_Val, _Key, _HF, _Extract, _EqKey, _All>& __ht2)
-  { __ht1.swap(__ht2); }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-  std::pair<typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::iterator, bool>
-  hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
-  insert_unique_noresize(const value_type& __obj)
-  {
-    const size_type __n = _M_bkt_num(__obj);
-    _Node* __first = _M_buckets[__n];
-      
-    for (_Node* __cur = __first; __cur; __cur = __cur->_M_next)
-      if (_M_equals(_M_get_key(__cur->_M_val), _M_get_key(__obj)))
-        return std::pair<iterator, bool>(iterator(__cur, this), false);
-      
-    _Node* __tmp = _M_new_node(__obj);
-    __tmp->_M_next = __first;
-    _M_buckets[__n] = __tmp;
-    ++_M_num_elements;
-    return std::pair<iterator, bool>(iterator(__tmp, this), true);
-  }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-  typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::iterator
-  hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
-  insert_equal_noresize(const value_type& __obj)
-  {
-    const size_type __n = _M_bkt_num(__obj);
-    _Node* __first = _M_buckets[__n];
-      
-    for (_Node* __cur = __first; __cur; __cur = __cur->_M_next)
-      if (_M_equals(_M_get_key(__cur->_M_val), _M_get_key(__obj)))
-        {
-          _Node* __tmp = _M_new_node(__obj);
-          __tmp->_M_next = __cur->_M_next;
-          __cur->_M_next = __tmp;
-          ++_M_num_elements;
-          return iterator(__tmp, this);
-        }
-
-    _Node* __tmp = _M_new_node(__obj);
-    __tmp->_M_next = __first;
-    _M_buckets[__n] = __tmp;
-    ++_M_num_elements;
-    return iterator(__tmp, this);
-  }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-  typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::reference
-  hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
-  find_or_insert(const value_type& __obj)
-  {
-    resize(_M_num_elements + 1);
-
-    size_type __n = _M_bkt_num(__obj);
-    _Node* __first = _M_buckets[__n];
-      
-    for (_Node* __cur = __first; __cur; __cur = __cur->_M_next)
-      if (_M_equals(_M_get_key(__cur->_M_val), _M_get_key(__obj)))
-        return __cur->_M_val;
-      
-    _Node* __tmp = _M_new_node(__obj);
-    __tmp->_M_next = __first;
-    _M_buckets[__n] = __tmp;
-    ++_M_num_elements;
-    return __tmp->_M_val;
-  }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-  std::pair<typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::iterator,
-            typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::iterator>
-  hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::equal_range(const key_type& __key)
-  {
-    typedef std::pair<iterator, iterator> _Pii;
-    const size_type __n = _M_bkt_num_key(__key);
-    
-    for (_Node* __first = _M_buckets[__n]; __first;
-         __first = __first->_M_next)
-      if (_M_equals(_M_get_key(__first->_M_val), __key))
-        {
-          for (_Node* __cur = __first->_M_next; __cur;
-               __cur = __cur->_M_next)
-            if (!_M_equals(_M_get_key(__cur->_M_val), __key))
-              return _Pii(iterator(__first, this), iterator(__cur, this));
-          for (size_type __m = __n + 1; __m < _M_buckets.size(); ++__m)
-            if (_M_buckets[__m])
-              return _Pii(iterator(__first, this),
-                          iterator(_M_buckets[__m], this));
-          return _Pii(iterator(__first, this), end());
-        }
-    return _Pii(end(), end());
-  }
-  
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-  std::pair<typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::const_iterator,
-            typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::const_iterator>
-  hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::equal_range(const key_type& __key) const
-  {
-    typedef std::pair<const_iterator, const_iterator> _Pii;
-    const size_type __n = _M_bkt_num_key(__key);
-    
-    for (const _Node* __first = _M_buckets[__n]; __first;
-         __first = __first->_M_next)
-      {
-        if (_M_equals(_M_get_key(__first->_M_val), __key))
-          {
-            for (const _Node* __cur = __first->_M_next; __cur;
-                 __cur = __cur->_M_next)
-              if (!_M_equals(_M_get_key(__cur->_M_val), __key))
-                return _Pii(const_iterator(__first, this),
-                          const_iterator(__cur, this));
-            for (size_type __m = __n + 1; __m < _M_buckets.size(); ++__m)
-              if (_M_buckets[__m])
-                return _Pii(const_iterator(__first, this),
-                            const_iterator(_M_buckets[__m], this));
-            return _Pii(const_iterator(__first, this), end());
-          }
-      }
-    return _Pii(end(), end());
-  }
-  
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-  typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::size_type
-  hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::erase(const key_type& __key)
-  {
-    const size_type __n = _M_bkt_num_key(__key);
-    _Node* __first = _M_buckets[__n];
-    size_type __erased = 0;
-    
-    if (__first)
-      {
-        _Node* __cur = __first;
-        _Node* __next = __cur->_M_next;
-        while (__next)
-          {
-            if (_M_equals(_M_get_key(__next->_M_val), __key))
-              {
-                __cur->_M_next = __next->_M_next;
-                _M_delete_node(__next);
-                __next = __cur->_M_next;
-                ++__erased;
-                --_M_num_elements;
-              }
-            else
-              {
-                __cur = __next;
-                __next = __cur->_M_next;
-              }
-          }
-        if (_M_equals(_M_get_key(__first->_M_val), __key))
-          {
-            _M_buckets[__n] = __first->_M_next;
-            _M_delete_node(__first);
-            ++__erased;
-            --_M_num_elements;
-          }
-      }
-    return __erased;
-  }
-  
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-  void hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::erase(const iterator& __it)
-  {
-    _Node* __p = __it._M_cur;
-    if (__p)
-      {
-        const size_type __n = _M_bkt_num(__p->_M_val);
-        _Node* __cur = _M_buckets[__n]; 
-        if (__cur == __p)
-          {
-            _M_buckets[__n] = __cur->_M_next;
-            _M_delete_node(__cur);
-            --_M_num_elements;
-          }
-        else
-          {
-            _Node* __next = __cur->_M_next;
-            while (__next)
-              {
-                if (__next == __p)
-                  {
-                    __cur->_M_next = __next->_M_next;
-                    _M_delete_node(__next);
-                    --_M_num_elements;
-                    break;
-                  }
-                else
-                  {
-                    __cur = __next;
-                    __next = __cur->_M_next;
-                  }
-              }
-          }
-      }
-  }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-  void hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::erase(iterator __first, iterator __last)
-  {
-    size_type __f_bucket = __first._M_cur ? _M_bkt_num(__first._M_cur->_M_val) : _M_buckets.size();
-    
-    size_type __l_bucket = __last._M_cur ? _M_bkt_num(__last._M_cur->_M_val) : _M_buckets.size();
-    
-    if (__first._M_cur == __last._M_cur)
-      return;
-    else if (__f_bucket == __l_bucket)
-      _M_erase_bucket(__f_bucket, __first._M_cur, __last._M_cur);
-    else
-      {
-        _M_erase_bucket(__f_bucket, __first._M_cur, 0);
-        for (size_type __n = __f_bucket + 1; __n < __l_bucket; ++__n)
-          _M_erase_bucket(__n, 0);
-        if (__l_bucket != _M_buckets.size())
-          _M_erase_bucket(__l_bucket, __last._M_cur);
-      }
-  }
-  
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-  inline void
-  hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
-  erase(const_iterator __first, const_iterator __last)
-  {
-    erase(iterator(const_cast<_Node*>(__first._M_cur),
-                   const_cast<hashtable*>(__first._M_ht)),
-          iterator(const_cast<_Node*>(__last._M_cur),
-                   const_cast<hashtable*>(__last._M_ht)));
-  }
-  
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-  inline void hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::erase(const const_iterator& __it)
-  { erase(iterator(const_cast<_Node*>(__it._M_cur), const_cast<hashtable*>(__it._M_ht))); }
-  
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-  void hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::resize(size_type __num_elements_hint)
-  {
-    const size_type __old_n = _M_buckets.size();
-    if (__num_elements_hint > __old_n)
-      {
-        const size_type __n = _M_next_size(__num_elements_hint);
-        if (__n > __old_n)
-          {
-            _Vector_type __tmp(__n, (_Node*)(0), _M_buckets.get_allocator());
-            try
-              {
-                for (size_type __bucket = 0; __bucket < __old_n; ++__bucket)
-                  {
-                    _Node* __first = _M_buckets[__bucket];
-                    while (__first)
-                      {
-                        size_type __new_bucket = _M_bkt_num(__first->_M_val,__n);
-                        _M_buckets[__bucket] = __first->_M_next;
-                        __first->_M_next = __tmp[__new_bucket];
-                        __tmp[__new_bucket] = __first;
-                        __first = _M_buckets[__bucket];
-                      }
-                  }
-                _M_buckets.swap(__tmp);
-              }
-            catch(...)
-              {
-                for (size_type __bucket = 0; __bucket < __tmp.size();++__bucket)
-                  {
-                    while (__tmp[__bucket])
-                      {
-                        _Node* __next = __tmp[__bucket]->_M_next;
-                        _M_delete_node(__tmp[__bucket]);
-                        __tmp[__bucket] = __next;
-                      }
-                  }
-                throw;
-              }
-          }
-      }
-  }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-  void hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::_M_erase_bucket(const size_type __n, _Node* __first, _Node* __last)
-  {
-    _Node* __cur = _M_buckets[__n];
-    if (__cur == __first)
-      _M_erase_bucket(__n, __last);
-    else
-      {
-        _Node* __next;
-        for (__next = __cur->_M_next;
-             __next != __first;
-             __cur = __next, __next = __cur->_M_next)
-          ;
-        while (__next != __last)
-          {
-            __cur->_M_next = __next->_M_next;
-            _M_delete_node(__next);
-            __next = __cur->_M_next;
-            --_M_num_elements;
-          }
-      }
-  }
-  
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-  void hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::_M_erase_bucket(const size_type __n, _Node* __last)
-  {
-    _Node* __cur = _M_buckets[__n];
-    while (__cur != __last)
-      {
-        _Node* __next = __cur->_M_next;
-        _M_delete_node(__cur);
-        __cur = __next;
-        _M_buckets[__n] = __cur;
-        --_M_num_elements;
-      }
-  }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-  void hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::clear()
-  {
-    for (size_type __i = 0; __i < _M_buckets.size(); ++__i)
-      {
-        _Node* __cur = _M_buckets[__i];
-        while (__cur != 0)
-          {
-            _Node* __next = __cur->_M_next;
-            _M_delete_node(__cur);
-            __cur = __next;
-          }
-        _M_buckets[__i] = 0;
-      }
-    _M_num_elements = 0;
-  }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-  void hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::_M_copy_from(const hashtable& __ht)
-  {
-    _M_buckets.clear();
-    _M_buckets.reserve(__ht._M_buckets.size());
-    _M_buckets.insert(_M_buckets.end(), __ht._M_buckets.size(), (_Node*) 0);
-    try
-      {
-        for (size_type __i = 0; __i < __ht._M_buckets.size(); ++__i) {
-          const _Node* __cur = __ht._M_buckets[__i];
-          if (__cur)
-            {
-              _Node* __local_copy = _M_new_node(__cur->_M_val);
-              _M_buckets[__i] = __local_copy;
-              for (_Node* __next = __cur->_M_next;
-                   __next;
-                   __cur = __next, __next = __cur->_M_next)
-                {
-                  __local_copy->_M_next = _M_new_node(__next->_M_val);
-                  __local_copy = __local_copy->_M_next;
-                }
-            }
-        }
-        _M_num_elements = __ht._M_num_elements;
-      }
-    catch(...)
-      {
-        clear();
-        throw;
-      }
-  }
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/Bases/InterpKernelStlExt.hxx b/src/INTERP_KERNEL/Bases/InterpKernelStlExt.hxx
deleted file mode 100644
index 36b40df94..000000000
--- a/src/INTERP_KERNEL/Bases/InterpKernelStlExt.hxx
+++ /dev/null
@@ -1,43 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __INTERPKERNELSTLEXT_HXX__
-#define __INTERPKERNELSTLEXT_HXX__
-
-#include <functional>
-
-namespace INTERP_KERNEL
-{
-  namespace STLEXT
-  {
-    template<typename _Pair>
-    struct Select1st : public std::unary_function<_Pair, typename _Pair::first_type>
-    {
-      typename _Pair::first_type& operator()(_Pair& __x) const { return __x.first; }
-      const typename _Pair::first_type&operator()(const _Pair& __x) const { return __x.first; }
-    };
-
-    template<typename _T1, typename _T2>
-    inline void Construct(_T1* __p, const _T2& __value__) { ::new(static_cast<void*>(__p)) _T1(__value__); }
-
-    template<typename _Tp> inline void Destroy(_Tp* __pointer) { __pointer->~_Tp(); }
-  }
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/CurveIntersector.hxx b/src/INTERP_KERNEL/CurveIntersector.hxx
deleted file mode 100644
index 8e1f3929c..000000000
--- a/src/INTERP_KERNEL/CurveIntersector.hxx
+++ /dev/null
@@ -1,74 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __CURVEINTERSECTOR_HXX__
-#define __CURVEINTERSECTOR_HXX__
-
-#include "TargetIntersector.hxx"
-#include "NormalizedUnstructuredMesh.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  class CurveIntersector : public TargetIntersector<MyMeshType,MyMatrix>
-  {
-  public:
-    static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-    static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    typedef typename MyMeshType::MyConnType ConnType;
-    static const NumberingPolicy numPol=MyMeshType::My_numPol;
-  public:
-    CurveIntersector(const MyMeshType& meshT, const MyMeshType& meshS,
-                     double  precision, double adjustmentEpsAbs, double medianLine, int printLevel);
-    virtual ~CurveIntersector();
-    void createBoundingBoxes(const MyMeshType& mesh, std::vector<double>& bbox);
-    void adjustBoundingBoxes(std::vector<double>& bbox, double adjustmentEpsAbs);
-    static void getElemBB(double* bb, const MyMeshType& mesh, ConnType iP, ConnType nb_nodes);
-
-  protected :
-    bool getRealTargetCoordinates(ConnType icellT, std::vector<double>& coordsT);
-    bool getRealSourceCoordinates(ConnType icellS, std::vector<double>& coordsS);
-    double intersectSegments(double *Coords_T, double *Coords_S);
-
-    struct TDualSegment
-    {
-      std::vector<double> _coords;
-      int                 _nodeId; // in mesh mode
-    };
-    static void getDualSegments(ConnType                   icell,
-                                const MyMeshType&          mesh,
-                                std::vector<TDualSegment>& segments);
-
-  protected:
-    const ConnType *_connectT;
-    const ConnType *_connectS;
-    const double *_coordsT;
-    const double *_coordsS;
-    const ConnType *_connIndexT;
-    const ConnType *_connIndexS;
-    const MyMeshType& _meshT;
-    const MyMeshType& _meshS;
-    double _tolerance;
-    double _precision;
-    double _median_line;
-    int _print_level;
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/CurveIntersector.txx b/src/INTERP_KERNEL/CurveIntersector.txx
deleted file mode 100644
index 7fb2be48f..000000000
--- a/src/INTERP_KERNEL/CurveIntersector.txx
+++ /dev/null
@@ -1,397 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-#ifndef __CURVEINTERSECTOR_TXX__
-#define __CURVEINTERSECTOR_TXX__
-
-#include "CurveIntersector.hxx"
-#include "InterpolationUtils.hxx"
-
-#include <limits>
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  CurveIntersector<MyMeshType,MyMatrix>
-  ::CurveIntersector(const MyMeshType& meshT, const MyMeshType& meshS,
-                     double precision, double tolerance, double medianLine, int printLevel):
-    _meshT(meshT),
-    _meshS(meshS),
-    _tolerance(tolerance),
-    _precision(precision),
-    _median_line(medianLine),
-    _print_level(printLevel)
-  {
-    if ( SPACEDIM != 1 && SPACEDIM != 2 )
-      throw Exception("CurveIntersector(): space dimension of mesh must be 1 or 2");
-    if ( MESHDIM != 1 )
-      throw Exception("CurveIntersector(): mesh dimension must be 1");
-
-    _connectT = meshT.getConnectivityPtr();
-    _connectS = meshS.getConnectivityPtr();
-    _connIndexT = meshT.getConnectivityIndexPtr();
-    _connIndexS = meshS.getConnectivityIndexPtr();
-    _coordsT = meshT.getCoordinatesPtr();
-    _coordsS = meshS.getCoordinatesPtr();
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  CurveIntersector<MyMeshType,MyMatrix>::~CurveIntersector()
-  {
-  }
-
-  //================================================================================
-  /*!
-    \brief creates the bounding boxes for all the cells of mesh \a mesh
-
-    \param mesh structure pointing to the mesh
-    \param bbox vector containing the bounding boxes
-  */
-  //================================================================================
-
-  template<class MyMeshType, class MyMatrix>
-  void CurveIntersector<MyMeshType,MyMatrix>::createBoundingBoxes (const MyMeshType&    mesh,
-                                                                   std::vector<double>& bbox)
-  {
-    long nbelems = mesh.getNumberOfElements();
-    bbox.resize(2*SPACEDIM* nbelems);
-    const double* coords = mesh.getCoordinatesPtr();
-    const ConnType* conn = mesh.getConnectivityPtr();
-    const ConnType* conn_index = mesh.getConnectivityIndexPtr();  
-    int ibox=0;
-    for(long icell=0; icell<nbelems; icell++)
-      {
-        int nb_nodes_per_elem = conn_index[icell+1]-conn_index[icell];
-        //initializing bounding box limits
-        for(int idim=0; idim<SPACEDIM; idim++)
-          {
-            bbox[2*SPACEDIM*ibox+2*idim]   =  std::numeric_limits<double>::max();
-            bbox[2*SPACEDIM*ibox+2*idim+1] = -std::numeric_limits<double>::max();
-          }
-        //updating the bounding box with each node of the element
-        for (int j=0; j<nb_nodes_per_elem; j++)
-          {
-            const double* coord_node = coords + 
-              SPACEDIM*OTT<ConnType,numPol>
-              ::coo2C(conn[OTT<ConnType,numPol>::conn2C(conn_index[icell]+j)]);
-            for(int idim=0; idim<SPACEDIM; idim++)
-              {
-                double x = *(coord_node+idim);
-                bbox[ibox*2*SPACEDIM + 2*idim]   =
-                  ( bbox[ibox*2*SPACEDIM + 2*idim] < x ) ? bbox[ibox*2*SPACEDIM + 2*idim] : x;
-                bbox[ibox*2*SPACEDIM + 2*idim+1] =
-                  ( bbox[ibox*2*SPACEDIM + 2*idim+1] > x ) ? bbox[ibox*2*SPACEDIM + 2*idim+1] : x;
-              }
-          }
-        ibox++;
-      }
-  }
-
-  //================================================================================
-  /*!
-    Computes the bouding box of a given element. iP in numPol mode.
-  */
-  //================================================================================
-
-  template<class MyMeshType, class MyMatrix>
-  void CurveIntersector<MyMeshType,MyMatrix>::getElemBB (double*           bb,
-                                                         const MyMeshType& mesh,
-                                                         ConnType          iP,
-                                                         ConnType          nb_nodes)
-  {
-    const double* coords = mesh.getCoordinatesPtr();
-    const ConnType* conn_index = mesh.getConnectivityIndexPtr();
-    const ConnType* conn = mesh.getConnectivityPtr();
-    //initializing bounding box limits
-    for(int idim=0; idim<SPACEDIM; idim++)
-      {
-        bb[2*idim  ] =  std::numeric_limits<double>::max();
-        bb[2*idim+1] = -std::numeric_limits<double>::max();
-      }
-
-    for (ConnType i=0; i<nb_nodes; i++)
-      {
-        //MN: iP= cell index, not node index, use of connectivity array ?
-        const double* coord_node = coords +
-          SPACEDIM*(OTT<ConnType,numPol>::coo2C(conn[OTT<ConnType,numPol>::conn2C(conn_index[OTT<ConnType,numPol>::ind2C(iP)]+i)]));
-        for(int idim=0; idim<SPACEDIM; idim++)
-          {
-            double x = *(coord_node+idim);
-            bb[2*idim  ] = (x<bb[2*idim  ]) ? x : bb[2*idim  ];
-            bb[2*idim+1] = (x>bb[2*idim+1]) ? x : bb[2*idim+1];
-          }
-      }
-  }
-
-  //================================================================================
-  /*! Readjusts a set of bounding boxes so that they are extended
-    in all dimensions for avoiding missing interesting intersections
-
-    \param bbox vector containing the bounding boxes
-  */
-  //================================================================================
-
-  template<class MyMeshType, class MyMatrix>
-  void CurveIntersector<MyMeshType,MyMatrix>::adjustBoundingBoxes (std::vector<double>& bbox,
-                                                                   double adjustmentEpsAbs)
-  {
-    long size = bbox.size()/(2*SPACEDIM);
-    for (int i=0; i<size; i++)
-      {
-        for(int idim=0; idim<SPACEDIM; idim++)
-          {
-            bbox[i*2*SPACEDIM+2*idim  ] -= adjustmentEpsAbs;
-            bbox[i*2*SPACEDIM+2*idim+1] += adjustmentEpsAbs;
-          }
-      }
-  }
-
-  //================================================================================
-  /*!
-   * @param icellT id in target mesh in format of MyMeshType.
-   * @param coordsT output val that stores coordinates of the target cell
-   * automatically resized to the right length.
-   * @return true if segment is quadratic and in this case coordinates of medium node
-   * are placed in the middle of coordsT
-   */
-  //================================================================================
-
-  template<class MyMeshType, class MyMatrix>
-  bool CurveIntersector<MyMeshType,MyMatrix>::getRealTargetCoordinates
-  (ConnType icellT, std::vector<double>& coordsT)
-  {
-    int nbNodesT = _connIndexT[OTT<ConnType,numPol>::ind2C(icellT)+1] -
-      _connIndexT[OTT<ConnType,numPol>::ind2C(icellT)];
-    coordsT.resize(SPACEDIM*nbNodesT);
-    for (ConnType iT=0; iT<nbNodesT; iT++)
-      {
-        for(int idim=0; idim<SPACEDIM; idim++)
-          {
-            coordsT[SPACEDIM*iT+idim] =
-              _coordsT[SPACEDIM*OTT<ConnType,numPol>::coo2C(_connectT[OTT<ConnType,numPol>::conn2C(_connIndexT[OTT<ConnType,numPol>::ind2C(icellT)]+iT)])+idim];
-          }
-      }
-    if ( nbNodesT > 2 )
-      {
-        for(int idim=0; idim<SPACEDIM; idim++)
-          std::swap( coordsT[SPACEDIM*1+idim], coordsT[SPACEDIM*2+idim]);
-        return true;
-      }
-    return false;
-  }
-
-  //================================================================================
-  /*!
-   * @param icellS id in source mesh in format of MyMeshType.
-   * @param coordsS output val that stores coordinates of the source cell automatically resized to the right length.
-   * @return true if segment is quadratic and in this case coordinates of medium node
-   * are placed in the middle of coordsS
-   */
-  //================================================================================
-
-  template<class MyMeshType, class MyMatrix>
-  bool CurveIntersector<MyMeshType,MyMatrix>::getRealSourceCoordinates
-  (ConnType icellS, std::vector<double>& coordsS)
-  {
-    int nbNodesS = _connIndexS[OTT<ConnType,numPol>::ind2C(icellS)+1] -
-      _connIndexS[OTT<ConnType,numPol>::ind2C(icellS)];
-    coordsS.resize(SPACEDIM*nbNodesS);
-    for(ConnType iS=0; iS<nbNodesS; iS++)
-      {
-        for(int idim=0; idim<SPACEDIM; idim++)
-          {
-            coordsS[SPACEDIM*iS+idim] =
-              _coordsS[SPACEDIM*OTT<ConnType,numPol>::coo2C(_connectS[OTT<ConnType,numPol>::conn2C(_connIndexS[OTT<ConnType,numPol>::ind2C(icellS)]+iS)])+idim];
-          }
-      }
-    if ( nbNodesS > 2 )
-      {
-        for(int idim=0; idim<SPACEDIM; idim++)
-          std::swap( coordsS[SPACEDIM*1+idim], coordsS[SPACEDIM*2+idim]);
-        return true;
-      }
-    return false;
-  }
-
-  //================================================================================
-  /*!
-   * \brief Return dual segments of given segment
-   *  \param icell - given segment in C mode
-   *  \param mesh - mesh
-   *  \param segments - dual segments
-   */
-  //================================================================================
-
-  template<class MyMeshType, class MyMatrix>
-  void CurveIntersector<MyMeshType,MyMatrix>::getDualSegments(ConnType                   icell,
-                                                              const MyMeshType&          mesh,
-                                                              std::vector<TDualSegment>& segments)
-  {
-    // get coordinates of cell nodes
-    int nbNodes;
-    std::vector<double> ncoords;
-    std::vector<int>    nodeIds;
-    {
-      const ConnType *connect   = mesh.getConnectivityPtr();
-      const ConnType *connIndex = mesh.getConnectivityIndexPtr();
-      const double *coords      = mesh.getCoordinatesPtr();
-
-      nbNodes = connIndex[icell+1] - connIndex[icell];
-
-      ncoords.resize(SPACEDIM*nbNodes);
-      nodeIds.resize(nbNodes);
-
-      for(int i=0; i<nbNodes; i++)
-        for(int idim=0; idim<SPACEDIM; idim++)
-          {
-            nodeIds[i] = connect[OTT<ConnType,numPol>::conn2C(connIndex[OTT<ConnType,numPol>::ind2C(icell)]+i)];
-            ncoords[SPACEDIM*i+idim] = coords[SPACEDIM*OTT<ConnType,numPol>::coo2C(nodeIds[i])+idim];
-          }
-      if ( nbNodes > 2 ) // quadratic segment, put medium node in the middle
-        {
-          for(int idim=0; idim<SPACEDIM; idim++)
-            std::swap( ncoords[SPACEDIM*1+idim], ncoords[SPACEDIM*2+idim]);
-          std::swap( nodeIds[1], nodeIds[2] );
-        }
-    }
-
-    // fill segments
-    segments.clear();
-    segments.reserve( 2*nbNodes );
-    for(int i=0; i<nbNodes-1; i++)
-      {
-        segments.push_back(TDualSegment());
-        TDualSegment& seg1 = segments.back();
-        segments.push_back(TDualSegment());
-        TDualSegment& seg2 = segments.back();
-
-        seg1._nodeId = nodeIds[i];
-        seg2._nodeId = nodeIds[i+1];
-
-        seg1._coords.resize( SPACEDIM * 2 );
-        seg2._coords.resize( SPACEDIM * 2 );
-
-        for(int idim=0; idim<SPACEDIM; idim++)
-          {
-            double c1 = ncoords[SPACEDIM*i+idim];
-            double c2 = ncoords[SPACEDIM*(i+1)+idim];
-            double m = 0.5 * ( c1 + c2 );
-            seg1._coords[ idim ] = c1;
-            seg1._coords[ SPACEDIM + idim ] = m;
-            seg2._coords[ idim ] = m;
-            seg2._coords[ SPACEDIM + idim ] = c2;
-          }
-      }
-  }
-
-  //================================================================================
-  /*!
-   * \brief Return length of intersection of two segments
-   */
-  //================================================================================
-
-  template<class MyMeshType, class MyMatrix>
-  double CurveIntersector<MyMeshType,MyMatrix>::intersectSegments(double *Coords_T,
-                                                                  double *Coords_S)
-  {
-    double xt0 = Coords_T[0], xt1 = Coords_T[1];
-    double xs0 = Coords_S[0], xs1 = Coords_S[1];
-    if ( SPACEDIM == 2 )
-      {
-        // Pass 2D->1D
-
-        enum { X=0, Y };
-
-        // check if two segments overlap in 2D within tolerance
-
-        double* t0 = Coords_T;
-        double* t1 = Coords_T + 2;
-        double t01[2] = { t1[X]-t0[X], t1[Y]-t0[Y] }; // tgt segment direction
-        double tSize = sqrt( t01[X]*t01[X] + t01[Y]*t01[Y] ); // tgt segment size
-        if ( tSize < _precision ) return 0; // degenerated segment
-        t01[X] /= tSize, t01[Y] /= tSize; // normalize t01
-
-        double* s0 = Coords_S;
-        double* s1 = Coords_S + 2;
-        double t0s0[2] = { s0[X]-t0[X], s0[Y]-t0[Y] };
-        double t0s1[2] = { s1[X]-t0[X], s1[Y]-t0[Y] };
-        double nt01_x_t0s0 = t0s0[X] * t01[Y] - t0s0[Y] * t01[X]; // t0s0 dot norm of t01
-        double nt01_x_t0s1 = t0s1[X] * t01[Y] - t0s1[Y] * t01[X]; // t0s1 dot norm of t01
-        double dist_ts0 = fabs( nt01_x_t0s0 ); // dist from tgt seg to s0
-        double dist_ts1 = fabs( nt01_x_t0s1 ); // dist from tgt seg to s1
-        bool s0_out_of_tol = ( dist_ts0 > _tolerance );
-        bool s1_out_of_tol = ( dist_ts1 > _tolerance );
-        if ( nt01_x_t0s0 * nt01_x_t0s1 > 0 && ( s0_out_of_tol || s1_out_of_tol ))
-          return 0; // tgt segment is to far from src segment
-
-        double S0[2] = { s0[X], s0[Y] };
-        double S1[2] = { s1[X], s1[Y] };
-        if ( s0_out_of_tol ) // put s0 within tolerance
-          {
-            double t = _tolerance * nt01_x_t0s0 / dist_ts0; // signed tolerance
-            double r = ( nt01_x_t0s0 - t ) / ( nt01_x_t0s0 - nt01_x_t0s1 );
-            S0[X] = s0[X] * ( 1.-r ) + s1[X] * r;
-            S0[Y] = s0[Y] * ( 1.-r ) + s1[Y] * r;
-          }
-        if ( s1_out_of_tol ) // put s1 within tolerance
-          {
-            double t = _tolerance * nt01_x_t0s1 / dist_ts1; // signed tolerance
-            double r = ( nt01_x_t0s1 - t ) / ( nt01_x_t0s1 - nt01_x_t0s0 );
-            S1[X] = s1[X] * ( 1.-r ) + s0[X] * r;
-            S1[Y] = s1[Y] * ( 1.-r ) + s0[Y] * r;
-          }
-
-        // project tgt and src segments to median line
-
-        double s01[2] = { S1[X]-S0[X], S1[Y]-S0[Y] }; // src segment direction
-        double sSize = sqrt( s01[X]*s01[X] + s01[Y]*s01[Y] ); // src segment size
-        if ( sSize < _precision ) return 0; // degenerated segment
-        s01[X] /= sSize, s01[Y] /= sSize; // normalize s01
-
-        // make t01 and s01 codirected
-        double t01_x_s01 = t01[X] * s01[X] + t01[Y] * s01[Y]; // t01 dot s01
-        if ( t01_x_s01 < 0 )
-          s01[X] = -s01[X], s01[Y] = -s01[Y];
-
-        double medianDir[2] = {
-          t01[X] * ( 1.-_median_line) + s01[X] * _median_line, 
-          t01[Y] * ( 1.-_median_line) + s01[Y] * _median_line
-        };
-        double medianSize = sqrt( medianDir[X]*medianDir[X] + medianDir[Y]*medianDir[Y] );
-        if ( medianSize < std::numeric_limits<double>::min() )
-          return 0; // strange...
-        medianDir[X] /= medianSize, medianDir[Y] /= medianSize;
-
-        xt0 = t0[X] * medianDir[X] + t0[Y] * medianDir[Y];
-        xt1 = t1[X] * medianDir[X] + t1[Y] * medianDir[Y];
-        xs0 = S0[X] * medianDir[X] + S0[Y] * medianDir[Y];
-        xs1 = S1[X] * medianDir[X] + S1[Y] * medianDir[Y];
-
-      } // if ( SPACEDIM == 2 )
-
-    if ( xt0 > xt1 ) std::swap( xt0, xt1 );
-    if ( xs0 > xs1 ) std::swap( xs0, xs1 );
-
-    double x0 = std::max( xt0, xs0 );
-    double x1 = std::min( xt1, xs1 );
-    return ( x0 < x1 ) ? ( x1 - x0 ) : 0.;
-  }
-
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/CurveIntersectorP0P0.hxx b/src/INTERP_KERNEL/CurveIntersectorP0P0.hxx
deleted file mode 100644
index 3ce6f6ff5..000000000
--- a/src/INTERP_KERNEL/CurveIntersectorP0P0.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __CURVEINTERSECTORP0P0_HXX__
-#define __CURVEINTERSECTORP0P0_HXX__
-
-#include "CurveIntersector.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  class CurveIntersectorP0P0 : public CurveIntersector<MyMeshType,MyMatrix>
-  {
-  public:
-    static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-    static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    typedef typename MyMeshType::MyConnType ConnType;
-    static const NumberingPolicy numPol=MyMeshType::My_numPol;
-
-    CurveIntersectorP0P0(const MyMeshType& meshT, const MyMeshType& meshS,
-                         double  precision, double tolerance,
-                         double medianLine, int printLevel);
-  public:
-    int getNumberOfRowsOfResMatrix() const;
-    int getNumberOfColsOfResMatrix() const;
-    void intersectCells(ConnType icellT,
-                        const std::vector<ConnType>& icellsS, MyMatrix& res);
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/CurveIntersectorP0P0.txx b/src/INTERP_KERNEL/CurveIntersectorP0P0.txx
deleted file mode 100644
index a72c1ecca..000000000
--- a/src/INTERP_KERNEL/CurveIntersectorP0P0.txx
+++ /dev/null
@@ -1,77 +0,0 @@
-//  Copyright (C) 2007-2010  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
-#ifndef __CURVEINTERSECTORP0P0_TXX__
-#define __CURVEINTERSECTORP0P0_TXX__
-
-#include "CurveIntersectorP0P0.hxx"
-#include "CurveIntersector.txx"
-
-#define BASE_INTERSECTOR CurveIntersector<MyMeshType,MyMatrix>
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  CurveIntersectorP0P0<MyMeshType,MyMatrix>
-    ::CurveIntersectorP0P0(const MyMeshType& meshT, const MyMeshType& meshS,
-                           double precision, double tolerance,
-                           double medianLine, int printLevel):
-      BASE_INTERSECTOR(meshT, meshS, precision, tolerance, medianLine, printLevel)
-  {
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  int CurveIntersectorP0P0<MyMeshType,MyMatrix>
-    ::getNumberOfRowsOfResMatrix() const
-  {
-    return BASE_INTERSECTOR::_meshT.getNumberOfElements();
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  int CurveIntersectorP0P0<MyMeshType,MyMatrix>
-    ::getNumberOfColsOfResMatrix() const
-  {
-    return BASE_INTERSECTOR::_meshS.getNumberOfElements();
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  void CurveIntersectorP0P0<MyMeshType,MyMatrix>
-  ::intersectCells(ConnType icellT, const std::vector<ConnType>& icellsS, MyMatrix& res)
-  {
-    typename MyMatrix::value_type& resRow = res[icellT];
-    std::vector<double> coordsT;
-    int t, nbSegT = 1 + BASE_INTERSECTOR::getRealTargetCoordinates(icellT,coordsT);
-    for ( t = 0; t < nbSegT; ++t )
-      for(typename std::vector<ConnType>::const_iterator
-            iter=icellsS.begin(); iter!=icellsS.end(); iter++)
-        {
-          int iS = *iter;
-          std::vector<double> coordsS;
-          int s, nbSegS = 1 + BASE_INTERSECTOR::getRealSourceCoordinates(iS,coordsS);
-          for ( s = 0; s < nbSegS; ++s )
-            {
-              double surf = BASE_INTERSECTOR::intersectSegments(&coordsT[0] + t*SPACEDIM,
-                                                                &coordsS[0] + s*SPACEDIM);
-              if(surf!=0.)
-                resRow.insert(std::make_pair(OTT<ConnType,numPol>::indFC(iS),surf));
-            }
-        }
-  }
-}
-#undef BASE_INTERSECTOR
-
-#endif
diff --git a/src/INTERP_KERNEL/CurveIntersectorP0P1.hxx b/src/INTERP_KERNEL/CurveIntersectorP0P1.hxx
deleted file mode 100644
index 7d4b0cd0b..000000000
--- a/src/INTERP_KERNEL/CurveIntersectorP0P1.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __CURVEINTERSECTORP0P1_HXX__
-#define __CURVEINTERSECTORP0P1_HXX__
-
-#include "CurveIntersector.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  class CurveIntersectorP0P1 : public CurveIntersector<MyMeshType,MyMatrix>
-  {
-  public:
-    static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-    static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    typedef typename MyMeshType::MyConnType ConnType;
-    static const NumberingPolicy numPol=MyMeshType::My_numPol;
-
-    CurveIntersectorP0P1(const MyMeshType& meshT, const MyMeshType& meshS,
-                         double  precision, double tolerance,
-                         double medianLine, int printLevel);
-  public:
-    void intersectCells(ConnType icellT,
-                        const std::vector<ConnType>& icellsS, MyMatrix& res);
-    int getNumberOfRowsOfResMatrix() const;
-    int getNumberOfColsOfResMatrix() const;
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/CurveIntersectorP0P1.txx b/src/INTERP_KERNEL/CurveIntersectorP0P1.txx
deleted file mode 100644
index c25136b5d..000000000
--- a/src/INTERP_KERNEL/CurveIntersectorP0P1.txx
+++ /dev/null
@@ -1,95 +0,0 @@
-//  Copyright (C) 2007-2010  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
-#ifndef __CurveIntersectorP0P1_TXX__
-#define __CurveIntersectorP0P1_TXX__
-
-#include "CurveIntersectorP0P1.hxx"
-#include "CurveIntersector.txx"
-
-#define BASE_INTERSECTOR CurveIntersector<MyMeshType,MyMatrix>
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  CurveIntersectorP0P1<MyMeshType,MyMatrix>
-    ::CurveIntersectorP0P1(const MyMeshType& meshT, const MyMeshType& meshS,
-                           double precision, double tolerance,
-                           double medianLine, int printLevel):
-      BASE_INTERSECTOR(meshT, meshS, precision, tolerance, medianLine, printLevel)
-  {
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  int CurveIntersectorP0P1<MyMeshType,MyMatrix>
-    ::getNumberOfRowsOfResMatrix() const
-  {
-    return BASE_INTERSECTOR::_meshT.getNumberOfNodes();
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  int CurveIntersectorP0P1<MyMeshType,MyMatrix>
-    ::getNumberOfColsOfResMatrix() const
-  {
-    return BASE_INTERSECTOR::_meshS.getNumberOfElements();
-  }
-
-  //================================================================================
-  /*!
-   * \brief Project from segments to nodes
-   */
-  //================================================================================
-
-  template<class MyMeshType, class MyMatrix>
-  void CurveIntersectorP0P1<MyMeshType,MyMatrix>
-  ::intersectCells(ConnType icellT, const std::vector<ConnType>& icellsS, MyMatrix& res)
-  {
-    std::vector<typename BASE_INTERSECTOR::TDualSegment> segmentsT;
-    BASE_INTERSECTOR::getDualSegments( icellT, BASE_INTERSECTOR::_meshT, segmentsT);
-    for ( int t = 0; t < segmentsT.size(); ++t )
-      {
-        typename MyMatrix::value_type& resRow = res[ OTT<ConnType,numPol>::ind2C( segmentsT[t]._nodeId )];
-        for(typename std::vector<ConnType>::const_iterator
-              iter=icellsS.begin(); iter!=icellsS.end(); iter++)
-          {
-            int iS = *iter;
-            std::vector<double> coordsS;
-            int s, nbSegS = 1 + BASE_INTERSECTOR::getRealSourceCoordinates(iS,coordsS);
-            for ( s = 0; s < nbSegS; ++s )
-              {
-                double surf = BASE_INTERSECTOR::intersectSegments(&segmentsT[t]._coords[0],
-                                                                  &coordsS[0] + s*SPACEDIM);
-                if(surf!=0.)
-                  {
-                    typename MyMatrix::value_type::const_iterator iterRes=resRow.find(OTT<ConnType,numPol>::indFC(iS));
-                    if(iterRes==resRow.end())
-                      resRow.insert(std::make_pair(OTT<ConnType,numPol>::indFC(iS),surf));
-                    else
-                      {
-                        surf+=(*iterRes).second;
-                        resRow.erase(OTT<ConnType,numPol>::indFC(iS));
-                        resRow.insert(std::make_pair(OTT<ConnType,numPol>::indFC(iS),surf));
-                      }
-                  }
-              }
-          }
-      }
-  }
-}
-#undef BASE_INTERSECTOR
-
-#endif
diff --git a/src/INTERP_KERNEL/CurveIntersectorP1P0.hxx b/src/INTERP_KERNEL/CurveIntersectorP1P0.hxx
deleted file mode 100644
index 914c28429..000000000
--- a/src/INTERP_KERNEL/CurveIntersectorP1P0.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __CURVEINTERSECTORP1P0_HXX__
-#define __CURVEINTERSECTORP1P0_HXX__
-
-#include "CurveIntersector.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  class CurveIntersectorP1P0 : public CurveIntersector<MyMeshType,MyMatrix>
-  {
-  public:
-    static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-    static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    typedef typename MyMeshType::MyConnType ConnType;
-    static const NumberingPolicy numPol=MyMeshType::My_numPol;
-
-    CurveIntersectorP1P0(const MyMeshType& meshT, const MyMeshType& meshS,
-                         double precision, double tolerance, double medianLine, int printLevel);
-  public:
-    void intersectCells(ConnType icellT, const std::vector<ConnType>& icellsS, MyMatrix& res);
-    int getNumberOfRowsOfResMatrix() const;
-    int getNumberOfColsOfResMatrix() const;
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/CurveIntersectorP1P0.txx b/src/INTERP_KERNEL/CurveIntersectorP1P0.txx
deleted file mode 100644
index bafd3ad9e..000000000
--- a/src/INTERP_KERNEL/CurveIntersectorP1P0.txx
+++ /dev/null
@@ -1,95 +0,0 @@
-//  Copyright (C) 2007-2010  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
-#ifndef __CurveIntersectorP1P0_TXX__
-#define __CurveIntersectorP1P0_TXX__
-
-#include "CurveIntersectorP1P0.hxx"
-#include "CurveIntersector.txx"
-
-#define BASE_INTERSECTOR CurveIntersector<MyMeshType,MyMatrix>
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  CurveIntersectorP1P0<MyMeshType,MyMatrix>
-    ::CurveIntersectorP1P0(const MyMeshType& meshT, const MyMeshType& meshS,
-                           double precision, double tolerance,
-                           double medianLine, int printLevel):
-    BASE_INTERSECTOR (meshT, meshS, precision, tolerance, medianLine, printLevel)
-  {
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  int CurveIntersectorP1P0<MyMeshType,MyMatrix>
-    ::getNumberOfRowsOfResMatrix() const
-  {
-    return BASE_INTERSECTOR::_meshT.getNumberOfElements();
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  int CurveIntersectorP1P0<MyMeshType,MyMatrix>
-    ::getNumberOfColsOfResMatrix() const
-  {
-    return BASE_INTERSECTOR::_meshS.getNumberOfNodes();
-  }
-
-  //================================================================================
-  /*!
-   * \brief Project from source nodes to target segments
-   */
-  //================================================================================
-
-  template<class MyMeshType, class MyMatrix>
-  void CurveIntersectorP1P0<MyMeshType,MyMatrix>
-  ::intersectCells(ConnType icellT, const std::vector<ConnType>& icellsS, MyMatrix& res)
-  {
-    typename MyMatrix::value_type& resRow = res[ icellT ];
-    std::vector<typename BASE_INTERSECTOR::TDualSegment> segmentsS;
-    std::vector<double> coordsT;
-    int t, nbSegT = 1 + BASE_INTERSECTOR::getRealTargetCoordinates(icellT,coordsT);
-    for ( t = 0; t < nbSegT; ++t )
-      for(typename std::vector<ConnType>::const_iterator
-            iter=icellsS.begin(); iter!=icellsS.end(); iter++)
-        {
-          int iS = *iter;
-          BASE_INTERSECTOR::getDualSegments( OTT<ConnType,numPol>::ind2C(iS),
-                                             BASE_INTERSECTOR::_meshS, segmentsS);
-          for ( int s = 0; s < segmentsS.size(); ++s )
-            {
-              double surf = BASE_INTERSECTOR::intersectSegments(&segmentsS[s]._coords[0],
-                                                                &coordsT[0] + t*SPACEDIM);
-              if(surf!=0.)
-                {
-                  int nS = segmentsS[s]._nodeId;
-                  typename MyMatrix::value_type::const_iterator iterRes=resRow.find(nS);
-                  if(iterRes==resRow.end())
-                    resRow.insert(std::make_pair(nS,surf));
-                  else
-                    {
-                      surf+=(*iterRes).second;
-                      resRow.erase(nS);
-                      resRow.insert(std::make_pair(nS,surf));
-                    }
-                }
-            }
-        }
-  }
-}
-#undef BASE_INTERSECTOR
-
-#endif
diff --git a/src/INTERP_KERNEL/CurveIntersectorP1P1.hxx b/src/INTERP_KERNEL/CurveIntersectorP1P1.hxx
deleted file mode 100644
index 1df986724..000000000
--- a/src/INTERP_KERNEL/CurveIntersectorP1P1.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __CURVEINTERSECTORP1P1_HXX__
-#define __CURVEINTERSECTORP1P1_HXX__
-
-#include "CurveIntersector.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  class CurveIntersectorP1P1 : public CurveIntersector<MyMeshType,MyMatrix>
-  {
-  public:
-    static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-    static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    typedef typename MyMeshType::MyConnType ConnType;
-    static const NumberingPolicy numPol=MyMeshType::My_numPol;
-
-    CurveIntersectorP1P1(const MyMeshType& meshT, const MyMeshType& meshS,
-                         double  precision, double tolerance,
-                         double medianLine, int printLevel);
-  public:
-    void intersectCells(ConnType icellT,
-                        const std::vector<ConnType>& icellsS, MyMatrix& res);
-    int getNumberOfRowsOfResMatrix() const;
-    int getNumberOfColsOfResMatrix() const;
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/CurveIntersectorP1P1.txx b/src/INTERP_KERNEL/CurveIntersectorP1P1.txx
deleted file mode 100644
index fd43fe7fc..000000000
--- a/src/INTERP_KERNEL/CurveIntersectorP1P1.txx
+++ /dev/null
@@ -1,90 +0,0 @@
-//  Copyright (C) 2007-2010  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
-#ifndef __CurveIntersectorP1P1_TXX__
-#define __CurveIntersectorP1P1_TXX__
-
-#include "CurveIntersectorP1P1.hxx"
-#include "CurveIntersector.txx"
-
-#define BASE_INTERSECTOR  CurveIntersector<MyMeshType,MyMatrix>
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  CurveIntersectorP1P1<MyMeshType,MyMatrix>
-    ::CurveIntersectorP1P1(const MyMeshType& meshT, const MyMeshType& meshS,
-                           double precision, double tolerance,
-                           double medianLine, int printLevel):
-    BASE_INTERSECTOR (meshT, meshS, precision, tolerance, medianLine, printLevel)
-  {
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  int CurveIntersectorP1P1<MyMeshType,MyMatrix>
-  ::getNumberOfRowsOfResMatrix() const
-  {
-    return BASE_INTERSECTOR::_meshT.getNumberOfNodes();
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  int CurveIntersectorP1P1<MyMeshType,MyMatrix>
-  ::getNumberOfColsOfResMatrix() const
-  {
-    return BASE_INTERSECTOR::_meshS.getNumberOfNodes();
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  void CurveIntersectorP1P1<MyMeshType,MyMatrix>
-  ::intersectCells(ConnType icellT, const std::vector<ConnType>& icellsS, MyMatrix& res)
-  {
-    std::vector<typename BASE_INTERSECTOR::TDualSegment> segmentsT, segmentsS;
-    BASE_INTERSECTOR::getDualSegments( icellT, BASE_INTERSECTOR::_meshT, segmentsT);
-    for ( int t = 0; t < segmentsT.size(); ++t )
-      {
-        typename MyMatrix::value_type& resRow = res[ OTT<ConnType,numPol>::ind2C( segmentsT[t]._nodeId )];
-        for(typename std::vector<ConnType>::const_iterator
-              iter=icellsS.begin(); iter!=icellsS.end(); iter++)
-          {
-            int iS = *iter;
-            BASE_INTERSECTOR::getDualSegments( OTT<ConnType,numPol>::ind2C(iS),
-                                               BASE_INTERSECTOR::_meshS, segmentsS);
-            for ( int s = 0; s < segmentsS.size(); ++s )
-              {
-                double surf = BASE_INTERSECTOR::intersectSegments(&segmentsT[t]._coords[0],
-                                                                  &segmentsS[s]._coords[0]);
-                if(surf!=0.)
-                  {
-                    int nS = segmentsS[s]._nodeId;
-                    typename MyMatrix::value_type::const_iterator iterRes=resRow.find(nS);
-                    if(iterRes==resRow.end())
-                      resRow.insert(std::make_pair(nS,surf));
-                    else
-                      {
-                        surf+=(*iterRes).second;
-                        resRow.erase(nS);
-                        resRow.insert(std::make_pair(nS,surf));
-                      }
-                  }
-              }
-          }
-      }
-  }
-}
-#undef BASE_INTERSECTOR
-
-#endif
diff --git a/src/INTERP_KERNEL/DirectedBoundingBox.cxx b/src/INTERP_KERNEL/DirectedBoundingBox.cxx
deleted file mode 100644
index 72b5c5101..000000000
--- a/src/INTERP_KERNEL/DirectedBoundingBox.cxx
+++ /dev/null
@@ -1,749 +0,0 @@
-//  Copyright (C) 2009-2010  OPEN CASCADE
-//
-//  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
-//
-// File      : DirectedBoundingBox.cxx
-// Created   : Mon Apr 12 14:41:22 2010
-// Author    : Edward AGAPOV (eap)
-
-
-#include "DirectedBoundingBox.hxx"
-
-#include "InterpolationUtils.hxx"
-
-#define __TENSOR(i,j) tensor[(i)*_dim+(j)]
-#define __AXIS(i)     (&_axes[(i)*_dim])
-#define __MIN(i)      _minmax[i*2]
-#define __MAX(i)      _minmax[i*2+1]
-#define __MYID        (long(this)%10000)
-#define __DMP(msg) \
-   //cout << msg << endl
-
-using namespace std;
-
-namespace
-{
-  //================================================================================
-  /*!
-   * \brief Add point coordinates to inertia tensor in 3D space
-   */
-  //================================================================================
-
-  inline void addPointToInertiaTensor3D(const double*   coord,
-                                        const double*   gc,
-                                        vector<double>& tensor)
-  {
-    // we fill the upper triangle of tensor only
-    const int _dim = 3;
-    double x = coord[0] - gc[0], y = coord[1] - gc[1], z = coord[2] - gc[2];
-    __TENSOR(0,0) += y*y + z*z;
-    __TENSOR(1,1) += x*x + z*z;
-    __TENSOR(2,2) += x*x + y*y;
-    __TENSOR(0,1) -= x*y;
-    __TENSOR(0,2) -= x*z;
-    __TENSOR(1,2) -= y*z;
-  }
-  //================================================================================
-  /*!
-   * \brief Add point coordinates to inertia tensor in 2D space
-   */
-  //================================================================================
-
-  inline void addPointToInertiaTensor2D(const double*   coord,
-                                        const double*   gc,
-                                        vector<double>& tensor)
-  {
-    // we fill the upper triangle of tensor only
-    const int _dim = 2;
-    double x = coord[0] - gc[0], y = coord[1] - gc[1];
-    __TENSOR(0,0) += y*y;
-    __TENSOR(1,1) += x*x;
-    __TENSOR(0,1) -= x*y;
-  }
-
-  //================================================================================
-  /*!
-   * \brief Find eigenvectors of tensor using Jacobi's method
-   */
-  //================================================================================
-
-  bool JacobiEigenvectorsSearch( const int _dim, vector<double>& tensor, vector<double>& _axes)
-  {
-    if ( _dim == 3 )
-      __DMP( "Tensor : {"
-           << "{ "<<__TENSOR(0,0) << ", "<<__TENSOR(0,1) << ", "<<__TENSOR(0,2) << "} "
-           << "{ "<<__TENSOR(1,0) << ", "<<__TENSOR(1,1) << ", "<<__TENSOR(1,2) << "} "
-           << "{ "<<__TENSOR(2,0) << ", "<<__TENSOR(2,1) << ", "<<__TENSOR(2,2) << "}} ");
-    else
-      __DMP( "Tensor : {"
-           << "{ "<<__TENSOR(0,0) << ", "<<__TENSOR(0,1) << "} "
-           << "{ "<<__TENSOR(1,0) << ", "<<__TENSOR(1,1) << "}} ");
-
-    const int maxRot = 5*_dim*_dim; // limit on number of rotations
-    const double tol = 1e-9;
-
-    // set _axes to identity
-    int i,j;
-    for ( i = 0; i < _dim; ++i )
-      for ( j = 0; j < _dim; ++j )
-        __AXIS(i)[j] = ( i==j ? 1. : 0 );
-
-    bool solved = false;
-    for ( int iRot = 0; iRot < maxRot; ++ iRot )
-      {
-        // find max off-diagonal element of the tensor
-        int k = 0, l = 0;
-        double max = 0.;
-        for ( i = 0; i < _dim-1; ++i )
-          for ( j = i+1; j < _dim; ++j )
-            if ( fabs( __TENSOR(i,j)) > max )
-              max = fabs( __TENSOR(i,j) ), k = i, l = j;
-        solved = ( max < tol );
-        if ( solved )
-          break;
-
-        // Rotate to make __TENSOR(k,l) == 0
-
-        double diff = __TENSOR(l,l) - __TENSOR(k,k);
-        double t; // tangent of rotation angle
-        if ( fabs(__TENSOR(k,l)) < abs(diff)*1.0e-36)
-          {
-            t = __TENSOR(k,l)/diff;
-          }
-        else
-          {
-            double phi = diff/(2.0*__TENSOR(k,l));
-            t = 1.0/(abs(phi) + sqrt(phi*phi + 1.0));
-            if ( phi < 0.0) t = -t;
-          }
-        double c = 1.0/sqrt(t*t + 1.0); // cosine of rotation angle
-        double s = t*c; // sine of rotation angle
-        double tau = s/(1.0 + c);
-        __TENSOR(k,k) -= t*__TENSOR(k,l);
-        __TENSOR(l,l) += t*__TENSOR(k,l);
-        __TENSOR(k,l) = 0.0;
-
-#define __ROTATE(T,r1,c1,r2,c2) \
-{ \
-int i1 = r1*_dim+c1, i2 = r2*_dim+c2; \
-double t1 = T[i1], t2 = T[i2]; \
-T[i1] -= s * ( t2 + tau * t1);\
-T[i2] += s * ( t1 - tau * t2);\
-}
-        for ( i = 0; i < k; ++i )       // Case of i < k
-          __ROTATE(tensor, i,k,i,l);
-
-        for ( i = k+1; i < l; ++i )     // Case of k < i < l
-          __ROTATE(tensor, k,i,i,l);
-
-        for ( i = l + 1; i < _dim; ++i )   // Case of i > l
-          __ROTATE(tensor, k,i,l,i);
-
-        for ( i = 0; i < _dim; ++i )       // Update transformation matrix
-          __ROTATE(_axes, i,k,i,l);
-      }
-
-    __DMP( "Solved = " << solved );
-    if ( _dim == 3 ) {
-      __DMP( " Eigen " << __TENSOR(0,0)<<", "<<__TENSOR(1,1)<<", "<<__TENSOR(2,2) );
-      for ( int i=0; i <3; ++i )
-        __DMP( i << ": " << __AXIS(i)[0] << ", " << __AXIS(i)[1] << ", " << __AXIS(i)[2] );
-    }
-    else {
-      __DMP( " Eigen " << __TENSOR(0,0) << ", " << __TENSOR(1,1) );
-      for ( int i=0; i <2; ++i )
-        __DMP( i << ": " << __AXIS(i)[0] << ", " << __AXIS(i)[1] );
-    }
-
-    return solved;
-  }
-
-  //================================================================================
-  /*!
-   * \brief Return true if two minmaxes do not intersect
-   */
-  //================================================================================
-
-  inline bool isMinMaxOut(const double* minmax1,
-                          const double* minmax2,
-                          int           dim)
-  {
-    for ( int i = 0; i < dim; ++i )
-      {
-        if ( minmax1[i*2] > minmax2[i*2+1] ||
-             minmax1[i*2+1] < minmax2[i*2] )
-          return true;
-      }
-    return false;
-  }
-
-} // noname namespace
-
-namespace INTERP_KERNEL
-{
-
-  //================================================================================
-  /*!
-   * \brief Creates empty box intended to further initalization via setData()
-   */
-  //================================================================================
-
-  DirectedBoundingBox::DirectedBoundingBox():_dim(0)
-  {
-  }
-
-  //================================================================================
-  /*!
-   * \brief Creates bounding box of a mesh
-   *  \param pts - coordinates of points in full interlace
-   *  \param numPts - number of points in the mesh
-   *  \param dim - space dimension
-   */
-  //================================================================================
-
-  DirectedBoundingBox::DirectedBoundingBox(const double*  pts,
-                                           const unsigned numPts,
-                                           const unsigned dim)
-    : _dim(dim), _axes(dim*dim), _minmax(2*dim)
-  {
-    // init box extremities
-    for ( unsigned i = 0; i < _dim; ++i )
-      _minmax[1+i*2] = -numeric_limits<double>::max(),
-        _minmax[i*2] =  numeric_limits<double>::max();
-
-    if ( numPts < 1 ) return;
-
-    __DMP( "DirectedBoundingBox " << __MYID );
-
-    const double* coord = pts;
-    const double* coordEnd = coord + numPts * dim;
-
-    // compute gravity center of points
-    double gc[3] = {0,0,0};
-    if ( dim > 1 )
-      {
-        for ( coord = pts; coord < coordEnd; )
-          for ( int i = 0; i < dim; ++i )
-            gc[i] += *coord++;
-        for ( int j = 0; j < dim; ++j )
-          gc[j] /= numPts;
-
-      }
-
-    // compute axes and box extremities
-    vector<double> tensor( dim * dim, 0.);
-    switch ( dim )
-      {
-      case 3:
-        for ( coord = pts; coord < coordEnd; coord += dim )
-          addPointToInertiaTensor3D( coord, gc, tensor );
-
-        //computeAxes3D(tensor);
-        JacobiEigenvectorsSearch(_dim, tensor, _axes);
-
-        for ( coord = pts; coord < coordEnd; coord += dim )
-          addPointToBox( coord );
-
-        break;
-
-      case 2:
-        for ( coord = pts; coord < coordEnd; coord += dim )
-          addPointToInertiaTensor2D( coord, gc, tensor );
-
-        //computeAxes2D(tensor);
-        JacobiEigenvectorsSearch(_dim, tensor, _axes);
-
-        for ( coord = pts; coord < coordEnd; coord += dim )
-          addPointToBox( coord );
-
-        break;
-
-      default:
-        for ( coord = pts; coord < coordEnd; coord += dim )
-          {
-            if ( *coord < _minmax[0] ) _minmax[0] = *coord;
-            if ( *coord > _minmax[1] ) _minmax[1] = *coord;
-          }
-      }
-  }
-
-  //================================================================================
-  /*!
-   * \brief Creates bounding box of an element
-   *  \param pts - coordinates of points of element
-   *  \param numPts - number of points in the element
-   *  \param dim - space dimension
-   */
-  //================================================================================
-
-  DirectedBoundingBox::DirectedBoundingBox(const double** pts,
-                                           const unsigned numPts,
-                                           const unsigned dim)
-    : _dim(dim), _axes(dim*dim), _minmax(2*dim)
-  {
-    // init box extremities
-    for ( unsigned i = 0; i < _dim; ++i )
-      _minmax[1+i*2] = -numeric_limits<double>::max(),
-        _minmax[i*2] =  numeric_limits<double>::max();
-
-    if ( numPts < 1 ) return;
-
-    __DMP( "DirectedBoundingBox " << __MYID );
-
-    // compute gravity center of points
-    double gc[3] = {0,0,0};
-    if ( dim > 1 )
-      {
-        for ( unsigned i = 0; i < numPts; ++i )
-          for ( int j = 0; j < dim; ++j )
-            gc[j] += pts[i][j];
-        for ( int j = 0; j < dim; ++j )
-          gc[j] /= numPts;
-      }
-
-    // compute axes and box extremities
-    vector<double> tensor( dim * dim, 0.);
-    switch ( dim )
-      {
-      case 3:
-        for ( unsigned i = 0; i < numPts; ++i )
-          addPointToInertiaTensor3D( pts[i], gc, tensor );
-
-        //computeAxes3D(tensor);
-        JacobiEigenvectorsSearch(_dim, tensor, _axes);
-
-        for ( unsigned i = 0; i < numPts; ++i )
-          addPointToBox( pts[i] );
-
-        break;
-      case 2:
-        for ( unsigned i = 0; i < numPts; ++i )
-          addPointToInertiaTensor2D( pts[i], gc, tensor );
-
-        //computeAxes2D(tensor);
-        JacobiEigenvectorsSearch(_dim, tensor, _axes);
-
-        for ( unsigned i = 0; i < numPts; ++i )
-          addPointToBox( pts[i] );
-
-        break;
-      default:
-        for ( unsigned i = 0; i < numPts; ++i )
-          {
-            if ( pts[i][0] < _minmax[0] ) _minmax[0] = pts[i][0];
-            if ( pts[i][0] > _minmax[1] ) _minmax[1] = pts[i][0];
-          }
-      }
-  }
-
-  //================================================================================
-  /*!
-   * \brief Compute eigenvectors of inertia tensor
-   */
-  //================================================================================
-
-  // void DirectedBoundingBox::computeAxes3D(const std::vector<double>& tensor)
-//   {
-//     // compute principal moments of inertia which are eigenvalues of the tensor
-//     double eig[3];
-//     {
-//       // coefficients of polynomial equation det(tensor-eig*I) = 0
-//       double a = -1;
-//       double b = __TENSOR(0,0)+__TENSOR(1,1)+__TENSOR(2,2);
-//       double c =
-//         __TENSOR(0,1)*__TENSOR(0,1) +
-//         __TENSOR(0,2)*__TENSOR(0,2) +
-//         __TENSOR(1,2)*__TENSOR(1,2) -
-//         __TENSOR(0,0)*__TENSOR(1,1) -
-//         __TENSOR(0,0)*__TENSOR(2,2) -
-//         __TENSOR(1,1)*__TENSOR(2,2);
-//       double d =
-//         __TENSOR(0,0)*__TENSOR(1,1)*__TENSOR(2,2) -
-//         __TENSOR(0,0)*__TENSOR(1,2)*__TENSOR(1,2) -
-//         __TENSOR(1,1)*__TENSOR(0,2)*__TENSOR(0,2) -
-//         __TENSOR(2,2)*__TENSOR(0,1)*__TENSOR(0,1) +
-//         __TENSOR(0,1)*__TENSOR(0,2)*__TENSOR(1,2)*2;
-
-//       // find eigenvalues which are roots of characteristic polynomial
-//       double x = (3*c/a - b*b/(a*a))/3;
-//       double y = (2*b*b*b/(a*a*a) - 9*b*c/(a*a) + 27*d/a)/27;
-//       double z = y*y/4 + x*x*x/27;
-
-//       double i = sqrt(y*y/4 - z) + 1e-300;
-//       double j = -pow(i,1/3.);
-//       double y2 = -y/(2*i);
-//       if ( y2 > 1.0) y2 = 1.; else if ( y2 < -1.0) y2 = -1.;
-//       double k = acos(y2);
-//       double m = cos(k/3);
-//       double n = sqrt(3)*sin(k/3);
-//       double p = -b/(3*a);
-
-//       eig[0] = -2*j*m + p;
-//       eig[1] = j *(m + n) + p;
-//       eig[2] = j *(m - n) + p;
-//     }
-//     // compute eigenvector of the tensor at each eigenvalue
-//     // by solving system [tensor-eig*I]*[axis] = 0
-//     bool ok = true;
-//     __DMP( "Tensor : {"
-//          << "{ "<<__TENSOR(0,0) << ", "<<__TENSOR(0,1) << ", "<<__TENSOR(0,2) << "} "
-//          << "{ "<<__TENSOR(1,0) << ", "<<__TENSOR(1,1) << ", "<<__TENSOR(1,2) << "} "
-//          << "{ "<<__TENSOR(2,0) << ", "<<__TENSOR(2,1) << ", "<<__TENSOR(2,2) << "}} ");
-//     for ( int i = 0; i < 3 && ok; ++i ) // loop on 3 eigenvalues
-//       {
-//         // [tensor-eig*I]
-//         double T[3][3]=
-//           {{ __TENSOR(0,0)-eig[i],__TENSOR(0,1),       __TENSOR(0,2),      },
-//            { __TENSOR(0,1),       __TENSOR(1,1)-eig[i],__TENSOR(1,2),      },
-//            { __TENSOR(0,2),       __TENSOR(1,2),       __TENSOR(2,2)-eig[i]}};
-//         // The determinant of T is zero, so that the equations are not linearly independent.
-//         // Therefore, we assign an arbitrary value (1.) to i-th component of eigenvector
-//         // and use two of the equations to compute the other two components
-//         double M[2][3], sol[2];
-//         for ( int j = 0, c = 0; j < 3; ++j )
-//           if ( i == j )
-//             M[0][2] = -T[0][j], M[1][2] = -T[1][j];
-//           else
-//             M[0][c] = T[0][j], M[1][c] = T[1][j], c++;
-
-//         ok = solveSystemOfEquations<2>( M, sol );
-
-//         double* eigenVec = __AXIS(i);
-//         for ( int j = 0, c = 0; j < 3; ++j )
-//           eigenVec[j] = ( i == j ) ? 1. : sol[c++];
-
-//         // normilize
-//         double size = sqrt(eigenVec[0]*eigenVec[0] +
-//                            eigenVec[1]*eigenVec[1] +
-//                            eigenVec[2]*eigenVec[2] );
-//         if ((ok = (size > numeric_limits<double>::min() )))
-//           {
-//             eigenVec[0] /= size;
-//             eigenVec[1] /= size;
-//             eigenVec[2] /= size;
-//           }
-//       }
-//     if ( !ok )
-//       {
-//         __DMP( " solve3EquationSystem() - KO " );
-//         _axes = vector<double>( _dim*_dim, 0);
-//         __AXIS(0)[0] = __AXIS(1)[1] = __AXIS(2)[2] = 1.;
-//       }
-//     __DMP( " Eigen " << eig[0] << ", " << eig[1] << ", " << eig[2] );
-//     for ( int i=0; i <3; ++i )
-//       __DMP( i << ": " << __AXIS(i)[0] << ", " << __AXIS(i)[1] << ", " << __AXIS(i)[2] );
-
-//     double* a0 = __AXIS(0), *a1 = __AXIS(1);
-//     double cross[3] = { a0[1]*a1[2]-a1[1]*a0[2],
-//                         a0[2]*a1[0]-a1[2]*a0[0],
-//                         a0[0]*a1[1]-a1[0]*a0[1] };
-//     __DMP( " Cross a1^a2 " << cross[0] << ", " << cross[1] << ", " << cross[2] );
-//   }
-
-  //================================================================================
-  /*!
-   * \brief Compute eigenvectors of inertia tensor
-   */
-  //================================================================================
-
-  // void DirectedBoundingBox::computeAxes2D(const std::vector<double>& tensor)
-//   {
-//     // compute principal moments of inertia which are eigenvalues of the tensor
-//     // by solving square equation det(tensor-eig*I)
-//     double X = (__TENSOR(0,0)+__TENSOR(1,1))/2;
-//     double Y = sqrt(4*__TENSOR(0,1)*__TENSOR(0,1) +
-//                     (__TENSOR(0,0)-__TENSOR(1,1)) * (__TENSOR(0,0)-__TENSOR(1,1)))/2;
-//     double eig[2] =
-//       {
-//         X + Y,
-//         X - Y
-//       };
-//     // compute eigenvector of the tensor at each eigenvalue
-//     // by solving system [tensor-eig*I]*[axis] = 0
-//     bool ok = true;
-//     for ( int i = 0; i < 2 && ok; ++i )
-//       {
-//         // [tensor-eig*I]
-//         double T[2][2]=
-//           {{ __TENSOR(0,0)-eig[i],__TENSOR(0,1)        },
-//            { __TENSOR(0,1),       __TENSOR(1,1)-eig[i] }};
-
-//         // The determinant of T is zero, so that the equations are not linearly independent.
-//         // Therefore, we assign an arbitrary value (1.) to i-th component of eigenvector
-//         // and use one equation to compute the other component
-//         double* eigenVec = __AXIS(i);
-//         eigenVec[i] = 1.;
-//         int j = 1-i;
-//         if ((ok = ( fabs( T[j][j] ) > numeric_limits<double>::min() )))
-//           eigenVec[j] = -T[j][i] / T[j][j];
-//       }
-//     if ( !ok )
-//       {
-//         _axes = vector<double>( _dim*_dim, 0);
-//         __AXIS(0)[0] = __AXIS(1)[1] = 1.;
-//       }
-//   }
-
-  //================================================================================
-  /*!
-   * \brief Convert point coordinates into local coordinate system of the box
-   */
-  //================================================================================
-
-  void DirectedBoundingBox::toLocalCS(const double* p, double* pLoc) const
-  {
-    switch ( _dim )
-      {
-      case 3:
-        pLoc[0] = dotprod<3>( p, __AXIS(0));
-        pLoc[1] = dotprod<3>( p, __AXIS(1));
-        pLoc[2] = dotprod<3>( p, __AXIS(2));
-        break;
-      case 2:
-        pLoc[0] = dotprod<2>( p, __AXIS(0));
-        pLoc[1] = dotprod<2>( p, __AXIS(1));
-        break;
-      default:
-        pLoc[0] = p[0];
-      }
-  }
-
-  //================================================================================
-  /*!
-   * \brief Convert point coordinates from local coordinate system of the box to global CS
-   */
-  //================================================================================
-
-  void DirectedBoundingBox::fromLocalCS(const double* p, double* pGlob) const
-  {
-    switch ( _dim )
-      {
-      case 3:
-        pGlob[0] = p[0] * __AXIS(0)[0] + p[1] * __AXIS(1)[0] + p[2] * __AXIS(2)[0];
-        pGlob[1] = p[0] * __AXIS(0)[1] + p[1] * __AXIS(1)[1] + p[2] * __AXIS(2)[1];
-        pGlob[2] = p[0] * __AXIS(0)[2] + p[1] * __AXIS(1)[2] + p[2] * __AXIS(2)[2];
-        break;
-      case 2:
-        pGlob[0] = p[0] * __AXIS(0)[0] + p[1] * __AXIS(1)[0];
-        pGlob[1] = p[0] * __AXIS(0)[1] + p[1] * __AXIS(1)[1];
-        break;
-      default:
-        pGlob[0] = p[0];
-      }
-  }
-
-  //================================================================================
-  /*!
-   * \brief Enlarge box size by given value
-   */
-  //================================================================================
-
-  void DirectedBoundingBox::enlarge(const double tol)
-  {
-    for ( unsigned i = 0; i < _dim; ++i )
-      __MIN(i) -= tol, __MAX(i) += tol;
-  }
-
-  //================================================================================
-  /*!
-   * \brief Return coordinates of corners of bounding box
-   */
-  //================================================================================
-
-  void DirectedBoundingBox::getCorners(std::vector<double>& corners,
-                                       const double*        minmax) const
-  {
-    int iC, nbCorners = 1;
-    for ( int i=0;i<_dim;++i ) nbCorners *= 2;
-    corners.resize( nbCorners * _dim );
-    // each coordinate is filled with either min or max, nbSwap is number of corners
-    // after which min and max swap
-    int nbSwap = nbCorners/2;
-    for ( unsigned i = 0; i < _dim; ++i )
-      {
-        iC = 0;
-        while ( iC < nbCorners )
-          {
-            for (int j = 0; j < nbSwap; ++j, ++iC ) corners[iC*_dim+i] = minmax[i*2];
-            for (int j = 0; j < nbSwap; ++j, ++iC ) corners[iC*_dim+i] = minmax[i*2+1];
-          }
-        nbSwap /= 2;
-      }
-  }
-
-  //================================================================================
-  /*!
-   * \brief Test if this box intersects with the other
-   *  \retval bool - true if there is no intersection
-   */
-  //================================================================================
-
-  bool DirectedBoundingBox::isDisjointWith(const DirectedBoundingBox& box) const
-  {
-    if ( _dim < 1 || box._dim < 1 ) return false; // empty box includes all
-
-    // boxes are disjoined if their minmaxes in local CS of either of boxes do not intersect
-    for ( int isThisCS = 0; isThisCS < 2; ++isThisCS )
-      {
-        const DirectedBoundingBox* axisBox   = isThisCS ? this : &box;
-        const DirectedBoundingBox* cornerBox = isThisCS ? &box : this;
-
-        // find minmax of cornerBox in the CS of axisBox
-
-        DirectedBoundingBox mmBox((double*)0,0,_dim); //!< empty box with CS == axisBox->_axes
-        mmBox._axes = axisBox->_axes;
-
-        vector<double> corners;
-        getCorners( corners, &cornerBox->_minmax[0] );
-
-        double globCorner[3];
-        for ( int iC = 0, nC = corners.size()/_dim; iC < nC; ++iC)
-          {
-            cornerBox->fromLocalCS( &corners[iC*_dim], globCorner );
-            mmBox.addPointToBox( globCorner );
-          }
-        if ( isMinMaxOut( &mmBox._minmax[0], &axisBox->_minmax[0], _dim ))
-          return true;
-      }
-    return false;
-  }
-
-  //================================================================================
-  /*!
-   * \brief Test if this box intersects with an non-directed box
-   *  \retval bool - true if there is no intersection
-   */
-  //================================================================================
-
-  bool DirectedBoundingBox::isDisjointWith(const double* box) const
-  {
-    if ( _dim < 1 ) return false; // empty box includes all
-
-    // boxes are disjoined if their minmaxes in local CS of either of boxes do not intersect
-
-    // compare minmaxes in locals CS of this directed box
-    {
-      vector<double> cornersOther;
-      getCorners( cornersOther, box );
-      DirectedBoundingBox mmBox((double*)0,0,_dim); //!< empty box with CS == this->_axes
-      mmBox._axes = this->_axes;
-      for ( int iC = 0, nC = cornersOther.size()/_dim; iC < nC; ++iC)
-        mmBox.addPointToBox( &cornersOther[iC*_dim] );
-
-      if ( isMinMaxOut( &mmBox._minmax[0], &this->_minmax[0], _dim ))
-        return true;
-    }
-
-    // compare minmaxes in global CS
-    {
-      vector<double> cornersThis;
-      getCorners( cornersThis, &_minmax[0] );
-      DirectedBoundingBox mmBox((double*)0,0,_dim); //!< initailized _minmax
-      double globCorner[3];
-      for ( int iC = 0, nC = cornersThis.size()/_dim; iC < nC; ++iC)
-        {
-          fromLocalCS( &cornersThis[iC*_dim], globCorner );
-          for ( int i = 0; i < _dim; ++i )
-            {
-              if ( globCorner[i] < mmBox._minmax[i*2] )   mmBox._minmax[i*2] = globCorner[i];
-              if ( globCorner[i] > mmBox._minmax[i*2+1] ) mmBox._minmax[i*2+1] = globCorner[i];
-            }
-        }
-      if ( isMinMaxOut( &mmBox._minmax[0], box, _dim ))
-        return true;
-    }
-    return false;
-  }
-
-  //================================================================================
-  /*!
-   * \brief Return true if given point is out of this box
-   */
-  //================================================================================
-
-  bool DirectedBoundingBox::isOut(const double* point) const
-  {
-    if ( _dim < 1 ) return false; // empty box includes all
-
-    double pLoc[3];
-    toLocalCS( point, pLoc );
-    bool out = isLocalOut( pLoc );
-#ifdef _DEBUG_
-    switch (_dim)
-      {
-      case 3:
-        __DMP(__MYID<<": "<<point[0]<<", "<<point[1]<<", "<<point[2]<<" "<<(out?"OUT":"IN"));break;
-      case 2:
-        __DMP(__MYID<<": "<<point[0]<<", "<<point[1]<<" "<<(out?"OUT":"IN"));break;
-      case 1:
-        __DMP(__MYID<<": "<<point[0]<<" "<<(out?"OUT":"IN"));break;
-      }
-#endif
-    return out;
-  }
-
-  //================================================================================
-  /*!
-   * \brief Return array of internal data
-   */
-  //================================================================================
-
-  vector<double> DirectedBoundingBox::getData() const
-  {
-    vector<double> data(1, _dim);
-    if ( _dim > 0 )
-    {
-      data.insert( data.end(), &_axes[0], &_axes[0] + _axes.size());
-      data.insert( data.end(), &_minmax[0], &_minmax[0] + _minmax.size());
-    }
-    if ( data.size() < dataSize( _dim ))
-      data.resize( dataSize( _dim ), 0 );
-    return data;
-  }
-
-  //================================================================================
-  /*!
-   * \brief Initializes self with data retrieved via getData()
-   */
-  //================================================================================
-
-  void DirectedBoundingBox::setData(const double* data)
-  {
-    _dim = unsigned( *data++ );
-    if ( _dim > 0 )
-      {
-        _axes.assign( data, data+_dim*_dim ); data += _dim*_dim;
-        _minmax.assign( data, data+2*_dim );
-      }
-    else
-      {
-        _axes.clear();
-        _minmax.clear();
-      }
-  }
-
-  //================================================================================
-  /*!
-   * \brief Return size of internal data returned by getData() depending on space dim
-   */
-  //================================================================================
-
-  int DirectedBoundingBox::dataSize(int dim)
-  {
-    return 1 + dim*dim + 2*dim; // : _dim + _axes + _minmax
-  }
-}
diff --git a/src/INTERP_KERNEL/DirectedBoundingBox.hxx b/src/INTERP_KERNEL/DirectedBoundingBox.hxx
deleted file mode 100644
index 93874acdb..000000000
--- a/src/INTERP_KERNEL/DirectedBoundingBox.hxx
+++ /dev/null
@@ -1,118 +0,0 @@
-//  Copyright (C) 2009-2010  OPEN CASCADE
-//
-//  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
-//
-#ifndef __DirectedBoundingBox_HXX__
-#define __DirectedBoundingBox_HXX__
-
-#include "INTERPKERNELDefines.hxx"
-
-#include <vector>
-
-namespace INTERP_KERNEL
-{
-
-  /**
-   * \brief Class representing the bounding box of a number of points
-   *  with box axes parallel to principal axes of inertia of points
-   */
-  class INTERPKERNEL_EXPORT DirectedBoundingBox
-  {
-  public:
-
-    DirectedBoundingBox();
-
-    DirectedBoundingBox(const double* pts, const unsigned numPts, const unsigned dim);
-
-    DirectedBoundingBox(const double** pts, const unsigned numPts, const unsigned dim);
-
-    //~DirectedBoundingBox();
-
-    void enlarge(const double tol);
-    
-    bool isDisjointWith(const DirectedBoundingBox& box) const;
-
-    bool isDisjointWith(const double* box) const;
-
-    bool isOut(const double* point) const;
-
-
-    // return internal data
-    std::vector<double> getData() const;
-
-    // initialize with data returned by getData()
-    void setData(const double* data);
-
-    // return size of internal data
-    static int dataSize(int dim);
-
-  private:
-
-    //void computeAxes3D(const std::vector<double>& tensor);
-
-    //void computeAxes2D(const std::vector<double>& tensor);
-
-    inline void addPointToBox(const double* coord);
-
-    void toLocalCS(const double* p, double* pLoc) const;
-
-    void fromLocalCS(const double* p, double* pGlob) const;
-
-    inline bool isLocalOut(const double* pLoc) const;
-
-    void getCorners(std::vector<double>& corners, const double* minmax) const;
-
-    unsigned _dim;
-
-    std::vector<double> _axes; //!< principal axes of inertia in full interlace
-    std::vector<double> _minmax; //!< pairs of min an max coordinates along the axes
-
-  };
-
-  //================================================================================
-  /*!
-   * \brief Test point in local CS against box extremities
-   * 
-   */
-  //================================================================================
-
-  inline bool DirectedBoundingBox::isLocalOut(const double* pLoc) const
-    {
-      for ( int i = 0; i < _dim; ++i )
-        if ( pLoc[i] < _minmax[i*2] || pLoc[i] > _minmax[i*2+1] )
-          return true;
-      return false;
-    }
-
-  //================================================================================
-  /*!
-   * \brief Update box extremities
-   */
-  //================================================================================
-
-  inline void DirectedBoundingBox::addPointToBox(const double* coord)
-  {
-    for ( int i = 0; i < _dim; ++i )
-      {
-        double c = 0;
-        for ( int j = 0; j < _dim; ++j ) c += coord[j]*_axes[i*_dim+j];
-        if ( c < _minmax[i*2] )   _minmax[i*2] = c;
-        if ( c > _minmax[i*2+1] ) _minmax[i*2+1] = c;
-      }
-  }
-}
-#endif
diff --git a/src/INTERP_KERNEL/ExprEval/INTERPKERNELEXPREVALDefines.hxx b/src/INTERP_KERNEL/ExprEval/INTERPKERNELEXPREVALDefines.hxx
deleted file mode 100644
index 8dbfa17f8..000000000
--- a/src/INTERP_KERNEL/ExprEval/INTERPKERNELEXPREVALDefines.hxx
+++ /dev/null
@@ -1,41 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __INTERPKERNELEXPREVALDEFINES_HXX__
-#define __INTERPKERNELEXPREVALDEFINES_HXX__
-
-//export symbols
-// #ifdef WIN32
-// # if defined INTERPKERNELEXPREVAL_EXPORTS || defined interpkernelexpreval_EXPORTS
-// #  define INTERPKERNELEXPREVAL_EXPORT __declspec(dllexport)
-// # else
-// #  define INTERPKERNELEXPREVAL_EXPORT __declspec(dllimport)
-// # endif
-// #else
-// # define INTERPKERNELEXPREVAL_EXPORT
-// #endif 
-
-#define INTERPKERNELEXPREVAL_EXPORT
-
-#ifdef WNT
-#pragma warning( disable : 4290 )    // See http://msdn.microsoft.com/en-us/library/sa28fef8%28VS.80%29.aspx
-#endif
-
-
-#endif
diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.cxx b/src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.cxx
deleted file mode 100644
index 5dde84961..000000000
--- a/src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.cxx
+++ /dev/null
@@ -1,693 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "InterpKernelExprParser.hxx"
-#include "InterpKernelValue.hxx"
-
-#include <cctype>
-#include <sstream>
-#include <vector>
-#include <iterator>
-#include <algorithm>
-
-using namespace INTERP_KERNEL;
-
-const char LeafExprVar::END_OF_RECOGNIZED_VAR[]="Vec";
-
-const char ExprParser::WHITE_SPACES[]=" \n";
-
-const char ExprParser::EXPR_PARSE_ERR_MSG[]="Invalid expression detected : ";
-
-LeafExpr *LeafExpr::buildInstanceFrom(const std::string& expr) throw(INTERP_KERNEL::Exception)
-{
-  std::istringstream stream;
-  stream.str(expr);
-  double val;
-  stream >> val;
-  if(!stream.fail())
-    if(stream.eof())
-      return new LeafExprVal(val);
-    else
-      {
-        std::ostringstream errMsg;
-        char MSGTYP6[]="Error following expression is not consedered as a double value : ";
-        errMsg << MSGTYP6 << expr;
-        throw INTERP_KERNEL::Exception(errMsg.str().c_str());
-      }
-  else
-    return new LeafExprVar(expr);
-}
-
-LeafExpr::~LeafExpr()
-{
-}
-
-LeafExprVal::LeafExprVal(double value):_value(value)
-{
-}
-
-LeafExprVal::~LeafExprVal()
-{
-}
-
-void LeafExprVal::fillValue(Value *val) const throw(INTERP_KERNEL::Exception)
-{
-  val->setDouble(_value);
-}
-
-LeafExprVar::LeafExprVar(const std::string& var):_fast_pos(-1),_var_name(var)
-{
-}
-
-void LeafExprVar::fillValue(Value *val) const throw(INTERP_KERNEL::Exception)
-{
-  val->setVarname(_fast_pos,_var_name);
-}
-
-void LeafExprVar::prepareExprEvaluation(const std::vector<std::string>& vars) const throw(INTERP_KERNEL::Exception)
-{
-  std::vector<std::string>::const_iterator iter=std::find(vars.begin(),vars.end(),_var_name);
-  if(iter==vars.end())
-    {
-      if(!isRecognizedKeyVar(_var_name,_fast_pos))
-        {
-          std::ostringstream oss; oss << "Var : " << _var_name << " not in : ";
-          std::copy(vars.begin(),vars.end(),std::ostream_iterator<std::string>(oss,", "));
-          throw INTERP_KERNEL::Exception(oss.str().c_str());
-        }
-      return;
-    }
-  _fast_pos=iter-vars.begin();
-}
-
-void LeafExprVar::prepareExprEvaluationVec() const throw(INTERP_KERNEL::Exception)
-{
-  if(!isRecognizedKeyVar(_var_name,_fast_pos))
-    _fast_pos=-2;
-}
-
-bool LeafExprVar::isRecognizedKeyVar(const std::string& var, int& pos)
-{
-  if(var.length()!=sizeof(END_OF_RECOGNIZED_VAR))
-    return false;
-  std::string end=var.substr(1);
-  if(end!=END_OF_RECOGNIZED_VAR)
-    return false;
-  char first=var[0];
-  if(first<'I' || first>'Z')
-    return false;
-  pos=-7-(first-'I');
-  return true;
-}
-
-LeafExprVar::~LeafExprVar()
-{
-}
-
-ExprParser::ExprParser(const char *expr):_is_parsed(false),_leaf(0),_is_parsing_ok(false),_expr(expr)
-{
-}
-
-//! For \b NOT null terminated strings coming from FORTRAN.
-ExprParser::ExprParser(const char *expr, int lgth):_is_parsed(false),_leaf(0),_is_parsing_ok(false)
-{
-  _expr=buildStringFromFortran(expr,lgth);
-}
-
-ExprParser::~ExprParser()
-{
-  delete _leaf;
-  releaseFunctions();
-}
-
-std::size_t ExprParser::findCorrespondingOpenBracket(const std::string& expr, std::size_t posOfCloseBracket)
-{
-  int level=0;
-  for(std::size_t iter=posOfCloseBracket-1;iter>=0;iter--)
-    if(expr[iter]==')')
-      level++;
-    else if(expr[iter]=='(')
-      {
-        if(level==0)
-          return iter;
-        else
-          level--;
-      }
-  return std::string::npos;
-}
-
-std::string ExprParser::buildStringFromFortran(const char *expr, int lgth)
-{
-  std::string ret(expr,lgth);
-  std::string whiteSpaces(WHITE_SPACES);
-  std::size_t found=ret.find_last_not_of(whiteSpaces);
-  if (found!=std::string::npos)
-    ret.erase(found+1);
-  else
-    ret.clear();//ret is all whitespace
-  return ret;
-}
-
-std::string ExprParser::deleteWhiteSpaces(const std::string& expr)
-{
-  std::string ret(expr);
-  std::string whiteSpaces(WHITE_SPACES);
-  std::size_t where1=0,where2=0;
-  while(where2!=std::string::npos && where1!=std::string::npos)
-    {
-      where1=ret.find_first_of(whiteSpaces.c_str(),where1,whiteSpaces.length());
-      if(where1!=std::string::npos)
-        {
-          where2=ret.find_first_not_of(whiteSpaces,where1);
-          if(where2!=std::string::npos)
-            ret.erase(ret.begin()+where1,ret.begin()+where2);
-          else
-            ret.erase(ret.begin()+where1,ret.end());
-        }
-    }
-  return ret;
-}
-
-void ExprParser::parse() throw(INTERP_KERNEL::Exception)
-{
-  _is_parsed=true;
-  _is_parsing_ok=false;
-  _sub_expr.clear();
-  releaseFunctions();
-  if(!_expr.empty())
-    {
-      checkBracketsParity();
-      if(!simplify())
-        parseDeeper();
-    }
-  _is_parsing_ok=true;
-}
-
-double ExprParser::evaluate() const throw(INTERP_KERNEL::Exception)
-{
-  Value *gen=new ValueDouble;
-  ValueDouble *res=(ValueDouble *)evaluateLowLev(gen);
-  delete gen;
-  double ret=res->getData();
-  delete res;
-  return ret;
-}
-
-DecompositionInUnitBase ExprParser::evaluateUnit() const throw(INTERP_KERNEL::Exception)
-{
-  Value *gen=new ValueUnit;
-  ValueUnit *res=0;
-  try
-    {
-      res=(ValueUnit *)evaluateLowLev(gen);
-    }
-  catch(INTERP_KERNEL::Exception& e)
-    {
-      delete gen;
-      throw e;
-    }
-  delete gen;
-  DecompositionInUnitBase ret=res->getData();
-  delete res;
-  return ret;
-}
-
-void ExprParser::evaluateExpr(int szOfOutParam, double *outParam, const double *inParam) const throw(INTERP_KERNEL::Exception)
-{
-  Value *gen=new ValueDoubleExpr(szOfOutParam,inParam);
-  ValueDoubleExpr *res=0;
-  try
-    {
-      res=(ValueDoubleExpr *)evaluateLowLev(gen);
-    }
-  catch(INTERP_KERNEL::Exception& e)
-    {
-      delete gen;
-      throw e;
-    }
-  delete gen;
-  std::copy(res->getData(),res->getData()+szOfOutParam,outParam);
-  delete res;
-}
-
-void ExprParser::prepareExprEvaluation(const std::vector<std::string>& vars) const throw(INTERP_KERNEL::Exception)
-{
-  if(_leaf)
-    {
-      LeafExprVar *leafC=dynamic_cast<LeafExprVar *>(_leaf);
-      if(leafC)
-        leafC->prepareExprEvaluation(vars);
-    }
-  else
-    for(std::list<ExprParser>::const_iterator iter=_sub_expr.begin();iter!=_sub_expr.end();iter++)
-      (*iter).prepareExprEvaluation(vars);
-}
-
-void ExprParser::prepareExprEvaluationVec() const throw(INTERP_KERNEL::Exception)
-{
-  std::set<std::string> trueVars;
-  getTrueSetOfVars(trueVars);
-  if(trueVars.size()>1)
-    {
-      std::ostringstream oss; oss << "For this type of evaluation only one not keyword variable authorized : ";
-      oss << "having " << trueVars.size() << " : ";
-      std::copy(trueVars.begin(),trueVars.end(),std::ostream_iterator<std::string>(oss," ")); oss << " !";
-      throw INTERP_KERNEL::Exception(oss.str().c_str());
-    }
-  prepareExprEvaluationVecLowLev();
-}
-
-void ExprParser::prepareExprEvaluationVecLowLev() const throw(INTERP_KERNEL::Exception)
-{
-  if(_leaf)
-    {
-      LeafExprVar *leafC=dynamic_cast<LeafExprVar *>(_leaf);
-      if(leafC)
-        leafC->prepareExprEvaluationVec();
-    }
-  else
-    for(std::list<ExprParser>::const_iterator iter=_sub_expr.begin();iter!=_sub_expr.end();iter++)
-      (*iter).prepareExprEvaluationVecLowLev();
-}
-
-Value *ExprParser::evaluateLowLev(Value *valGen) const throw(INTERP_KERNEL::Exception)
-{
-  if(!_is_parsing_ok)
-    throw INTERP_KERNEL::Exception("Parsing fails ! Invalid expression !");
-  if(_sub_expr.empty() && !_leaf)
-    throw INTERP_KERNEL::Exception("Empty expression !");
-  std::vector<Value *> stackOfVal;
-  try
-    {
-      if(_leaf)
-        {
-          Value *ret=valGen->newInstance();
-          try
-            {
-              _leaf->fillValue(ret);
-            }
-          catch(INTERP_KERNEL::Exception& e)
-            {
-              delete ret;
-              throw e;
-            }
-          stackOfVal.resize(1);
-          stackOfVal[0]=ret;
-        }
-      else
-        {
-          stackOfVal.resize(_sub_expr.size());
-          std::vector<Value *>::reverse_iterator iter2=stackOfVal.rbegin();
-          for(std::list<ExprParser>::const_iterator iter=_sub_expr.begin();iter!=_sub_expr.end();iter++,iter2++)
-            *iter2=(*iter).evaluateLowLev(valGen);
-        }
-      std::list<Function *>::const_iterator iter3;
-      for(iter3=_func_btw_sub_expr.begin();iter3!=_func_btw_sub_expr.end();iter3++)
-        (*iter3)->operate(stackOfVal);
-    }
-  catch(INTERP_KERNEL::Exception& e)
-    {
-      for(std::vector<Value *>::iterator iter4=stackOfVal.begin();iter4!=stackOfVal.end();iter4++)
-        delete *iter4;
-      throw e;
-    }
-  return stackOfVal.back();
-}
-
-void ExprParser::getSetOfVars(std::set<std::string>& vars) const
-{
-  if(_leaf)
-    {
-      LeafExprVar *leafC=dynamic_cast<LeafExprVar *>(_leaf);
-      if(leafC)
-        vars.insert(leafC->getVar());
-    }
-  else
-    for(std::list<ExprParser>::const_iterator iter=_sub_expr.begin();iter!=_sub_expr.end();iter++)
-      (*iter).getSetOfVars(vars);
-}
-
-void ExprParser::getTrueSetOfVars(std::set<std::string>& trueVars) const
-{
-  std::set<std::string> vars;
-  getSetOfVars(vars);
-  trueVars.clear();
-  for(std::set<std::string>::const_iterator iter=vars.begin();iter!=vars.end();iter++)
-    {
-      int tmp;
-      if(!LeafExprVar::isRecognizedKeyVar(*iter,tmp))
-        trueVars.insert(*iter);
-    }
-}
-
-void ExprParser::parseDeeper() throw(INTERP_KERNEL::Exception)
-{
-  for(std::list<ExprParser>::iterator iter=_sub_expr.begin();iter!=_sub_expr.end();iter++)
-    if(!(*iter).simplify())
-      (*iter).parseDeeper();
-}
-
-/*!
- * This method has the responsability to see if this->_expr can be seen as a unary function of something.
- * Something defined as the contain of highest level barckets.
- * Typically '(3*x+2)' and 'cos(4*l+p*n)' will be intercepted by this method whereas '3*x+2' not...etc..
- */
-void ExprParser::parseUnaryFunc() throw(INTERP_KERNEL::Exception)
-{
-  if(_expr[_expr.length()-1]!=')')
-    return ;
-  //at this level of code _expr 
-  std::size_t pos1=_expr.find_first_of('(');
-  std::size_t pos4=findCorrespondingOpenBracket(_expr,_expr.length()-1);
-  if(pos4!=pos1)
-    return ;
-  std::string funcName=_expr.substr(0,pos1);
-  std::size_t pos2=funcName.find_first_of("+-*/^",0,5);
-  std::size_t pos3=funcName.find_first_not_of("+-*/^",0,5);
-  if(pos2!=std::string::npos && pos3!=std::string::npos)
-    return ;//Bracket group is not alone, can't conclude not recursively.
-  std::string newExp2=_expr.substr(pos1+1,_expr.length()-pos1-2);
-  int nbOfParamsInFunc=std::count(newExp2.begin(),newExp2.end(),',')+1;
-  if(pos3!=std::string::npos)
-    _func_btw_sub_expr.push_back(FunctionsFactory::buildFuncFromString(funcName.c_str(),nbOfParamsInFunc));
-  else
-    {
-      int lgth=funcName.length();
-      char tmp[2]; tmp[1]='\0';
-      for(int i=0;i<lgth;i++)
-        {
-          tmp[0]=funcName[i];
-          _func_btw_sub_expr.push_back(FunctionsFactory::buildFuncFromString(tmp,nbOfParamsInFunc));
-        }
-    }
-  std::size_t pos6=0;
-  for(int i=0;i<nbOfParamsInFunc;i++)
-    {
-      std::size_t pos5=newExp2.find_first_of(',');
-      std::size_t len=std::string::npos;
-      if(pos5!=std::string::npos)
-        len=pos5-pos6;
-      std::string newExp3=newExp2.substr(pos6,len);
-      _sub_expr.push_back(ExprParser(newExp3.c_str()));
-      pos6=pos5+1;
-    }
-  _is_parsing_ok=true;
-}
-
-/*!
- *  This method has the responsability to see if this->_expr is interpretable without any recursion.
- * \return true if no recursion needed, false if this->_expr is too complex to be interpreted at this level.
- * \throw exception if this->_expr is simple enough to try to interprate this and this expression contains an error.  
- */
-bool ExprParser::tryToInterpALeaf() throw(INTERP_KERNEL::Exception)
-{
-  std::size_t pos=_expr.find_first_not_of("+-",0,2);
-  std::string minimizedExpr=_expr.substr(pos);
-  std::size_t pos2=minimizedExpr.find_first_of("+-*/^()",0,7);
-  if(pos2!=std::string::npos)
-    return false;
-  delete _leaf;
-  _leaf=LeafExpr::buildInstanceFrom(minimizedExpr);
-  int nbOfNegs=0;
-  for(std::size_t i=0;i<pos;i++)
-    if(_expr[i]=='-')
-      nbOfNegs++;
-  if(nbOfNegs%2)
-    _func_btw_sub_expr.push_back(FunctionsFactory::buildUnaryFuncFromString("-"));
-  _is_parsing_ok=true;
-  return true;
-}
-
-void ExprParser::parseForAddMin() throw(INTERP_KERNEL::Exception)
-{
-  std::string::const_iterator iter;
-  int curLevel=0;
-  std::string curPart;
-  bool isParsingSucceed=false;
-  for(iter=_expr.begin();iter!=_expr.end();iter++)
-    {
-      switch(*iter)
-        {
-        case '+':
-        case '-':
-          if(curLevel!=0)
-            curPart+=*iter;
-          else
-            {
-              if(!curPart.empty())
-                {
-                  std::string::reverse_iterator accessor=curPart.rbegin();
-                  if(*accessor!='*' && *accessor!='/' && *accessor!='^')
-                    {
-                      isParsingSucceed=true;
-                      _sub_expr.push_back(ExprParser(curPart.c_str()));
-                      curPart.clear();
-                      _func_btw_sub_expr.push_back(FunctionsFactory::buildBinaryFuncFromString(*iter));
-                    }
-                  else
-                    curPart+=*iter;
-                }
-              else
-                curPart+=*iter;
-            }
-        break;
-        case '(':
-          curLevel++;
-          curPart+=*iter;
-          break;
-        case ')':
-          curLevel--;
-          curPart+=*iter;
-          break;
-        default:
-          curPart+=*iter;
-        }
-    }
-  if(isParsingSucceed)
-    {
-      if(!curPart.empty())
-        {
-          _sub_expr.push_back(ExprParser(curPart.c_str()));
-          _is_parsing_ok=true;
-        }
-      else
-        {
-          std::ostringstream errMsg;
-          char MSGTYP4[]="Error following expression finished by +/- without right part.";
-          errMsg << EXPR_PARSE_ERR_MSG << MSGTYP4 << _expr;
-          throw INTERP_KERNEL::Exception(errMsg.str().c_str());
-        }
-    }
-}
-
-void ExprParser::parseForMulDiv() throw(INTERP_KERNEL::Exception)
-{
-  std::string::const_iterator iter;
-  int curLevel=0;
-  std::string curPart;
-  bool isParsingSucceed=false;
-  for(iter=_expr.begin();iter!=_expr.end();iter++)
-    {
-      switch(*iter)
-        {
-        case '/':
-        case '*':
-          if(curLevel!=0)
-            curPart+=*iter;
-          else
-            {
-              isParsingSucceed=true;
-              if(!curPart.empty())
-                {
-                  _sub_expr.push_back(ExprParser(curPart.c_str()));
-                  curPart.clear();
-                  _func_btw_sub_expr.push_back(FunctionsFactory::buildBinaryFuncFromString(*iter));
-                }
-              else
-                {
-                  std::ostringstream errMsg;
-                  char MSGTYP1[]="Error non unary function for '";
-                  errMsg << EXPR_PARSE_ERR_MSG << MSGTYP1 << *iter << "'";
-                  std::string tmp=_expr.substr(iter-_expr.begin());
-                  locateError(errMsg,tmp,0);
-                  throw INTERP_KERNEL::Exception(errMsg.str().c_str());
-                }
-            }
-        break;
-        case '(':
-          curLevel++;
-          curPart+=*iter;
-          break;
-        case ')':
-          curLevel--;
-          curPart+=*iter;
-          break;
-        default:
-          curPart+=*iter;
-        }
-    }
-  if(isParsingSucceed)
-    {
-      if(!curPart.empty())
-        {
-          _sub_expr.push_back(ExprParser(curPart.c_str()));
-          _is_parsing_ok=true;
-        }
-      else
-        {
-          std::ostringstream errMsg;
-          char MSGTYP5[]="Error following expression finished by *// without right part.";
-          errMsg << EXPR_PARSE_ERR_MSG << MSGTYP5 << _expr;
-          throw INTERP_KERNEL::Exception(errMsg.str().c_str());
-        }
-    }
-}
-
-void ExprParser::parseForPow() throw(INTERP_KERNEL::Exception)
-{
-  std::string::const_iterator iter;
-  int curLevel=0;
-  std::string curPart;
-  bool isParsingSucceed=false;
-  for(iter=_expr.begin();iter!=_expr.end();iter++)
-    {
-      switch(*iter)
-        {
-        case '^':
-          if(curLevel!=0)
-            curPart+=*iter;
-          else
-            if(!curPart.empty())
-              {
-                isParsingSucceed=true;
-                _sub_expr.push_back(ExprParser(curPart.c_str()));
-                curPart.clear();
-                _func_btw_sub_expr.push_back(FunctionsFactory::buildBinaryFuncFromString(*iter));
-              }
-            else
-              {
-                std::ostringstream errMsg;
-                char MSGTYP1[]="Error non unary function for '";
-                errMsg << EXPR_PARSE_ERR_MSG << MSGTYP1 << *iter << "'";
-                std::string tmp=_expr.substr(iter-_expr.begin());
-                locateError(errMsg,tmp,0);curPart+=*iter;
-                throw INTERP_KERNEL::Exception(errMsg.str().c_str());
-              }
-          break;
-        case '(':
-          curLevel++;
-          curPart+=*iter;
-          break;
-        case ')':
-          curLevel--;
-          curPart+=*iter;
-          break;
-        default:
-          curPart+=*iter;
-        }
-    }
-  if(isParsingSucceed)
-    {
-      if(!curPart.empty())
-        {
-          _sub_expr.push_back(ExprParser(curPart.c_str()));
-          _is_parsing_ok=true;
-        }
-      else
-        {
-          std::ostringstream errMsg;
-          char MSGTYP6[]="Error following expression finished by ^ without right part.";
-          errMsg << EXPR_PARSE_ERR_MSG << MSGTYP6 << _expr;
-          throw INTERP_KERNEL::Exception(errMsg.str().c_str());
-        }
-    }
-}
-
-void ExprParser::releaseFunctions()
-{
-  for(std::list<Function *>::iterator iter=_func_btw_sub_expr.begin();iter!=_func_btw_sub_expr.end();iter++)
-    delete *iter;
-  _func_btw_sub_expr.clear();
-}
-
-/*!
- * This method parse this->_expr at the current level.
- * This method first try to see if this->_expr is a leaf, if not it try a unary function of something (see INTERP_KERNEL::ExprParser::parseUnaryFunc method)
- * If true is returned, no deeper parsing needed, if false is returned for a full parsing of this->_expr INTERP_KERNEL::ExprParser::parseDeeper call needed.
- */
-bool ExprParser::simplify() throw(INTERP_KERNEL::Exception)
-{
-  if(tryToInterpALeaf())
-    return true;
-  parseUnaryFunc();
-  if(!_is_parsing_ok)
-    {
-      parseForAddMin();
-      if(!_is_parsing_ok)
-        {
-          parseForMulDiv();
-          if(!_is_parsing_ok)
-            parseForPow();
-        }
-    }
-  if(!_is_parsing_ok)
-    {
-      std::ostringstream errMsg;
-      char MSGTYP3[]="Error in interpreting : ";
-      errMsg << EXPR_PARSE_ERR_MSG << MSGTYP3 << _expr;
-      locateError(errMsg,_expr,0);
-      throw INTERP_KERNEL::Exception(errMsg.str().c_str());
-    }
-  return false;
-}
-
-void ExprParser::checkBracketsParity() const throw(INTERP_KERNEL::Exception)
-{
-  std::string::const_iterator iter;
-  int curLevel=0;
-  for(iter=_expr.begin();iter!=_expr.end();iter++)
-    {
-      if(*iter=='(')
-        curLevel++;
-      else if(*iter==')')
-        {
-          if(curLevel==0)
-            {
-              std::ostringstream errMsg;
-              char MSGTYP1[]="Error in brackets : closing brackets ')' before openning '('";
-              errMsg << EXPR_PARSE_ERR_MSG << MSGTYP1;
-              locateError(errMsg,_expr,iter-_expr.begin());
-              throw INTERP_KERNEL::Exception(errMsg.str().c_str());
-            }
-          curLevel--;
-        }
-    }
-  if(curLevel!=0)
-    {
-      std::ostringstream errMsg;
-      char MSGTYP2[]="Error in brackets : not finally closed expr.";
-      errMsg << EXPR_PARSE_ERR_MSG << MSGTYP2;
-      throw INTERP_KERNEL::Exception(errMsg.str().c_str());
-    }
-}
-
-void ExprParser::locateError(std::ostream& stringToDisp, const std::string& srcOfErr, int posOfErr)
-{
-  stringToDisp << "Position is " << posOfErr << " of string : \"" <<  srcOfErr << "\"" << std::endl;
-}
diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.hxx b/src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.hxx
deleted file mode 100644
index 032f7070a..000000000
--- a/src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.hxx
+++ /dev/null
@@ -1,117 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __INTERPKERNELEXPRPARSER_HXX__
-#define __INTERPKERNELEXPRPARSER_HXX__
-
-#include "INTERPKERNELEXPREVALDefines.hxx"
-#include "InterpKernelUnit.hxx"
-#include "InterpKernelException.hxx"
-#include "InterpKernelFunction.hxx"
-
-#include <string>
-#include <list>
-#include <map>
-#include <set>
-
-namespace INTERP_KERNEL
-{
-  class ValueDouble;
-
-  class INTERPKERNELEXPREVAL_EXPORT LeafExpr
-  {
-  public:
-    virtual ~LeafExpr();
-    virtual void fillValue(Value *val) const throw(INTERP_KERNEL::Exception) = 0;
-    static LeafExpr *buildInstanceFrom(const std::string& expr) throw(INTERP_KERNEL::Exception);
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT LeafExprVal : public LeafExpr
-  {
-  public:
-    LeafExprVal(double value);
-    ~LeafExprVal();
-    void fillValue(Value *val) const throw(INTERP_KERNEL::Exception);
-  private:
-    double _value;
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT LeafExprVar : public LeafExpr
-  {
-  public:
-    LeafExprVar(const std::string& var);
-    ~LeafExprVar();
-    void fillValue(Value *val) const throw(INTERP_KERNEL::Exception);
-    std::string getVar() const { return _var_name; }
-    void prepareExprEvaluation(const std::vector<std::string>& vars) const throw(INTERP_KERNEL::Exception);
-    void prepareExprEvaluationVec() const throw(INTERP_KERNEL::Exception);
-    static bool isRecognizedKeyVar(const std::string& var, int& pos);
-  public:
-    static const char END_OF_RECOGNIZED_VAR[];
-  private:
-    mutable int _fast_pos;
-    std::string _var_name;
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT ExprParser
-  {
-  public:
-    ExprParser(const char *expr);
-    ExprParser(const char *expr, int lgth);
-    ~ExprParser();
-    void parse() throw(INTERP_KERNEL::Exception);
-    bool isParsingSuccessfull() const { return _is_parsing_ok; }
-    double evaluate() const throw(INTERP_KERNEL::Exception);
-    DecompositionInUnitBase evaluateUnit() const throw(INTERP_KERNEL::Exception);
-    void prepareExprEvaluation(const std::vector<std::string>& vars) const throw(INTERP_KERNEL::Exception);
-    void evaluateExpr(int szOfOutParam, double *outParam, const double *inParam) const throw(INTERP_KERNEL::Exception);
-    void prepareExprEvaluationVec() const throw(INTERP_KERNEL::Exception);
-    void getSetOfVars(std::set<std::string>& vars) const;
-    void getTrueSetOfVars(std::set<std::string>& vars) const;
-    static std::string buildStringFromFortran(const char *expr, int lgth);
-    static std::string deleteWhiteSpaces(const std::string& expr);
-  private:
-    Value *evaluateLowLev(Value *valGen) const throw(INTERP_KERNEL::Exception);
-  private:
-    void prepareExprEvaluationVecLowLev() const throw(INTERP_KERNEL::Exception);
-    bool tryToInterpALeaf() throw(INTERP_KERNEL::Exception);
-    void parseUnaryFunc() throw(INTERP_KERNEL::Exception);
-    void parseForAddMin() throw(INTERP_KERNEL::Exception);
-    void parseForMulDiv() throw(INTERP_KERNEL::Exception);
-    void parseForPow() throw(INTERP_KERNEL::Exception);
-    void parseDeeper() throw(INTERP_KERNEL::Exception);
-    bool simplify() throw(INTERP_KERNEL::Exception);
-    void releaseFunctions();
-    void checkBracketsParity() const throw(INTERP_KERNEL::Exception);
-    static std::size_t findCorrespondingOpenBracket(const std::string& expr, std::size_t posOfCloseBracket);
-    static void locateError(std::ostream& stringToDisp, const std::string& srcOfErr, int posOfErr);
-  private:
-    bool _is_parsed;
-    LeafExpr *_leaf;
-    bool _is_parsing_ok;
-    std::string _expr;
-    std::list<ExprParser> _sub_expr;
-    std::list<Function *> _func_btw_sub_expr;
-  private:
-    static const char WHITE_SPACES[];
-    static const char EXPR_PARSE_ERR_MSG[];
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelFunction.cxx b/src/INTERP_KERNEL/ExprEval/InterpKernelFunction.cxx
deleted file mode 100644
index 6e8316526..000000000
--- a/src/INTERP_KERNEL/ExprEval/InterpKernelFunction.cxx
+++ /dev/null
@@ -1,568 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "InterpKernelFunction.hxx"
-#include "InterpKernelValue.hxx"
-
-#include <cmath>
-
-using namespace INTERP_KERNEL;
-
-const char IdentityFunction::REPR[]="Id";
-
-const char PositiveFunction::REPR[]="+";
-
-const char NegateFunction::REPR[]="-";
-
-const char CosFunction::REPR[]="cos";
-
-const char SinFunction::REPR[]="sin";
-
-const char TanFunction::REPR[]="tan";
-
-const char SqrtFunction::REPR[]="sqrt";
-
-const char AbsFunction::REPR[]="abs";
-
-const char PlusFunction::REPR[]="+";
-
-const char MinusFunction::REPR[]="-";
-
-const char MultFunction::REPR[]="*";
-
-const char DivFunction::REPR[]="/";
-
-const char PowFunction::REPR[]="^";
-
-const char ExpFunction::REPR[]="exp";
-
-const char LnFunction::REPR[]="ln";
-
-const char MaxFunction::REPR[]="max";
-
-const char MinFunction::REPR[]="min";
-
-Function *FunctionsFactory::buildFuncFromString(const char *type, int nbOfParams) throw(INTERP_KERNEL::Exception)
-{
-  switch(nbOfParams)
-    {
-    case 1:
-      return buildUnaryFuncFromString(type);
-    case 2:
-      return buildBinaryFuncFromString(type);
-    default:
-      throw INTERP_KERNEL::Exception("Invalid number of params detected : limited to 2 !");
-    }
-}
-
-Function *FunctionsFactory::buildUnaryFuncFromString(const char *type) throw(INTERP_KERNEL::Exception)
-{
-  std::string tmp(type);
-  if(tmp.empty())
-    return new IdentityFunction;
-  if(tmp==CosFunction::REPR)
-    return new CosFunction;
-  if(tmp==SinFunction::REPR)
-    return new SinFunction;
-  if(tmp==TanFunction::REPR)
-    return new TanFunction;
-  if(tmp==SqrtFunction::REPR)
-    return new SqrtFunction;
-  if(tmp==AbsFunction::REPR)
-    return new AbsFunction;
-  if(tmp==PositiveFunction::REPR)
-    return new PositiveFunction;
-  if(tmp==NegateFunction::REPR)
-    return new NegateFunction;
-  if(tmp==ExpFunction::REPR)
-    return new ExpFunction;
-  if(tmp==LnFunction::REPR)
-    return new LnFunction;
-  //
-  std::string msg("Invalid unary function detected : \"");
-  msg+=type; msg+="\"";
-  throw INTERP_KERNEL::Exception(msg.c_str());
-}
-
-Function *FunctionsFactory::buildBinaryFuncFromString(const char *type) throw(INTERP_KERNEL::Exception)
-{
-  std::string tmp(type);
-  if(tmp==PositiveFunction::REPR)
-    return new PlusFunction;
-  if(tmp==NegateFunction::REPR)
-    return new MinusFunction;
-  if(tmp==MultFunction::REPR)
-    return new MultFunction;
-  if(tmp==DivFunction::REPR)
-    return new DivFunction;
-  if(tmp==PowFunction::REPR)
-    return new PowFunction;
-  if(tmp==MaxFunction::REPR)
-    return new MaxFunction;
-  if(tmp==MinFunction::REPR)
-    return new MinFunction;
-  std::string msg("Invalid binary function detected : \"");
-  msg+=type; msg+="\"";
-  throw INTERP_KERNEL::Exception(msg.c_str());
-}
-
-Function *FunctionsFactory::buildBinaryFuncFromString(char type) throw(INTERP_KERNEL::Exception)
-{
-  char tmp[2]; tmp[0]=type; tmp[1]='\0';
-  return buildBinaryFuncFromString(tmp);
-}
-
-Function::~Function()
-{
-}
-
-IdentityFunction::~IdentityFunction()
-{
-}
-
-void IdentityFunction::operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception)
-{
-}
-
-const char *IdentityFunction::getRepr() const
-{
-  return REPR;
-}
-
-bool IdentityFunction::isACall() const
-{
-  return false;
-}
-
-PositiveFunction::~PositiveFunction()
-{
-}
-
-int UnaryFunction::getNbInputParams() const
-{
-  return 1;
-}
-
-void PositiveFunction::operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception)
-{
-}
-
-const char *PositiveFunction::getRepr() const
-{
-  return REPR;
-}
-
-bool PositiveFunction::isACall() const
-{
-  return false;
-}
-
-NegateFunction::~NegateFunction()
-{
-}
-
-void NegateFunction::operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception)
-{
-  Value *val=stack.back();
-  val->negate();
-}
-
-const char *NegateFunction::getRepr() const
-{
-  return REPR;
-}
-
-bool NegateFunction::isACall() const
-{
-  return false;
-}
-
-CosFunction::~CosFunction()
-{
-}
-
-void CosFunction::operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception)
-{
-  Value *val=stack.back();
-  val->cos();
-}
-
-const char *CosFunction::getRepr() const
-{
-  return REPR;
-}
-
-bool CosFunction::isACall() const
-{
-  return true;
-}
-
-SinFunction::~SinFunction()
-{
-}
-
-void SinFunction::operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception)
-{
-  Value *val=stack.back();
-  val->sin();
-}
-
-const char *SinFunction::getRepr() const
-{
-  return REPR;
-}
-
-bool SinFunction::isACall() const
-{
-  return true;
-}
-
-TanFunction::~TanFunction()
-{
-}
-
-void TanFunction::operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception)
-{
-  Value *val=stack.back();
-  val->tan();
-}
-
-const char *TanFunction::getRepr() const
-{
-  return REPR;
-}
-
-bool TanFunction::isACall() const
-{
-  return true;
-}
-
-SqrtFunction::~SqrtFunction()
-{
-}
-
-void SqrtFunction::operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception)
-{
-  Value *val=stack.back();
-  val->sqrt();
-}
-
-const char *SqrtFunction::getRepr() const
-{
-  return REPR;
-}
-
-bool SqrtFunction::isACall() const
-{
-  return true;
-}
-
-AbsFunction::~AbsFunction()
-{
-}
-
-void AbsFunction::operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception)
-{
-  Value *val=stack.back();
-  val->abs();
-}
-
-const char *AbsFunction::getRepr() const
-{
-  return REPR;
-}
-
-bool AbsFunction::isACall() const
-{
-  return false;
-}
-
-void ExpFunction::operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception)
-{
-  Value *val=stack.back();
-  val->exp();
-}
- 
-const char *ExpFunction::getRepr() const
-{
-  return REPR;
-}
-
-bool ExpFunction::isACall() const
-{
-  return true;
-}
-
-LnFunction::~LnFunction()
-{
-}
-
-void LnFunction::operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception)
-{
-  Value *val=stack.back();
-  val->ln();
-}
-
-const char *LnFunction::getRepr() const
-{
-  return REPR;
-}
-
-bool LnFunction::isACall() const
-{
-  return true;
-}
-
-int BinaryFunction::getNbInputParams() const
-{
-  return 2;
-}
-
-PlusFunction::~PlusFunction()
-{
-}
-
-void PlusFunction::operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception)
-{
-  Value *val1=stack.back();
-  stack.pop_back();
-  Value *& val2=stack.back();
-  Value *val3;
-  try
-    {
-      val3=val1->plus(val2);
-    }
-  catch(INTERP_KERNEL::Exception& e)
-    {
-      delete val1;
-      throw e;
-    }
-  delete val1;
-  delete val2;
-  val2=val3;
-}
-
-const char *PlusFunction::getRepr() const
-{
-  return REPR;
-}
-
-bool PlusFunction::isACall() const
-{
-  return false;
-}
-
-MinusFunction::~MinusFunction()
-{
-}
-
-void MinusFunction::operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception)
-{
-  Value *val1=stack.back();
-  stack.pop_back();
-  Value *& val2=stack.back();
-  Value *val3;
-  try
-    {
-      val3=val1->minus(val2);
-    }
-  catch(INTERP_KERNEL::Exception& e)
-    {
-      delete val1;
-      throw e;
-    }
-  delete val1;
-  delete val2;
-  val2=val3;
-}
-
-const char *MinusFunction::getRepr() const
-{
-  return REPR;
-}
-
-bool MinusFunction::isACall() const
-{
-  return false;
-}
-
-MultFunction::~MultFunction()
-{
-}
-
-void MultFunction::operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception)
-{
-  Value *val1=stack.back();
-  stack.pop_back();
-  Value *& val2=stack.back();
-  Value *val3=val1->mult(val2);
-  delete val1;
-  delete val2;
-  val2=val3;
-}
-
-const char *MultFunction::getRepr() const
-{
-  return REPR;
-}
-
-bool MultFunction::isACall() const
-{
-  return false;
-}
-
-DivFunction::~DivFunction()
-{
-}
-
-void DivFunction::operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception)
-{
-  Value *val1=stack.back();
-  stack.pop_back();
-  Value *& val2=stack.back();
-  Value *val3;
-  try
-    {
-      val3=val1->div(val2);
-    }
-  catch(INTERP_KERNEL::Exception& e)
-    {
-      delete val1;
-      throw e;
-    }
-  delete val1;
-  delete val2;
-  val2=val3;
-}
-
-const char *DivFunction::getRepr() const
-{
-  return REPR;
-}
-
-bool DivFunction::isACall() const
-{
-  return false;
-}
-
-PowFunction::~PowFunction()
-{
-}
-
-void PowFunction::operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception)
-{
-  Value *val1=stack.back();
-  stack.pop_back();
-  Value *& val2=stack.back();
-  Value *val3;
-  try
-    {
-      val3=val1->pow(val2);
-    }
-  catch(INTERP_KERNEL::Exception& e)
-    {
-      delete val1;
-      throw e;
-    }
-  delete val1;
-  delete val2;
-  val2=val3;
-}
-
-const char *PowFunction::getRepr() const
-{
-  return REPR;
-}
-
-bool PowFunction::isACall() const
-{
-  return true;
-}
-
-ExpFunction::~ExpFunction()
-{
-}
-
-MaxFunction::~MaxFunction()
-{
-}
-
-void MaxFunction::operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception)
-{
-  Value *val1=stack.back();
-  stack.pop_back();
-  Value *& val2=stack.back();
-  Value *val3;
-  try
-    {
-      val3=val1->max(val2);
-    }
-  catch(INTERP_KERNEL::Exception& e)
-    {
-      delete val1;
-      throw e;
-    }
-  delete val1;
-  delete val2;
-  val2=val3;
-}
-
-const char *MaxFunction::getRepr() const
-{
-  return REPR;
-}
-
-bool MaxFunction::isACall() const
-{
-  return false;
-}
-
-MinFunction::~MinFunction()
-{
-}
-
-void MinFunction::operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception)
-{
-  Value *val1=stack.back();
-  stack.pop_back();
-  Value *& val2=stack.back();
-  Value *val3;
-  try
-    {
-      val3=val1->min(val2);
-    }
-  catch(INTERP_KERNEL::Exception& e)
-    {
-      delete val1;
-      throw e;
-    }
-  delete val1;
-  delete val2;
-  val2=val3;
-}
-
-const char *MinFunction::getRepr() const
-{
-  return REPR;
-}
-
-bool MinFunction::isACall() const
-{
-  return false;
-}
diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelFunction.hxx b/src/INTERP_KERNEL/ExprEval/InterpKernelFunction.hxx
deleted file mode 100644
index 548a09f1e..000000000
--- a/src/INTERP_KERNEL/ExprEval/InterpKernelFunction.hxx
+++ /dev/null
@@ -1,253 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __INTERPKERNELFUNCTION_HXX__
-#define __INTERPKERNELFUNCTION_HXX__
-
-#include "INTERPKERNELEXPREVALDefines.hxx"
-#include "InterpKernelException.hxx"
-
-#include <vector>
-
-namespace INTERP_KERNEL
-{
-  class Value;
-  class Function;
-
-  class INTERPKERNELEXPREVAL_EXPORT FunctionsFactory
-  {
-  public:
-    static Function *buildFuncFromString(const char *type, int nbOfParams) throw(INTERP_KERNEL::Exception);
-    static Function *buildUnaryFuncFromString(const char *type) throw(INTERP_KERNEL::Exception);
-    //static Function *buildUnaryFuncFromString(char type) throw(INTERP_KERNEL::Exception);
-    static Function *buildBinaryFuncFromString(const char *type) throw(INTERP_KERNEL::Exception);
-    static Function *buildBinaryFuncFromString(char type) throw(INTERP_KERNEL::Exception);
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT Function
-  {
-  public:
-    virtual ~Function();
-    virtual int getNbInputParams() const = 0;
-    virtual void operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception) = 0;
-    virtual const char *getRepr() const = 0;
-    virtual bool isACall() const = 0;
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT UnaryFunction : public Function
-  { 
-  public:
-    int getNbInputParams() const;
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT IdentityFunction : public UnaryFunction
-  {
-  public:
-    ~IdentityFunction();
-    void operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception);
-    const char *getRepr() const;
-    bool isACall() const;
-  public:
-    static const char REPR[];
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT PositiveFunction : public UnaryFunction
-  {
-  public:
-    ~PositiveFunction();
-    void operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception);
-    const char *getRepr() const;
-    bool isACall() const;
-  public:
-    static const char REPR[];
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT NegateFunction : public UnaryFunction
-  {
-  public:
-    ~NegateFunction();
-    void operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception);
-    const char *getRepr() const;
-    bool isACall() const;
-  public:
-    static const char REPR[];
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT CosFunction : public UnaryFunction
-  {
-  public:
-    ~CosFunction();
-    void operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception);
-    const char *getRepr() const;
-    bool isACall() const;
-  public:
-    static const char REPR[];
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT SinFunction : public UnaryFunction
-  {
-  public:
-    ~SinFunction();
-    void operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception);
-    const char *getRepr() const;
-    bool isACall() const;
-  public:
-    static const char REPR[];
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT TanFunction : public UnaryFunction
-  {
-  public:
-    ~TanFunction();
-    void operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception);
-    const char *getRepr() const;
-    bool isACall() const;
-  public:
-    static const char REPR[];
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT SqrtFunction : public UnaryFunction
-  {
-  public:
-    ~SqrtFunction();
-    void operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception);
-    const char *getRepr() const;
-    bool isACall() const;
-  public:
-    static const char REPR[];
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT AbsFunction : public UnaryFunction
-  {
-  public:
-    ~AbsFunction();
-    void operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception);
-    const char *getRepr() const;
-    bool isACall() const;
-  public:
-    static const char REPR[];
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT ExpFunction : public UnaryFunction
-  {
-  public:
-    ~ExpFunction();
-    void operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception);
-    const char *getRepr() const;
-    bool isACall() const;
-  public:
-    static const char REPR[];
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT LnFunction : public UnaryFunction
-  {
-  public:
-    ~LnFunction();
-    void operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception);
-    const char *getRepr() const;
-    bool isACall() const;
-  public:
-    static const char REPR[];
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT BinaryFunction : public Function
-  {
-  public:
-    int getNbInputParams() const;
-  };
-
-  class PlusFunction : public BinaryFunction
-  {
-  public:
-    ~PlusFunction();
-    void operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception);
-    const char *getRepr() const;
-    bool isACall() const;
-  public:
-    static const char REPR[];
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT MinusFunction : public BinaryFunction
-  {
-  public:
-    ~MinusFunction();
-    void operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception);
-    const char *getRepr() const;
-    bool isACall() const;
-  public:
-    static const char REPR[];
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT MultFunction : public BinaryFunction
-  {
-  public:
-    ~MultFunction();
-    void operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception);
-    const char *getRepr() const;
-    bool isACall() const;
-  public:
-    static const char REPR[];
-  };
-  
-  class INTERPKERNELEXPREVAL_EXPORT DivFunction : public BinaryFunction
-  {
-  public:
-    ~DivFunction();
-    void operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception);
-    const char *getRepr() const;
-    bool isACall() const;
-  public:
-    static const char REPR[];
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT PowFunction : public BinaryFunction
-  {
-  public:
-    ~PowFunction();
-    void operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception);
-    const char *getRepr() const;
-    bool isACall() const;
-  public:
-    static const char REPR[];
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT MaxFunction : public BinaryFunction
-  {
-  public:
-    ~MaxFunction();
-    void operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception);
-    const char *getRepr() const;
-    bool isACall() const;
-  public:
-    static const char REPR[];
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT MinFunction : public BinaryFunction
-  {
-  public:
-    ~MinFunction();
-    void operate(std::vector<Value *>& stack) const throw(INTERP_KERNEL::Exception);
-    const char *getRepr() const;
-    bool isACall() const;
-  public:
-    static const char REPR[];
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.cxx b/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.cxx
deleted file mode 100644
index 6eacf7221..000000000
--- a/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.cxx
+++ /dev/null
@@ -1,372 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "InterpKernelUnit.hxx"
-#include "InterpKernelExprParser.hxx"
-
-#include <cmath>
-#include <sstream>
-#include <iomanip>
-#include <limits>
-
-using namespace INTERP_KERNEL;
-
-UnitDataBase UnitDataBase::_uniqueMapForExpr;
-
-static const char InterpKernelMuAscii[2]={-0x4B,0x0};
-
-static const char InterpKernelMuUnicode[3]={-0x3E,-0x4B,0x0};
-
-const char *UnitDataBase::PREF_POW10[NB_OF_PREF_POW10]={"y","z","a","f","p","n",InterpKernelMuAscii,InterpKernelMuUnicode,"u","m","c","d",
-                                                        "da","h","k","M","G","T","P","E","Z","Y"};
-
-const double UnitDataBase::POW10[NB_OF_PREF_POW10]={1e-24,1e-21,1e-18,1e-15,1e-12,1e-9,1e-6,1e-6,1e-6,1e-3,1e-2,1e-1,
-                                                  1e1,1e2,1e3,1e6,1e9,1e12,1e15,1e18,1e21,1e24};
-
-static const char InterpKernelDegreeCAscii[3]={-0x50,0x43,0x0};
-
-static const char InterpKernelDegreeCUnicode[4]={-0x3E,-0x50,0x43,0x0};
-
-static const char InterpKernelDegreeCUnicodeWin[3]={-0x08,0x43,0x0};
-
-const char *UnitDataBase::UNITS_RECOGN[NB_OF_UNITS_RECOGN]={"g","m","s","A","K",
-                                                            "W","J","Hz","V","h","min","t","N","dyn",
-                                                            "eV","Pa","atm","bar",InterpKernelDegreeCAscii,"C","ohm","F","S",
-                                                            "T","H","P","St",InterpKernelDegreeCUnicode,InterpKernelDegreeCUnicodeWin};
-
-const short UnitDataBase::PROJ_IN_BASE[NB_OF_UNITS_RECOGN][SIZE_OF_UNIT_BASE]=
-  {
-    {1,0,0,0,0},//g
-    {0,1,0,0,0},//m
-    {0,0,1,0,0},//s
-    {0,0,0,1,0},//A
-    {0,0,0,0,1},//K
-    {1,2,-3,0,0},//W
-    {1,2,-2,0,0},//J
-    {0,0,-1,0,0},//Hz
-    {1,2,-3,-1,0},//V
-    {0,0,1,0,0},//h
-    {0,0,1,0,0},//min
-    {1,0,0,0,0},//t
-    {1,1,-2,0,0},//N
-    {1,1,-2,0,0},//dyn
-    {1,2,-2,0,0},//eV
-    {1,-1,-2,0,0},//Pa
-    {1,-1,-2,0,0},//atm
-    {1,-1,-2,0,0},//bar
-    {0,0,0,0,1},//degree C
-    {0,0,1,1,0},//C
-    {1,2,-3,-2,0},//ohm
-    {-1,-2,4,2,0},//F
-    {-1,-2,3,2,0},//S
-    {1,0,-2,-1,0},//T
-    {1,2,-2,-2,0},//H
-    {1,-1,-1,0,0},//P
-    {0,2,-1,0,0},//St
-    {0,0,0,0,1},//degree C
-    {0,0,0,0,1}//degree C
-  };
-
-const double UnitDataBase::MUL_COEFF[NB_OF_UNITS_RECOGN]=
-  { 1.,1.,1.,1.,1.,
-    1000.,1000.,1.,1000.,3600.,3600.,1e6,1000.,1e-2,
-    1.60217733e-16,1000.,1.01325e8,1e8,1.,1.,1000.,1e-3,
-    1000.,1000.,100.,1.,1.,1.,1.};
-
-const double UnitDataBase::ADD_COEFF[NB_OF_UNITS_RECOGN]=
-  { 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 273.15, 0., 0., 0., 0., 0., 0., 0., 0., 273.15 ,273.15};
-
-UnitDataBase::UnitDataBase()
-{
-  for(int i=0;i<NB_OF_PREF_POW10;i++)
-    _prefix_pow_10[PREF_POW10[i]]=POW10[i];
-  for(int i=0;i<NB_OF_UNITS_RECOGN;i++)
-    {
-      _units_semantic[UNITS_RECOGN[i]]=PROJ_IN_BASE[i];
-      _units_mul[UNITS_RECOGN[i]]=MUL_COEFF[i];
-      _units_add[UNITS_RECOGN[i]]=ADD_COEFF[i];
-    }
-}
-
-const short *UnitDataBase::getInfoForUnit(const std::string& unit,
-                                          double& addFact, double& mFact) const throw(INTERP_KERNEL::Exception)
-{
-  std::size_t lgth=unit.length();
-  std::string work,work2;
-  const short *ret=0;
-  for(std::size_t i=0;i<lgth && !ret;i++)
-    {
-      work=unit.substr(i);
-      std::map<std::string,const short *>::const_iterator iter=_units_semantic.find(work);
-      if(iter!=_units_semantic.end())
-        {
-          ret=(*iter).second;
-          std::map<std::string,double>::const_iterator iter2=_units_add.find(work);
-          addFact=(*iter2).second;
-          std::map<std::string,double>::const_iterator iter3=_units_mul.find(work);
-          mFact=(*iter3).second;
-          work2=unit.substr(0,i);
-        }
-    }
-  if(!ret)
-    {
-      std::ostringstream os;
-      os << "Unit : " << unit << " not recognized !";
-      throw INTERP_KERNEL::Exception(os.str().c_str());
-    }
-  if(!work2.empty())
-    {
-      std::map<std::string,double>::const_iterator iter4=_prefix_pow_10.find(work2);
-      if(iter4==_prefix_pow_10.end())
-        {
-          std::ostringstream os;
-          os << "Unit : " << unit << " not fully recognized : \"" << work << "\" detected as core unit and \"";
-          os << work2 << "\" not recognized prefix !";
-          throw INTERP_KERNEL::Exception(os.str().c_str());
-        }
-      addFact=0.;
-      mFact*=(*iter4).second;
-    }
-  return ret;
-}
-
-DecompositionInUnitBase::DecompositionInUnitBase():_add_to_base(0.),_mult_fact_to_base(1.)
-{
-  _value[0]=0;
-  _value[1]=0;
-  _value[2]=0;
-  _value[3]=0;
-  _value[4]=0;
-}
-
-void DecompositionInUnitBase::setInfo(const short *vals, double addFact, double mFact)
-{
-  _add_to_base=addFact;
-  _mult_fact_to_base=mFact;
-  _value[0]=vals[0];
-  _value[1]=vals[1];
-  _value[2]=vals[2];
-  _value[3]=vals[3];
-  _value[4]=vals[4];
-}
-
-bool DecompositionInUnitBase::operator==(const DecompositionInUnitBase& other) const
-{
-  return _value[0]==other._value[0] && _value[1]==other._value[1] && _value[2]==other._value[2] && _value[3]==other._value[3] && _value[4]==other._value[4];
-}
-
-void DecompositionInUnitBase::getTranslationParams(const DecompositionInUnitBase& other, double& mul, double& add) const
-{
-  if((*this)==other)
-    {
-      mul=_mult_fact_to_base/other._mult_fact_to_base;
-      add=_add_to_base/other._mult_fact_to_base-other._add_to_base;
-    }
-  else
-    {
-      mul=std::numeric_limits<double>::max();
-      add=std::numeric_limits<double>::max();
-    }
-}
-
-bool DecompositionInUnitBase::isEqual(short mass, short lgth, short time, short intensity, short temp, double add, double mult)
-{
-  bool ret1=mass==_value[0];
-  bool ret2=lgth==_value[1];
-  bool ret3=time==_value[2];
-  bool ret4=intensity==_value[3];
-  bool ret5=temp==_value[4];
-  bool ret6=areDoubleEquals(add,_add_to_base);
-  bool ret7=areDoubleEquals(mult,_mult_fact_to_base);
-  return ret1 && ret2 && ret3 && ret4 && ret5 && ret6 && ret7;
-}
-
-void DecompositionInUnitBase::negate()
-{
-  _mult_fact_to_base=-_mult_fact_to_base;
-}
-
-bool DecompositionInUnitBase::isAdimensional() const
-{
-  return _value[0]==0 && _value[1]==0 && _value[2]==0 && _value[3]==0 && _value[4]==0;
-}
-
-bool DecompositionInUnitBase::isUnitary() const
-{
-  return areDoubleEquals(_add_to_base,0.) && areDoubleEquals(_mult_fact_to_base,1.);
-}
-
-void DecompositionInUnitBase::tryToConvertInUnit(double val) throw(INTERP_KERNEL::Exception)
-{
-  int valI=(int)val;
-  if((val-(double)valI)!=0.)
-    {
-      std::ostringstream os;
-      os << "Double value " << val << " can't be considered as integer. Not admitable for units !";
-      throw INTERP_KERNEL::Exception(os.str().c_str());
-    }
-  _value[0]=0;
-  _value[1]=0;
-  _value[2]=0;
-  _value[3]=0;
-  _value[4]=0;
-  _add_to_base=0;
-  _mult_fact_to_base=valI;
-}
-
-DecompositionInUnitBase &DecompositionInUnitBase::operator*(const DecompositionInUnitBase& other)
-{
-  _value[0]+=other._value[0]; _value[1]+=other._value[1]; _value[2]+=other._value[2]; _value[3]+=other._value[3]; _value[4]+=other._value[4];
-  _mult_fact_to_base*=other._mult_fact_to_base;
-  _add_to_base=0.;
-  return *this;
-}
-
-DecompositionInUnitBase &DecompositionInUnitBase::operator/(const DecompositionInUnitBase& other)
-{
-  _value[0]-=other._value[0]; _value[1]-=other._value[1]; _value[2]-=other._value[2]; _value[3]-=other._value[3]; _value[4]-=other._value[4];
-  _mult_fact_to_base/=other._mult_fact_to_base;
- _add_to_base=0.;
- return *this;
-}
-
-DecompositionInUnitBase &DecompositionInUnitBase::operator^(const DecompositionInUnitBase& other) throw(INTERP_KERNEL::Exception)
-{
-  if(!other.isAdimensional())
-    throw INTERP_KERNEL::Exception("Trying to execute operator ^ with a second member not adimensionnal");
-  int exp=couldItBeConsideredAsInt(other._mult_fact_to_base);
-  _value[0]*=exp; _value[1]*=exp; _value[2]*=exp; _value[3]*=exp; _value[4]*=exp;
-  _mult_fact_to_base=powInt(_mult_fact_to_base,exp);
-  _add_to_base=0.;
-  return *this;
-}
-
-void DecompositionInUnitBase::dealWithAddFactor(const DecompositionInUnitBase& other)
-{
-  if(!areDoubleEquals(_add_to_base,0.))
-    if(other.isAdimensional())
-      if(areDoubleEquals(other._mult_fact_to_base,1.))
-        return ;
-  if(!other.areDoubleEquals(_add_to_base,0.))
-    if(isAdimensional())
-      if(areDoubleEquals(_mult_fact_to_base,1.))
-        return ;
-  _add_to_base=0.;
-}
-
-double DecompositionInUnitBase::powInt(double val, int exp)
-{
-  double work=1.;
-  if(exp==0)
-    return 1.;
-  if(exp>0)
-    for(int i=0;i<exp;i++)
-      work*=val;
-  else
-    {
-      int tmp=-exp;
-      for(int i=0;i<tmp;i++)
-        work*=1/val;
-    }
-  return work;
-}
-
-bool DecompositionInUnitBase::areDoubleEquals(double a, double b)
-{
-  if(a==0. || b==0.)
-    return a==b;
-  double ref=std::max(a,b);
-  return fabs((a-b)/ref)<1e-7;
-}
-
-int DecompositionInUnitBase::couldItBeConsideredAsInt(double val) throw(INTERP_KERNEL::Exception)
-{
-  int ret=(int)val;
-  double valT=(double) ret;
-  if(valT==val)
-    return ret;
-  else
-    {
-      std::ostringstream stream; stream << "Invalid double number " << std::setprecision(16) << val << " can's be considered for ^ operation on unit.";
-      throw INTERP_KERNEL::Exception(stream.str().c_str());
-    }
-}
-
-Unit::Unit(const char *reprC, bool tryToInterp):_coarse_repr(reprC),
-                                                _is_interpreted(false),
-                                                _is_interpretation_ok(false)
-{
-  if(tryToInterp)
-    tryToInterprate();
-}
-
-Unit::Unit(const char *reprFortran, int sizeOfRepr, bool tryToInterp):_coarse_repr(ExprParser::buildStringFromFortran(reprFortran,sizeOfRepr)),
-                                                                      _is_interpreted(false),
-                                                                      _is_interpretation_ok(false)
-{
-}
-
-void Unit::tryToInterprate() const
-{
-  if(!_is_interpreted)
-    {
-      _is_interpreted=true;
-      _is_interpretation_ok=false;
-      try
-        {
-          ExprParser expr(_coarse_repr.c_str());
-          expr.parse();
-          _decomp_in_base=expr.evaluateUnit();
-          _is_interpretation_ok=true;
-        }
-      catch(INTERP_KERNEL::Exception&) { }
-    }
-}
-
-bool Unit::isInterpretationOK() const
-{
-  return _is_interpretation_ok;
-}
-
-bool Unit::isCompatibleWith(const Unit& other) const
-{
-  tryToInterprate();
-  other.tryToInterprate();
-  if(_is_interpretation_ok && other._is_interpretation_ok)
-    return _decomp_in_base==other._decomp_in_base;
-  else
-    return false;
-}
-
-double Unit::convert(const Unit& target, double sourceVal) const
-{
-  if(isCompatibleWith(target))
-    {
-      double mult,add;
-      _decomp_in_base.getTranslationParams(target._decomp_in_base,mult,add);
-      return mult*sourceVal+add;
-    }
-  else
-    return std::numeric_limits<double>::max();
-}
-
-std::string Unit::getCoarseRepr() const
-{
-  return _coarse_repr;
-}
diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.hxx b/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.hxx
deleted file mode 100644
index 1c5b50ee8..000000000
--- a/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.hxx
+++ /dev/null
@@ -1,117 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __INTERPKERNELUNIT_HXX__
-#define __INTERPKERNELUNIT_HXX__
-
-#include "INTERPKERNELEXPREVALDefines.hxx"
-#include "InterpKernelException.hxx"
-
-#include <map>
-#include <sstream>
-
-namespace INTERP_KERNEL
-{
-  class INTERPKERNELEXPREVAL_EXPORT UnitDataBase
-  {
-  public:
-    UnitDataBase();
-    const short *getInfoForUnit(const std::string& unit,
-                                double& addFact, double& mFact) const throw(INTERP_KERNEL::Exception);
-    static UnitDataBase _uniqueMapForExpr;
-    static const int SIZE_OF_UNIT_BASE=5;
-  private:
-    std::map<std::string,double> _prefix_pow_10;
-    std::map<std::string,const short *> _units_semantic;
-    std::map<std::string,double> _units_mul;
-    std::map<std::string,double> _units_add;
-  private:
-    static const int NB_OF_PREF_POW10=22;
-    static const char *PREF_POW10[NB_OF_PREF_POW10];
-    static const double POW10[NB_OF_PREF_POW10];
-    static const int NB_OF_UNITS_RECOGN=29;
-    static const char *UNITS_RECOGN[NB_OF_UNITS_RECOGN];
-    static const short PROJ_IN_BASE[NB_OF_UNITS_RECOGN][SIZE_OF_UNIT_BASE];
-    static const double MUL_COEFF[NB_OF_UNITS_RECOGN];
-    static const double ADD_COEFF[NB_OF_UNITS_RECOGN];
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT DecompositionInUnitBase
-  {
-  public:
-    DecompositionInUnitBase();
-    void setInfo(const short *vals, double addFact, double mFact);
-    short operator[](int i) const { return _value[i]; }
-    bool operator==(const DecompositionInUnitBase& other) const;
-    void getTranslationParams(const DecompositionInUnitBase& other, double& mul, double& add) const;
-    bool isEqual(short mass, short lgth, short time, short intensity, short temp,
-                 double add, double mult);
-    bool isUnitary() const;
-    //! \b WARNING no test is done on the fact that unit is adimensionnal.
-    void negate();
-    bool isAdimensional() const;
-    void tryToConvertInUnit(double val) throw(INTERP_KERNEL::Exception);
-    DecompositionInUnitBase &operator*(const DecompositionInUnitBase& other);
-    DecompositionInUnitBase &operator/(const DecompositionInUnitBase& other);
-    DecompositionInUnitBase &operator^(const DecompositionInUnitBase& other) throw(INTERP_KERNEL::Exception);
-  private:
-    void dealWithAddFactor(const DecompositionInUnitBase& other);
-    static int couldItBeConsideredAsInt(double val) throw(INTERP_KERNEL::Exception);
-    static bool areDoubleEquals(double a, double b);
-    static double powInt(double val, int exp);
-  private:
-    short _value[UnitDataBase::SIZE_OF_UNIT_BASE];
-    double _add_to_base;
-    double _mult_fact_to_base;
-  };
-
-  /*!
-   * This class deals with units.
-   * This class has two main responsabilities :
-   *      - interprete units by giving simply their representation in string type.
-   *      - performing operations on these units.
-   *
-   * All the possible units are represented with a unique tuple with 5 elements
-   * representing the unique decomposition of a unit in the following base.
-   *
-   * dimension 0 stands for mass in g (\b NOT kg to simplify parsing).
-   * dimension 1 stands for length in m.
-   * dimension 2 stands for time in s.
-   * dimension 3 stands for elec intensity A.
-   * dimension 4 stands for temperature in K.
-   */
-  class INTERPKERNELEXPREVAL_EXPORT Unit
-  {
-  public:
-    Unit(const char *reprC, bool tryToInterp=true);
-    Unit(const char *reprFortran, int sizeOfRepr, bool tryToInterp=true);
-    void tryToInterprate() const;
-    bool isInterpretationOK() const;
-    bool isCompatibleWith(const Unit& other) const;
-    double convert(const Unit& target, double sourceVal) const;
-    std::string getCoarseRepr() const;
-  private:
-    std::string _coarse_repr;
-    mutable bool _is_interpreted;
-    mutable bool _is_interpretation_ok;
-    mutable DecompositionInUnitBase _decomp_in_base;
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelValue.cxx b/src/INTERP_KERNEL/ExprEval/InterpKernelValue.cxx
deleted file mode 100644
index 5e3bcfe19..000000000
--- a/src/INTERP_KERNEL/ExprEval/InterpKernelValue.cxx
+++ /dev/null
@@ -1,425 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "InterpKernelValue.hxx"
-#include "InterpKernelFunction.hxx"
-
-#include <cmath>
-#include <limits>
-#include <algorithm>
-
-using namespace INTERP_KERNEL;
-
-ValueDouble::ValueDouble():_data(std::numeric_limits<double>::max())
-{
-}
-
-Value *ValueDouble::newInstance() const
-{
-  return new ValueDouble;
-}
-
-ValueDouble::ValueDouble(double val):_data(val)
-{
-}
-
-void ValueDouble::setDouble(double val) throw(INTERP_KERNEL::Exception)
-{
-  _data=val;
-}
-
-void ValueDouble::setVarname(int fastPos, const std::string& var) throw(INTERP_KERNEL::Exception)
-{
-  std::string msg("Error var : "); msg+=var; msg+=" not numeric : use another expression evaluator !";
-  throw INTERP_KERNEL::Exception(msg.c_str());
-}
-
-void ValueDouble::positive() throw(INTERP_KERNEL::Exception)
-{
-}
-
-void ValueDouble::negate() throw(INTERP_KERNEL::Exception)
-{
-  _data=-_data;
-}
-
-void ValueDouble::sqrt() throw(INTERP_KERNEL::Exception)
-{
-  _data=std::sqrt(_data);
-}
-
-void ValueDouble::cos() throw(INTERP_KERNEL::Exception)
-{
-  _data=std::cos(_data);
-}
-
-void ValueDouble::sin() throw(INTERP_KERNEL::Exception)
-{
-  _data=std::sin(_data);
-}
-
-void ValueDouble::tan() throw(INTERP_KERNEL::Exception)
-{
-  _data=std::tan(_data);
-}
-
-void ValueDouble::abs() throw(INTERP_KERNEL::Exception)
-{
-  if(_data<0.)
-    _data=-_data;
-}
-
-void ValueDouble::exp() throw(INTERP_KERNEL::Exception)
-{
-  _data=std::exp(_data);
-}
-
-void ValueDouble:: ln() throw(INTERP_KERNEL::Exception)
-{
-  _data=std::log(_data);
-}
-
-Value *ValueDouble::plus(const Value *other) const throw(INTERP_KERNEL::Exception)
-{
-  const ValueDouble *valC=checkSameType(other);
-  return new ValueDouble(_data+valC->_data);
-}
-
-Value *ValueDouble::minus(const Value *other) const throw(INTERP_KERNEL::Exception)
-{
-  const ValueDouble *valC=checkSameType(other);
-  return new ValueDouble(_data-valC->_data);
-}
-
-Value *ValueDouble::mult(const Value *other) const throw(INTERP_KERNEL::Exception)
-{
-  const ValueDouble *valC=checkSameType(other);
-  return new ValueDouble(_data*valC->_data);
-}
-
-Value *ValueDouble::div(const Value *other) const throw(INTERP_KERNEL::Exception)
-{
-  const ValueDouble *valC=checkSameType(other);
-  return new ValueDouble(_data/valC->_data);
-}
-
-Value *ValueDouble::pow(const Value *other) const throw(INTERP_KERNEL::Exception)
-{
-  const ValueDouble *valC=checkSameType(other);
-  return new ValueDouble(std::pow(_data,valC->_data));
-}
-
-Value *ValueDouble::max(const Value *other) const throw(INTERP_KERNEL::Exception)
-{
-  const ValueDouble *valC=checkSameType(other);
-  return new ValueDouble(std::max(_data,valC->_data));
-}
-
-Value *ValueDouble::min(const Value *other) const throw(INTERP_KERNEL::Exception)
-{
-  const ValueDouble *valC=checkSameType(other);
-  return new ValueDouble(std::min(_data,valC->_data));
-}
-
-const ValueDouble *ValueDouble::checkSameType(const Value *val) throw(INTERP_KERNEL::Exception)
-{
-  const ValueDouble *valC=dynamic_cast<const ValueDouble *>(val);
-  if(!valC)
-    throw INTERP_KERNEL::Exception("Trying to operate on non homogeneous Values (double with other type) !");
-  return valC;
-}
-
-ValueUnit::ValueUnit()
-{
-}
-
-Value *ValueUnit::newInstance() const
-{
-  return new ValueUnit;
-}
-
-ValueUnit::ValueUnit(const DecompositionInUnitBase& unit):_data(unit)
-{
-}
-
-void ValueUnit::setDouble(double val) throw(INTERP_KERNEL::Exception)
-{
-  _data.tryToConvertInUnit(val);
-}
-
-void ValueUnit::setVarname(int fastPos, const std::string& var) throw(INTERP_KERNEL::Exception)
-{
-  double add,mult;
-  const short *projInBase=UnitDataBase::_uniqueMapForExpr.getInfoForUnit(var,add,mult);
-  _data.setInfo(projInBase,add,mult);
-}
-
-void ValueUnit::positive() throw(INTERP_KERNEL::Exception)
-{
-  unsupportedOp(PositiveFunction::REPR);
-}
-
-void ValueUnit::negate() throw(INTERP_KERNEL::Exception)
-{
-  _data.negate();
-}
-
-void ValueUnit::sqrt() throw(INTERP_KERNEL::Exception)
-{
-  unsupportedOp(SqrtFunction::REPR);
-}
-
-void ValueUnit::cos() throw(INTERP_KERNEL::Exception)
-{
-  unsupportedOp(CosFunction::REPR);
-}
-
-void ValueUnit::sin() throw(INTERP_KERNEL::Exception)
-{
-  unsupportedOp(SinFunction::REPR);
-}
-
-void ValueUnit::tan() throw(INTERP_KERNEL::Exception)
-{
-  unsupportedOp(TanFunction::REPR);
-}
-
-void ValueUnit::abs() throw(INTERP_KERNEL::Exception)
-{
-  unsupportedOp(AbsFunction::REPR);
-}
-
-void ValueUnit::exp() throw(INTERP_KERNEL::Exception)
-{
-  unsupportedOp(ExpFunction::REPR);
-}
-
-void ValueUnit::ln() throw(INTERP_KERNEL::Exception)
-{
-  unsupportedOp(LnFunction::REPR);
-}
-
-Value *ValueUnit::plus(const Value *other) const throw(INTERP_KERNEL::Exception)
-{
-  unsupportedOp(PlusFunction::REPR);
-  return 0;
-}
-
-Value *ValueUnit::minus(const Value *other) const throw(INTERP_KERNEL::Exception)
-{
-  unsupportedOp(MinusFunction::REPR);
-  return 0;
-}
-
-Value *ValueUnit::mult(const Value *other) const throw(INTERP_KERNEL::Exception)
-{
-  const ValueUnit *valC=checkSameType(other);
-  DecompositionInUnitBase tmp=_data;
-  tmp*valC->getData();
-  return new ValueUnit(tmp);
-}
-
-Value *ValueUnit::div(const Value *other) const throw(INTERP_KERNEL::Exception)
-{
-  const ValueUnit *valC=checkSameType(other);
-  DecompositionInUnitBase tmp=_data;
-  tmp/valC->getData();
-  return new ValueUnit(tmp);
-}
-
-Value *ValueUnit::pow(const Value *other) const throw(INTERP_KERNEL::Exception)
-{
-  const ValueUnit *valC=checkSameType(other);
-  DecompositionInUnitBase tmp=_data;
-  tmp^valC->getData();
-  return new ValueUnit(tmp);
-}
-
-Value *ValueUnit::max(const Value *other) const throw(INTERP_KERNEL::Exception)
-{
-  unsupportedOp(MaxFunction::REPR);
-  return 0;
-}
-
-Value *ValueUnit::min(const Value *other) const throw(INTERP_KERNEL::Exception)
-{
-  unsupportedOp(MinFunction::REPR);
-  return 0;
-}
-
-const ValueUnit *ValueUnit::checkSameType(const Value *val) throw(INTERP_KERNEL::Exception)
-{
-  const ValueUnit *valC=dynamic_cast<const ValueUnit *>(val);
-  if(!valC)
-    throw INTERP_KERNEL::Exception("Trying to operate on non homogeneous Values (Units with other type) !");
-  return valC;
-}
-
-void ValueUnit::unsupportedOp(const char *type) throw(INTERP_KERNEL::Exception)
-{
-  const char msg[]="Unsupported operation for units :";
-  std::string msgStr(msg);
-  msgStr+=type;
-  throw INTERP_KERNEL::Exception(msgStr.c_str());
-}
-
-ValueDoubleExpr::ValueDoubleExpr(int szDestData, const double *srcData):_sz_dest_data(szDestData),_dest_data(new double[_sz_dest_data]),_src_data(srcData)
-{
-}
-
-ValueDoubleExpr::~ValueDoubleExpr()
-{
-  delete [] _dest_data;
-}
-
-Value *ValueDoubleExpr::newInstance() const
-{
-  return new ValueDoubleExpr(_sz_dest_data,_src_data);
-}
-
-void ValueDoubleExpr::setDouble(double val) throw(INTERP_KERNEL::Exception)
-{
-  std::fill(_dest_data,_dest_data+_sz_dest_data,val);
-}
-
-void ValueDoubleExpr::setVarname(int fastPos, const std::string& var) throw(INTERP_KERNEL::Exception)
-{
-  if(fastPos==-2)
-    std::copy(_src_data,_src_data+_sz_dest_data,_dest_data);
-  else if(fastPos>-2)
-    std::fill(_dest_data,_dest_data+_sz_dest_data,_src_data[fastPos]);
-  else
-    {
-      std::fill(_dest_data,_dest_data+_sz_dest_data,0.);
-      _dest_data[-7-fastPos]=1.;
-    }
-}
-
-void ValueDoubleExpr::positive() throw(INTERP_KERNEL::Exception)
-{
-}
-
-void ValueDoubleExpr::negate() throw(INTERP_KERNEL::Exception)
-{
-  std::transform(_dest_data,_dest_data+_sz_dest_data,_dest_data,std::negate<double>());
-}
-
-void ValueDoubleExpr::sqrt() throw(INTERP_KERNEL::Exception)
-{
-  double *it=std::find_if(_dest_data,_dest_data+_sz_dest_data,std::bind2nd(std::less<double>(),0.));
-  if(it!=_dest_data+_sz_dest_data)
-    throw INTERP_KERNEL::Exception("Trying to apply sqrt on < 0. value !");
-  std::transform(_dest_data,_dest_data+_sz_dest_data,_dest_data,std::ptr_fun<double,double>(std::sqrt));
-}
-
-void ValueDoubleExpr::cos() throw(INTERP_KERNEL::Exception)
-{
-  std::transform(_dest_data,_dest_data+_sz_dest_data,_dest_data,std::ptr_fun<double,double>(std::cos));
-}
-
-void ValueDoubleExpr::sin() throw(INTERP_KERNEL::Exception)
-{
-  std::transform(_dest_data,_dest_data+_sz_dest_data,_dest_data,std::ptr_fun<double,double>(std::sin));
-}
-
-void ValueDoubleExpr::tan() throw(INTERP_KERNEL::Exception)
-{
-  std::transform(_dest_data,_dest_data+_sz_dest_data,_dest_data,std::ptr_fun<double,double>(std::tan));
-}
-
-void ValueDoubleExpr::abs() throw(INTERP_KERNEL::Exception)
-{
-  std::transform(_dest_data,_dest_data+_sz_dest_data,_dest_data,std::ptr_fun<double,double>(fabs));
-}
-
-void ValueDoubleExpr::exp() throw(INTERP_KERNEL::Exception)
-{
-  std::transform(_dest_data,_dest_data+_sz_dest_data,_dest_data,std::ptr_fun<double,double>(std::exp));
-}
-
-void ValueDoubleExpr::ln() throw(INTERP_KERNEL::Exception)
-{
-  double *it=std::find_if(_dest_data,_dest_data+_sz_dest_data,std::bind2nd(std::less_equal<double>(),0.));
-  if(it!=_dest_data+_sz_dest_data)
-    throw INTERP_KERNEL::Exception("Trying to apply sqrt on < 0. value !");
-  std::transform(_dest_data,_dest_data+_sz_dest_data,_dest_data,std::ptr_fun<double,double>(std::log));
-}
-
-Value *ValueDoubleExpr::plus(const Value *other) const throw(INTERP_KERNEL::Exception)
-{
-  const ValueDoubleExpr *otherC=static_cast<const ValueDoubleExpr *>(other);
-  ValueDoubleExpr *ret=new ValueDoubleExpr(_sz_dest_data,_src_data);
-  std::transform(_dest_data,_dest_data+_sz_dest_data,otherC->getData(),ret->getData(),std::plus<double>());
-  return ret;
-}
-
-Value *ValueDoubleExpr::minus(const Value *other) const throw(INTERP_KERNEL::Exception)
-{
-  const ValueDoubleExpr *otherC=static_cast<const ValueDoubleExpr *>(other);
-  ValueDoubleExpr *ret=new ValueDoubleExpr(_sz_dest_data,_src_data);
-  std::transform(_dest_data,_dest_data+_sz_dest_data,otherC->getData(),ret->getData(),std::minus<double>());
-  return ret;
-}
-
-Value *ValueDoubleExpr::mult(const Value *other) const throw(INTERP_KERNEL::Exception)
-{
-  const ValueDoubleExpr *otherC=static_cast<const ValueDoubleExpr *>(other);
-  ValueDoubleExpr *ret=new ValueDoubleExpr(_sz_dest_data,_src_data);
-  std::transform(_dest_data,_dest_data+_sz_dest_data,otherC->getData(),ret->getData(),std::multiplies<double>());
-  return ret;
-}
-
-Value *ValueDoubleExpr::div(const Value *other) const throw(INTERP_KERNEL::Exception)
-{
-  const ValueDoubleExpr *otherC=static_cast<const ValueDoubleExpr *>(other);
-  double *it=std::find(otherC->getData(),otherC->getData()+_sz_dest_data,0.);
-  if(it!=otherC->getData()+_sz_dest_data)
-    throw INTERP_KERNEL::Exception("Trying to operate division by 0. !");
-  ValueDoubleExpr *ret=new ValueDoubleExpr(_sz_dest_data,_src_data);
-  std::transform(_dest_data,_dest_data+_sz_dest_data,otherC->getData(),ret->getData(),std::divides<double>());
-  return ret;
-}
-
-Value *ValueDoubleExpr::pow(const Value *other) const throw(INTERP_KERNEL::Exception)
-{
-  const ValueDoubleExpr *otherC=static_cast<const ValueDoubleExpr *>(other);
-  double p=otherC->getData()[0];
-  double *it=std::find_if(_dest_data,_dest_data+_sz_dest_data,std::bind2nd(std::less<double>(),0.));
-  if(it!=_dest_data+_sz_dest_data)
-    throw INTERP_KERNEL::Exception("Trying to operate pow(a,b) with a<0. !");
-  ValueDoubleExpr *ret=new ValueDoubleExpr(_sz_dest_data,_src_data);
-  std::transform(_dest_data,_dest_data+_sz_dest_data,ret->getData(),std::bind2nd(std::ptr_fun<double,double,double>(std::pow),p));
-  return ret;
-}
-
-Value *ValueDoubleExpr::max(const Value *other) const throw(INTERP_KERNEL::Exception)
-{
-  const ValueDoubleExpr *otherC=static_cast<const ValueDoubleExpr *>(other);
-  ValueDoubleExpr *ret=new ValueDoubleExpr(_sz_dest_data,_src_data);
-  std::transform(_dest_data,_dest_data+_sz_dest_data,otherC->getData(),ret->getData(),std::ptr_fun<const double&, const double&, const double& >(std::max));
-  return ret;
-}
-
-Value *ValueDoubleExpr::min(const Value *other) const throw(INTERP_KERNEL::Exception)
-{
-  const ValueDoubleExpr *otherC=static_cast<const ValueDoubleExpr *>(other);
-  ValueDoubleExpr *ret=new ValueDoubleExpr(_sz_dest_data,_src_data);
-  std::transform(_dest_data,_dest_data+_sz_dest_data,otherC->getData(),ret->getData(),std::ptr_fun<const double&, const double&, const double& >(std::min));
-  return ret;
-}
diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelValue.hxx b/src/INTERP_KERNEL/ExprEval/InterpKernelValue.hxx
deleted file mode 100644
index 95ac2e66b..000000000
--- a/src/INTERP_KERNEL/ExprEval/InterpKernelValue.hxx
+++ /dev/null
@@ -1,157 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __INTERPKERNELVALUE_HXX__
-#define __INTERPKERNELVALUE_HXX__
-
-#include "INTERPKERNELEXPREVALDefines.hxx"
-#include "InterpKernelException.hxx"
-#include "InterpKernelUnit.hxx"
-
-namespace INTERP_KERNEL
-{
-  class INTERPKERNELEXPREVAL_EXPORT Value
-  {
-  public:
-    virtual Value *newInstance() const = 0;
-    virtual ~Value() { }
-    virtual void setDouble(double val) throw(INTERP_KERNEL::Exception) = 0;
-    virtual void setVarname(int fastPos, const std::string& var) throw(INTERP_KERNEL::Exception) = 0;
-    //unary
-    virtual void positive() throw(INTERP_KERNEL::Exception) = 0;
-    virtual void negate() throw(INTERP_KERNEL::Exception) = 0;
-    virtual void sqrt() throw(INTERP_KERNEL::Exception) = 0;
-    virtual void cos() throw(INTERP_KERNEL::Exception) = 0;
-    virtual void sin() throw(INTERP_KERNEL::Exception) = 0;
-    virtual void tan() throw(INTERP_KERNEL::Exception) = 0;
-    virtual void abs() throw(INTERP_KERNEL::Exception) = 0;
-    virtual void exp() throw(INTERP_KERNEL::Exception) = 0;
-    virtual void ln() throw(INTERP_KERNEL::Exception) = 0;
-    //binary
-    virtual Value *plus(const Value *other) const throw(INTERP_KERNEL::Exception) = 0;
-    virtual Value *minus(const Value *other) const throw(INTERP_KERNEL::Exception) = 0;
-    virtual Value *mult(const Value *other) const throw(INTERP_KERNEL::Exception) = 0;
-    virtual Value *div(const Value *other) const throw(INTERP_KERNEL::Exception) = 0;
-    virtual Value *pow(const Value *other) const throw(INTERP_KERNEL::Exception) = 0;
-    virtual Value *max(const Value *other) const throw(INTERP_KERNEL::Exception) = 0;
-    virtual Value *min(const Value *other) const throw(INTERP_KERNEL::Exception) = 0;
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT ValueDouble : public Value
-  {
-  public:
-    ValueDouble();
-    Value *newInstance() const;
-    void setDouble(double val) throw(INTERP_KERNEL::Exception);
-    void setVarname(int fastPos, const std::string& var) throw(INTERP_KERNEL::Exception);
-    //
-    double getData() const { return _data; }
-    void positive() throw(INTERP_KERNEL::Exception);
-    void negate() throw(INTERP_KERNEL::Exception);
-    void sqrt() throw(INTERP_KERNEL::Exception);
-    void cos() throw(INTERP_KERNEL::Exception);
-    void sin() throw(INTERP_KERNEL::Exception);
-    void tan() throw(INTERP_KERNEL::Exception);
-    void abs() throw(INTERP_KERNEL::Exception);
-    void exp() throw(INTERP_KERNEL::Exception);
-    void ln() throw(INTERP_KERNEL::Exception);
-    //
-    Value *plus(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *minus(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *mult(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *div(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *pow(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *max(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *min(const Value *other) const throw(INTERP_KERNEL::Exception);
-  private:
-    ValueDouble(double val);
-    static const ValueDouble *checkSameType(const Value *val) throw(INTERP_KERNEL::Exception);
-  private:
-    double _data;
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT ValueUnit : public Value
-  {
-  public:
-    ValueUnit();
-    Value *newInstance() const;
-    void setDouble(double val) throw(INTERP_KERNEL::Exception);
-    void setVarname(int fastPos, const std::string& var) throw(INTERP_KERNEL::Exception);
-    //
-    DecompositionInUnitBase getData() const { return _data; }
-    void positive() throw(INTERP_KERNEL::Exception);
-    void negate() throw(INTERP_KERNEL::Exception);
-    void sqrt() throw(INTERP_KERNEL::Exception);
-    void cos() throw(INTERP_KERNEL::Exception);
-    void sin() throw(INTERP_KERNEL::Exception);
-    void tan() throw(INTERP_KERNEL::Exception);
-    void abs() throw(INTERP_KERNEL::Exception);
-    void exp() throw(INTERP_KERNEL::Exception);
-    void ln() throw(INTERP_KERNEL::Exception);
-    //
-    Value *plus(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *minus(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *mult(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *div(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *pow(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *max(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *min(const Value *other) const throw(INTERP_KERNEL::Exception);
-  private:
-    ValueUnit(const DecompositionInUnitBase& unit);
-    static void unsupportedOp(const char *type) throw(INTERP_KERNEL::Exception);
-    static const ValueUnit *checkSameType(const Value *val) throw(INTERP_KERNEL::Exception);
-  private:
-    DecompositionInUnitBase _data;
-  };
-
-  class INTERPKERNELEXPREVAL_EXPORT ValueDoubleExpr : public Value
-  {
-  public:
-    ValueDoubleExpr(int szDestData, const double *srcData);
-    ~ValueDoubleExpr();
-    double *getData() const { return _dest_data; }
-    Value *newInstance() const;
-    void setDouble(double val) throw(INTERP_KERNEL::Exception);
-    void setVarname(int fastPos, const std::string& var) throw(INTERP_KERNEL::Exception);
-    //
-    void positive() throw(INTERP_KERNEL::Exception);
-    void negate() throw(INTERP_KERNEL::Exception);
-    void sqrt() throw(INTERP_KERNEL::Exception);
-    void cos() throw(INTERP_KERNEL::Exception);
-    void sin() throw(INTERP_KERNEL::Exception);
-    void tan() throw(INTERP_KERNEL::Exception);
-    void abs() throw(INTERP_KERNEL::Exception);
-    void exp() throw(INTERP_KERNEL::Exception);
-    void ln() throw(INTERP_KERNEL::Exception);
-    //
-    Value *plus(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *minus(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *mult(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *div(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *pow(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *max(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *min(const Value *other) const throw(INTERP_KERNEL::Exception);
-  private:
-    int _sz_dest_data;
-    double *_dest_data;
-    const double *_src_data;
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/ExprEval/Makefile.am b/src/INTERP_KERNEL/ExprEval/Makefile.am
deleted file mode 100644
index 4a67afba5..000000000
--- a/src/INTERP_KERNEL/ExprEval/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-#  Copyright (C) 2007-2010  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
-#
-
-#  File   : Makefile.am
-#  Author : Anthony GEAY (CEA/DEN/DANS/DM2S/SFME/LGLS)
-#  Module : MED
-#
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-noinst_LTLIBRARIES = libinterpkernelexpreval.la
-
-salomeinclude_HEADERS = 		\
-INTERPKERNELEXPREVALDefines.hxx         \
-InterpKernelExprParser.hxx              \
-InterpKernelFunction.hxx                \
-InterpKernelUnit.hxx                    \
-InterpKernelValue.hxx
-
-
-EXTRA_DIST +=		        	\
-INTERPKERNELEXPREVALDefines.hxx         \
-InterpKernelExprParser.hxx              \
-InterpKernelFunction.hxx                \
-InterpKernelUnit.hxx                    \
-InterpKernelValue.hxx
-
-dist_libinterpkernelexpreval_la_SOURCES = \
-	InterpKernelExprParser.cxx        \
-	InterpKernelFunction.cxx          \
-	InterpKernelUnit.cxx              \
-	InterpKernelValue.cxx
-
-libinterpkernelexpreval_la_CPPFLAGS=-I$(srcdir)/../Bases
-
-libinterpkernelexpreval_la_LDFLAGS=
-
-AM_CPPFLAGS += $(libinterpkernelexpreval_la_CPPFLAGS)
-
-LDADD= $(libinterpkernelexpreval_la_LDFLAGS)
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DAbstractEdge.cxx b/src/INTERP_KERNEL/Geometric2D/AbstractEdge.cxx
similarity index 94%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DAbstractEdge.cxx
rename to src/INTERP_KERNEL/Geometric2D/AbstractEdge.cxx
index c92bf3014..1085fd171 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DAbstractEdge.cxx
+++ b/src/INTERP_KERNEL/Geometric2D/AbstractEdge.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,10 +16,9 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-#include "InterpKernelGeo2DAbstractEdge.hxx"
-#include "InterpKernelGeo2DComposedEdge.hxx"
-#include "InterpKernelGeo2DElementaryEdge.hxx"
+#include "AbstractEdge.hxx"
+#include "ComposedEdge.hxx"
+#include "ElementaryEdge.hxx"
 
 using namespace INTERP_KERNEL;
 
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DAbstractEdge.hxx b/src/INTERP_KERNEL/Geometric2D/AbstractEdge.hxx
similarity index 88%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DAbstractEdge.hxx
rename to src/INTERP_KERNEL/Geometric2D/AbstractEdge.hxx
index 34f0518b9..3fa757243 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DAbstractEdge.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/AbstractEdge.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,11 +16,8 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-#ifndef __INTERPKERNELGEO2DABSTRACTEDGE_HXX__
-#define __INTERPKERNELGEO2DABSTRACTEDGE_HXX__
-
-#include "INTERPKERNELGEOMETRIC2DDefines.hxx"
+#ifndef __ABSTRACTEDGE_HXX__
+#define __ABSTRACTEDGE_HXX__
 
 #include <set>
 #include <list>
@@ -38,7 +35,7 @@ namespace INTERP_KERNEL
   /*!
    * Asumption is done with this iterator that we iterate on a container containing more than one edge.
    */
-  class INTERPKERNELGEOMETRIC2D_EXPORT IteratorOnComposedEdge
+  class IteratorOnComposedEdge
   {
     friend class ComposedEdge;
     friend class ElementaryEdge;
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DBounds.cxx b/src/INTERP_KERNEL/Geometric2D/Bounds.cxx
similarity index 92%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DBounds.cxx
rename to src/INTERP_KERNEL/Geometric2D/Bounds.cxx
index 7b0187162..8e168ea5a 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DBounds.cxx
+++ b/src/INTERP_KERNEL/Geometric2D/Bounds.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,11 +16,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-#include "InterpKernelGeo2DBounds.hxx"
+#include "Bounds.hxx"
 #include "InterpKernelException.hxx"
-#include "InterpKernelGeo2DEdgeArcCircle.hxx"
-#include "InterpKernelGeo2DNode.hxx"
+#include "EdgeArcCircle.hxx"
+#include "Node.hxx"
 
 using namespace INTERP_KERNEL;
 
@@ -169,7 +168,7 @@ Position Bounds::nearlyWhere(double x, double y) const
   bool thinY=Node::areDoubleEquals(_y_min,_y_max);
   if(!thinX)
     {
-      if((Node::areDoubleEquals(x,_x_min) || Node::areDoubleEquals(x,_x_max)) && ((y<_y_max+QUADRATIC_PLANAR::_precision) && (y>_y_min-QUADRATIC_PLANAR::_precision)))
+      if(Node::areDoubleEquals(x,_x_min) || Node::areDoubleEquals(x,_x_max) && (y<_y_max+QUADRATIC_PLANAR::_precision) && (y>_y_min-QUADRATIC_PLANAR::_precision))
         return ON_BOUNDARY_POS;
     }
   else
@@ -177,7 +176,7 @@ Position Bounds::nearlyWhere(double x, double y) const
       return OUT;
   if(!thinY)
     {
-      if((Node::areDoubleEquals(y,_y_min) || Node::areDoubleEquals(y,_y_max)) && ((x<_x_max+QUADRATIC_PLANAR::_precision) && (x>_x_min-QUADRATIC_PLANAR::_precision)))
+      if(Node::areDoubleEquals(y,_y_min) || Node::areDoubleEquals(y,_y_max) && (x<_x_max+QUADRATIC_PLANAR::_precision) && (x>_x_min-QUADRATIC_PLANAR::_precision))
         return ON_BOUNDARY_POS;
     }
   else
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DBounds.hxx b/src/INTERP_KERNEL/Geometric2D/Bounds.hxx
similarity index 94%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DBounds.hxx
rename to src/INTERP_KERNEL/Geometric2D/Bounds.hxx
index 4df244ba9..49d72dc67 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DBounds.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/Bounds.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,13 +16,12 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-#ifndef __INTERPKERNELGEO2DBOUNDS_HXX__
-#define __INTERPKERNELGEO2DBOUNDS_HXX__
+#ifndef __BOUNDS_HXX__
+#define __BOUNDS_HXX__
 
 #include "INTERPKERNELGEOMETRIC2DDefines.hxx"
 
-#include <algorithm>
+#include <numeric>
 
 namespace INTERP_KERNEL
 {
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DComposedEdge.cxx b/src/INTERP_KERNEL/Geometric2D/ComposedEdge.cxx
similarity index 72%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DComposedEdge.cxx
rename to src/INTERP_KERNEL/Geometric2D/ComposedEdge.cxx
index 6e13f3055..9909ada8d 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DComposedEdge.cxx
+++ b/src/INTERP_KERNEL/Geometric2D/ComposedEdge.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,22 +16,21 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-#include "InterpKernelGeo2DComposedEdge.hxx"
-#include "InterpKernelGeo2DElementaryEdge.hxx"
-#include "InterpKernelGeo2DEdgeInfLin.hxx"
+#include "ComposedEdge.hxx"
+#include "ElementaryEdge.hxx"
+#include "EdgeInfLin.hxx"
 #include "InterpKernelException.hxx"
 
 #include <algorithm>
-#include <memory>
 #include <iterator>
 #include <set>
 
+using namespace std;
 using namespace INTERP_KERNEL;
 
 ComposedEdge::ComposedEdge(const ComposedEdge& other)
 {
-  for(std::list<ElementaryEdge *>::const_iterator iter=other._sub_edges.begin();iter!=other._sub_edges.end();iter++)
+  for(list<ElementaryEdge *>::const_iterator iter=other._sub_edges.begin();iter!=other._sub_edges.end();iter++)
     _sub_edges.push_back((*iter)->clone());
 }
 
@@ -42,7 +41,7 @@ ComposedEdge::~ComposedEdge()
 
 void ComposedEdge::setValueAt(int i, Edge *e, bool direction)
 {
-  std::list<ElementaryEdge*>::iterator it=_sub_edges.begin();
+  list<ElementaryEdge*>::iterator it=_sub_edges.begin();
   for(int j=0;j<i;j++)
     it++;
   delete *it;
@@ -60,7 +59,7 @@ struct AbsEdgeCmp
 double ComposedEdge::getCommonLengthWith(const ComposedEdge& other) const
 {
   double ret=0.;
-  for(std::list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
+  for(list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
     {
       if(find_if(other._sub_edges.begin(),other._sub_edges.end(),AbsEdgeCmp(*iter))!=other._sub_edges.end())
         {
@@ -89,13 +88,13 @@ void ComposedEdge::pushBack(ElementaryEdge *elem)
 
 void ComposedEdge::pushBack(ComposedEdge *elem)
 {
-  std::list<ElementaryEdge *> *elemsOfElem=elem->getListBehind();
+  list<ElementaryEdge *> *elemsOfElem=elem->getListBehind();
   _sub_edges.insert(_sub_edges.end(),elemsOfElem->begin(),elemsOfElem->end());
 }
 
 ElementaryEdge *ComposedEdge::operator[](int i) const
 {
-  std::list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();
+  list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();
   for(int ii=0;ii<i;ii++)
     iter++;
   return *iter;
@@ -104,13 +103,13 @@ ElementaryEdge *ComposedEdge::operator[](int i) const
 void ComposedEdge::reverse()
 {
   _sub_edges.reverse();
-  for(std::list<ElementaryEdge *>::iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
+  for(list<ElementaryEdge *>::iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
     (*iter)->reverse();
 }
 
 void ComposedEdge::initLocations() const
 {
-  for(std::list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
+  for(list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
     (*iter)->initLocations();
 }
 
@@ -122,7 +121,7 @@ ComposedEdge *ComposedEdge::clone() const
 bool ComposedEdge::isNodeIn(Node *n) const
 {
   bool ret=false;
-  for(std::list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end() && !ret;iter++)
+  for(list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end() && !ret;iter++)
     ret=(*iter)->isNodeIn(n);
   return ret;
 }
@@ -145,7 +144,7 @@ bool ComposedEdge::isNodeIn(Node *n) const
 double ComposedEdge::getArea() const
 {
   double ret=0.;
-  for(std::list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
+  for(list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
     ret+=(*iter)->getAreaOfZone();
   return ret;
 }
@@ -153,7 +152,7 @@ double ComposedEdge::getArea() const
 double ComposedEdge::getPerimeter() const
 {
   double ret=0.;
-  for(std::list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
+  for(list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
     ret+=(*iter)->getCurveLength();
   return ret;
 }
@@ -187,7 +186,7 @@ void ComposedEdge::getBarycenter(double *bary) const
   bary[0]=0.;
   bary[1]=0.;
   double area=0.;
-  for(std::list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
+  for(list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
     {
       (*iter)->getBarycenterOfZone(bary);
       area+=(*iter)->getAreaOfZone();
@@ -196,26 +195,14 @@ void ComposedEdge::getBarycenter(double *bary) const
   bary[1]/=area;
 }
 
-/*!
- * Idem ComposedEdge::getBarycenter except that the special case where _sub_edges==1 is dealt here.
- */
-void ComposedEdge::getBarycenterGeneral(double *bary) const
-{
-  if(_sub_edges.empty())
-    throw INTERP_KERNEL::Exception("ComposedEdge::getBarycenterGeneral called on an empty polygon !");
-  if(_sub_edges.size()>2)
-    return getBarycenter(bary);
-  double w;
-  _sub_edges.back()->getBarycenter(bary,w);
-}
-
-double ComposedEdge::normalize(ComposedEdge *other, double& xBary, double& yBary)
+double ComposedEdge::normalize(ComposedEdge *other)
 {
   Bounds b;
   b.prepareForAggregation();
   fillBounds(b); 
   other->fillBounds(b);
   double dimChar=b.getCaracteristicDim();
+  double xBary,yBary;
   b.getBarycenter(xBary,yBary);
   applyGlobalSimilarity(xBary,yBary,dimChar);
   other->applyGlobalSimilarity(xBary,yBary,dimChar);
@@ -225,7 +212,7 @@ double ComposedEdge::normalize(ComposedEdge *other, double& xBary, double& yBary
 void ComposedEdge::dumpInXfigFile(std::ostream& stream, int resolution, const Bounds& box) const
 {
   stream.precision(10);
-  for(std::list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
+  for(list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
     (*iter)->dumpInXfigFile(stream,resolution,box);
 }
 
@@ -251,7 +238,7 @@ bool ComposedEdge::changeStartNodeWith(Node *node) const
 
 void ComposedEdge::fillBounds(Bounds& output) const
 {
-  for(std::list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
+  for(list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
     (*iter)->fillBounds(output);
 }
 
@@ -260,7 +247,7 @@ void ComposedEdge::fillBounds(Bounds& output) const
  */
 void ComposedEdge::applySimilarity(double xBary, double yBary, double dimChar)
 {
-  for(std::list<ElementaryEdge *>::iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
+  for(list<ElementaryEdge *>::iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
     (*iter)->applySimilarity(xBary,yBary,dimChar);
 }
 
@@ -269,11 +256,11 @@ void ComposedEdge::applySimilarity(double xBary, double yBary, double dimChar)
  */
 void ComposedEdge::applyGlobalSimilarity(double xBary, double yBary, double dimChar)
 {
-  std::set<Node *> allNodes;
+  set<Node *> allNodes;
   getAllNodes(allNodes);
-  for(std::set<Node *>::iterator iter=allNodes.begin();iter!=allNodes.end();iter++)
+  for(set<Node *>::iterator iter=allNodes.begin();iter!=allNodes.end();iter++)
     (*iter)->applySimilarity(xBary,yBary,dimChar);
-  for(std::list<ElementaryEdge *>::iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
+  for(list<ElementaryEdge *>::iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
     (*iter)->applySimilarity(xBary,yBary,dimChar);
 }
 
@@ -283,7 +270,7 @@ void ComposedEdge::applyGlobalSimilarity(double xBary, double yBary, double dimC
  */
 void ComposedEdge::dispatchPerimeter(double& partConsidered) const
 {
-  for(std::list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
+  for(list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
     {
       TypeOfEdgeLocInPolygon loc=(*iter)->getLoc();
       if(loc==FULL_IN_1 || loc==FULL_ON_1)
@@ -296,7 +283,7 @@ void ComposedEdge::dispatchPerimeter(double& partConsidered) const
  */
 void ComposedEdge::dispatchPerimeterExcl(double& partConsidered, double& commonPart) const
 {
-  for(std::list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
+  for(list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
     {
       TypeOfEdgeLocInPolygon loc=(*iter)->getLoc();
       if(loc==FULL_IN_1)
@@ -308,7 +295,7 @@ void ComposedEdge::dispatchPerimeterExcl(double& partConsidered, double& commonP
 
 void ComposedEdge::getAllNodes(std::set<Node *>& output) const
 {
-  std::list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();
+  list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();
   for(;iter!=_sub_edges.end();iter++)
     (*iter)->getAllNodes(output);
 }
@@ -317,7 +304,7 @@ void ComposedEdge::getBarycenter(double *bary, double& weigh) const
 {
   weigh=0.; bary[0]=0.; bary[1]=0.;
   double tmp1,tmp2[2];
-  for(std::list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
+  for(list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
     {
       (*iter)->getBarycenter(tmp2,tmp1);
       weigh+=tmp1;
@@ -335,32 +322,32 @@ bool ComposedEdge::isInOrOut(Node *nodeToTest) const
   if(b.nearlyWhere((*nodeToTest)[0],(*nodeToTest)[1])==OUT)
     return false;
   // searching for e1
-  std::set<Node *> nodes;
+  set<Node *> nodes;
   getAllNodes(nodes);
-  std::set<double> radialDistributionOfNodes;
-  std::set<Node *>::const_iterator iter;
+  set<double> radialDistributionOfNodes;
+  set<Node *>::const_iterator iter;
   for(iter=nodes.begin();iter!=nodes.end();iter++)
     radialDistributionOfNodes.insert(nodeToTest->getSlope(*(*iter)));
-  std::vector<double> radialDistrib(radialDistributionOfNodes.begin(),radialDistributionOfNodes.end());
+  vector<double> radialDistrib(radialDistributionOfNodes.begin(),radialDistributionOfNodes.end());
   radialDistributionOfNodes.clear();
-  std::vector<double> radialDistrib2(radialDistrib.size());
+  vector<double> radialDistrib2(radialDistrib.size());
   copy(radialDistrib.begin()+1,radialDistrib.end(),radialDistrib2.begin());
   radialDistrib2.back()=M_PI+radialDistrib.front();
-  std::vector<double> radialDistrib3(radialDistrib.size());
-  std::transform(radialDistrib2.begin(),radialDistrib2.end(),radialDistrib.begin(),radialDistrib3.begin(),std::minus<double>());
-  std::vector<double>::iterator iter3=max_element(radialDistrib3.begin(),radialDistrib3.end());
+  vector<double> radialDistrib3(radialDistrib.size());
+  transform(radialDistrib2.begin(),radialDistrib2.end(),radialDistrib.begin(),radialDistrib3.begin(),minus<double>());
+  vector<double>::iterator iter3=max_element(radialDistrib3.begin(),radialDistrib3.end());
   int i=iter3-radialDistrib3.begin();
   // ok for e1 - Let's go.
   EdgeInfLin *e1=new EdgeInfLin(nodeToTest,radialDistrib[i]+radialDistrib3[i]/2.);
   double ref=e1->getCharactValue(*nodeToTest);
-  std::set< IntersectElement > inOutSwitch;
-  for(std::list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
+  set< IntersectElement > inOutSwitch;
+  for(list<ElementaryEdge *>::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++)
     {
       ElementaryEdge *val=(*iter);
       if(val)
         {
           Edge *e=val->getPtr();
-          std::auto_ptr<EdgeIntersector> intersc(Edge::buildIntersectorWith(e1,e));
+          auto_ptr<EdgeIntersector> intersc(Edge::buildIntersectorWith(e1,e));
           bool obviousNoIntersection,areOverlapped;
           intersc->areOverlappedOrOnlyColinears(0,obviousNoIntersection,areOverlapped);
           if(obviousNoIntersection)
@@ -369,8 +356,8 @@ bool ComposedEdge::isInOrOut(Node *nodeToTest) const
             }
           if(!areOverlapped)
             {
-              std::list< IntersectElement > listOfIntesc=intersc->getIntersectionsCharacteristicVal();
-              for(std::list< IntersectElement >::iterator iter2=listOfIntesc.begin();iter2!=listOfIntesc.end();iter2++)
+              list< IntersectElement > listOfIntesc=intersc->getIntersectionsCharacteristicVal();
+              for(list< IntersectElement >::iterator iter2=listOfIntesc.begin();iter2!=listOfIntesc.end();iter2++)
                 if((*iter2).isIncludedByBoth())
                   inOutSwitch.insert(*iter2);
               }
@@ -381,7 +368,7 @@ bool ComposedEdge::isInOrOut(Node *nodeToTest) const
     }
   e1->decrRef();
   bool ret=false;
-  for(std::set< IntersectElement >::iterator iter=inOutSwitch.begin();iter!=inOutSwitch.end();iter++)
+  for(set< IntersectElement >::iterator iter=inOutSwitch.begin();iter!=inOutSwitch.end();iter++)
     {
       if((*iter).getVal1()<ref)
         {
@@ -452,8 +439,8 @@ bool ComposedEdge::intresincEqCoarse(const Edge *other) const
   return _sub_edges.front()->intresincEqCoarse(other);
 }
 
-void ComposedEdge::clearAll(std::list<ElementaryEdge *>::iterator startToDel)
+void ComposedEdge::clearAll(list<ElementaryEdge *>::iterator startToDel)
 {
-  for(std::list<ElementaryEdge *>::iterator iter=startToDel;iter!=_sub_edges.end();iter++)
+  for(list<ElementaryEdge *>::iterator iter=startToDel;iter!=_sub_edges.end();iter++)
     delete (*iter);
 }
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DComposedEdge.hxx b/src/INTERP_KERNEL/Geometric2D/ComposedEdge.hxx
similarity index 92%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DComposedEdge.hxx
rename to src/INTERP_KERNEL/Geometric2D/ComposedEdge.hxx
index 772585e84..583e4af08 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DComposedEdge.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/ComposedEdge.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,16 +16,14 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-#ifndef __INTERPKERNELGEO2DCOMPOSEDNODE_HXX__
-#define __INTERPKERNELGEO2DCOMPOSEDNODE_HXX__
+#ifndef __COMPOSEDNODE_HXX__
+#define __COMPOSEDNODE_HXX__
 
 #include "INTERPKERNELGEOMETRIC2DDefines.hxx"
 
 #include <set>
 #include <list>
 #include <vector>
-#include <ostream>
 
 namespace INTERP_KERNEL
 {
@@ -53,8 +51,7 @@ namespace INTERP_KERNEL
     double getPerimeter() const;
     double getHydraulicDiameter() const;
     void getBarycenter(double *bary) const;
-    void getBarycenterGeneral(double *bary) const;
-    double normalize(ComposedEdge *other, double& xBary, double& yBary);
+    double normalize(ComposedEdge *other);
     void fillBounds(Bounds& output) const;
     void applySimilarity(double xBary, double yBary, double dimChar);
     void applyGlobalSimilarity(double xBary, double yBary, double dimChar);
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.cxx b/src/INTERP_KERNEL/Geometric2D/Edge.cxx
similarity index 95%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.cxx
rename to src/INTERP_KERNEL/Geometric2D/Edge.cxx
index 16c5fdd93..334b4d886 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.cxx
+++ b/src/INTERP_KERNEL/Geometric2D/Edge.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,16 +16,16 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-#include "InterpKernelGeo2DEdge.hxx"
-#include "InterpKernelGeo2DEdgeLin.hxx"
-#include "InterpKernelGeo2DEdgeInfLin.hxx"
+#include "Edge.hxx"
+#include "EdgeLin.hxx"
+#include "EdgeInfLin.hxx"
 //#include "EdgeParabol.hxx"
-#include "InterpKernelGeo2DEdgeArcCircle.hxx"
+#include "EdgeArcCircle.hxx"
 #include "InterpKernelException.hxx"
 
 #include <algorithm>
 
+using namespace std;
 using namespace INTERP_KERNEL;
 
 MergePoints::MergePoints():_ass1Start1(0),_ass1End1(0),_ass1Start2(0),_ass1End2(0),
@@ -303,8 +303,8 @@ bool IntersectElement::isIncludedByBoth() const
   
 bool EdgeIntersector::intersect(const Bounds *whereToFind, std::vector<Node *>& newNodes, bool& order, MergePoints& commonNode)
 {
-  std::list< IntersectElement > listOfIntesc=getIntersectionsCharacteristicVal();
-  std::list< IntersectElement >::iterator iter;
+  list< IntersectElement > listOfIntesc=getIntersectionsCharacteristicVal();
+  list< IntersectElement >::iterator iter;
   for(iter=listOfIntesc.begin();iter!=listOfIntesc.end();)
     {
       if((*iter).isOnMergedExtremity())
@@ -342,10 +342,10 @@ bool EdgeIntersector::intersect(const Bounds *whereToFind, std::vector<Node *>&
     }
   else
     {
-      std::vector<IntersectElement> vecOfIntesc(listOfIntesc.begin(),listOfIntesc.end());
+      vector<IntersectElement> vecOfIntesc(listOfIntesc.begin(),listOfIntesc.end());
       listOfIntesc.clear();
       sort(vecOfIntesc.begin(),vecOfIntesc.end());
-      for(std::vector<IntersectElement>::iterator iterV=vecOfIntesc.begin();iterV!=vecOfIntesc.end();iterV++)
+      for(vector<IntersectElement>::iterator iterV=vecOfIntesc.begin();iterV!=vecOfIntesc.end();iterV++)
         newNodes.push_back((*iterV).getNodeAndReleaseIt());
       order=vecOfIntesc.front().isLowerOnOther(vecOfIntesc.back());
     }
@@ -532,10 +532,10 @@ void Edge::addSubEdgeInVector(Node *start, Node *end, ComposedEdge& vec) const
  */
 void Edge::getNormalVector(double *vectOutput) const
 {
-  std::copy((const double *)(*_end),(const double *)(*_end)+2,vectOutput);
-  std::transform(vectOutput,vectOutput+2,(const double *)(*_start),vectOutput,std::minus<double>());
+  copy((const double *)(*_end),(const double *)(*_end)+2,vectOutput);
+  transform(vectOutput,vectOutput+2,(const double *)(*_start),vectOutput,minus<double>());
   double norm=1./Node::norm(vectOutput);
-  std::transform(vectOutput,vectOutput+2,vectOutput,bind2nd(std::multiplies<double>(),norm));
+  transform(vectOutput,vectOutput+2,vectOutput,bind2nd(multiplies<double>(),norm));
   double tmp=vectOutput[0];
   vectOutput[0]=vectOutput[1];
   vectOutput[1]=-tmp;
@@ -607,7 +607,7 @@ void Edge::interpolate1DLin(const std::vector<double>& distrib1, const std::vect
   MergePoints commonNode;
   for(int i=0;i<nbOfV1;i++)
     {
-		std::vector<double>::const_iterator iter=find_if(distrib2.begin()+1,distrib2.end(),bind2nd(std::greater_equal<double>(),distrib1[i]));
+      vector<double>::const_iterator iter=find_if(distrib2.begin()+1,distrib2.end(),bind2nd(greater_equal<double>(),distrib1[i]));
       if(iter!=distrib2.end())
         {
           for(int j=(iter-1)-distrib2.begin();j<nbOfV2;j++)
@@ -681,17 +681,17 @@ bool Edge::intersect(const Edge *f1, const Edge *f2, EdgeIntersector *intersecto
     return intersectOverlapped(f1,f2,intersector,commonNode,outValForF1,outValForF2);
   if(obviousNoIntersection)
     return false;
-  std::vector<Node *> newNodes;
+  vector<Node *> newNodes;
   bool order;
   if(intersector->intersect(whereToFind,newNodes,order,commonNode))
     {
       if(newNodes.empty())
         throw Exception("Internal error occured - error in intersector implementation!");// This case should never happen
-      std::vector<Node *>::iterator iter=newNodes.begin();
-      std::vector<Node *>::reverse_iterator iterR=newNodes.rbegin();
+      vector<Node *>::iterator iter=newNodes.begin();
+      vector<Node *>::reverse_iterator iterR=newNodes.rbegin();
       f1->addSubEdgeInVector(f1->getStartNode(),*iter,outValForF1);
       f2->addSubEdgeInVector(f2->getStartNode(),order?*iter:*iterR,outValForF2);
-      for(std::vector<Node *>::iterator iter=newNodes.begin();iter!=newNodes.end();iter++,iterR++)
+      for(vector<Node *>::iterator iter=newNodes.begin();iter!=newNodes.end();iter++,iterR++)
         {
           if((iter+1)==newNodes.end())
             {
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.hxx b/src/INTERP_KERNEL/Geometric2D/Edge.hxx
similarity index 98%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.hxx
rename to src/INTERP_KERNEL/Geometric2D/Edge.hxx
index a02ca807a..3aff6efce 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/Edge.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,15 +16,14 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-#ifndef __INTERPKERNELGEO2DEDGE_HXX__
-#define __INTERPKERNELGEO2DEDGE_HXX__
+#ifndef __EDGE_HXX__
+#define __EDGE_HXX__
 
 #include "INTERPKERNELGEOMETRIC2DDefines.hxx"
-#include "InterpKernelGeo2DComposedEdge.hxx"
+#include "ComposedEdge.hxx"
 #include "InterpKernelException.hxx"
-#include "InterpKernelGeo2DBounds.hxx"
-#include "InterpKernelGeo2DNode.hxx"
+#include "Bounds.hxx"
+#include "Node.hxx"
 
 #include <iostream>
 #include <vector>
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.txx b/src/INTERP_KERNEL/Geometric2D/Edge.txx
similarity index 85%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.txx
rename to src/INTERP_KERNEL/Geometric2D/Edge.txx
index 68387e094..6a3f80f5b 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.txx
+++ b/src/INTERP_KERNEL/Geometric2D/Edge.txx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,10 +16,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#ifndef __INTERPKERNELGEO2DEDGE_TXX__
-#define __INTERPKERNELGEO2DEDGE_TXX__
+#ifndef __EDGE_TXX__
+#define __EDGE_TXX__
 
-#include "InterpKernelGeo2DEdgeArcCircle.hxx"
+#include "EdgeArcCircle.hxx"
 
 template<INTERP_KERNEL::TypeOfMod4QuadEdge type>
 INTERP_KERNEL::Edge *INTERP_KERNEL::Edge::buildEdgeFrom(Node *start, Node *middle, Node *end)
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeArcCircle.cxx b/src/INTERP_KERNEL/Geometric2D/EdgeArcCircle.cxx
similarity index 99%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeArcCircle.cxx
rename to src/INTERP_KERNEL/Geometric2D/EdgeArcCircle.cxx
index f427aaace..f65ab1510 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeArcCircle.cxx
+++ b/src/INTERP_KERNEL/Geometric2D/EdgeArcCircle.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,15 +16,15 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-#include "InterpKernelGeo2DEdgeArcCircle.hxx"
-#include "InterpKernelGeo2DEdgeLin.hxx"
+#include "EdgeArcCircle.hxx"
+#include "EdgeLin.hxx"
 #include "InterpKernelException.hxx"
-#include "InterpKernelGeo2DNode.hxx"
+#include "Node.hxx"
 
 #include <sstream>
 #include <algorithm>
 
+using namespace std;
 using namespace INTERP_KERNEL;
 
 ArcCArcCIntersector::ArcCArcCIntersector(const EdgeArcCircle& e1, const EdgeArcCircle& e2):SameTypeEdgeIntersector(e1,e2),_dist(0.)
@@ -153,7 +153,7 @@ bool ArcCArcCIntersector::areArcsOverlapped(const EdgeArcCircle& a1, const EdgeA
   a=EdgeArcCircle::normalizeAngle(phi-angle0L+M_PI);
   if(EdgeArcCircle::isIn2Pi(angle0L,angleL,a))
     cmpContainer[sizeOfCmpContainer++]=cst-cst2;
-  a=*std::max_element(cmpContainer,cmpContainer+sizeOfCmpContainer);
+  a=*max_element(cmpContainer,cmpContainer+sizeOfCmpContainer);
   return Node::areDoubleEqualsWP(a,1.,2.);
 }
 
@@ -507,7 +507,7 @@ void EdgeArcCircle::dumpInXfigFile(std::ostream& stream, bool direction, int res
   middle->dumpInXfigFile(stream,resolution,box);
   middle->decrRef();
   direction?_end->dumpInXfigFile(stream,resolution,box):_start->dumpInXfigFile(stream,resolution,box);
-  stream << std::endl;
+  stream << endl;
 }
 
 void EdgeArcCircle::update(Node *m)
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeArcCircle.hxx b/src/INTERP_KERNEL/Geometric2D/EdgeArcCircle.hxx
similarity index 92%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeArcCircle.hxx
rename to src/INTERP_KERNEL/Geometric2D/EdgeArcCircle.hxx
index d3a2fefcd..b3a4a3e20 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeArcCircle.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/EdgeArcCircle.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,16 +16,14 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#ifndef __EDGEARCCIRCLE_HXX__
+#define __EDGEARCCIRCLE_HXX__
 
-#ifndef __INTERPKERNELGEO2DEDGEARCCIRCLE_HXX__
-#define __INTERPKERNELGEO2DEDGEARCCIRCLE_HXX__
-
-#include "INTERPKERNELGEOMETRIC2DDefines.hxx"
-#include "InterpKernelGeo2DEdge.hxx"
+#include "Edge.hxx"
 
 namespace INTERP_KERNEL
 {
-  class INTERPKERNELGEOMETRIC2D_EXPORT ArcCArcCIntersector : public SameTypeEdgeIntersector
+  class ArcCArcCIntersector : public SameTypeEdgeIntersector
   {
   public:
     ArcCArcCIntersector(const EdgeArcCircle& e1, const EdgeArcCircle& e2);
@@ -44,7 +42,7 @@ namespace INTERP_KERNEL
     double _dist;
   };
 
-  class INTERPKERNELGEOMETRIC2D_EXPORT ArcCSegIntersector : public CrossTypeEdgeIntersector
+  class ArcCSegIntersector : public CrossTypeEdgeIntersector
   {
   public:
     ArcCSegIntersector(const EdgeArcCircle& e1, const EdgeLin& e2, bool reverse=true);
@@ -63,7 +61,7 @@ namespace INTERP_KERNEL
     double _determinant;
   };
   
-  class INTERPKERNELGEOMETRIC2D_EXPORT EdgeArcCircle : public Edge
+  class EdgeArcCircle : public Edge
   {
   public:
     EdgeArcCircle(std::istream& lineInXfig);
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeInfLin.cxx b/src/INTERP_KERNEL/Geometric2D/EdgeInfLin.cxx
similarity index 91%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeInfLin.cxx
rename to src/INTERP_KERNEL/Geometric2D/EdgeInfLin.cxx
index 9298af554..2f3fd9da5 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeInfLin.cxx
+++ b/src/INTERP_KERNEL/Geometric2D/EdgeInfLin.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,8 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-#include "InterpKernelGeo2DEdgeInfLin.hxx"
+#include "EdgeInfLin.hxx"
 
 using namespace INTERP_KERNEL;
 
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeInfLin.hxx b/src/INTERP_KERNEL/Geometric2D/EdgeInfLin.hxx
similarity index 88%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeInfLin.hxx
rename to src/INTERP_KERNEL/Geometric2D/EdgeInfLin.hxx
index 157386825..d600b7701 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeInfLin.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/EdgeInfLin.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,11 +16,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#ifndef __EDGEINFLIN_HXX__
+#define __EDGEINFLIN_HXX__
 
-#ifndef __INTERPKERNELGEO2DEDGEINFLIN_HXX__
-#define __INTERPKERNELGEO2DEDGEINFLIN_HXX__
-
-#include "InterpKernelGeo2DEdgeLin.hxx"
+#include "EdgeLin.hxx"
 
 namespace INTERP_KERNEL
 {
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeLin.cxx b/src/INTERP_KERNEL/Geometric2D/EdgeLin.cxx
similarity index 97%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeLin.cxx
rename to src/INTERP_KERNEL/Geometric2D/EdgeLin.cxx
index fa7de64f8..92f051610 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeLin.cxx
+++ b/src/INTERP_KERNEL/Geometric2D/EdgeLin.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,11 +16,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-#include "InterpKernelGeo2DEdgeLin.hxx"
-#include "InterpKernelGeo2DNode.hxx"
+#include "EdgeLin.hxx"
+#include "Node.hxx"
 #include "InterpKernelException.hxx"
 
+using namespace std;
 using namespace INTERP_KERNEL;
 
 namespace INTERP_KERNEL
@@ -209,10 +209,10 @@ void EdgeLin::dumpInXfigFile(std::ostream& stream, bool direction, int resolutio
 {
   stream << "2 1 0 1 ";
   fillXfigStreamForLoc(stream);
-  stream << " 7 50 -1 -1 0.000 0 0 -1 0 0 2" << std::endl;
+  stream << " 7 50 -1 -1 0.000 0 0 -1 0 0 2" << endl;
   direction?_start->dumpInXfigFile(stream,resolution,box):_end->dumpInXfigFile(stream,resolution,box);
   direction?_end->dumpInXfigFile(stream,resolution,box):_start->dumpInXfigFile(stream,resolution,box);
-  stream << std::endl;
+  stream << endl;
 }
 
 void EdgeLin::update(Node *m)
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeLin.hxx b/src/INTERP_KERNEL/Geometric2D/EdgeLin.hxx
similarity index 91%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeLin.hxx
rename to src/INTERP_KERNEL/Geometric2D/EdgeLin.hxx
index 8221eb5ed..0c11ae39b 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeLin.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/EdgeLin.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,12 +16,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#ifndef __EDGELIN_HXX__
+#define __EDGELIN_HXX__
 
-#ifndef __INTERPKERNELGEO2DEDGELIN_HXX__
-#define __INTERPKERNELGEO2DEDGELIN_HXX__
-
-#include "INTERPKERNELGEOMETRIC2DDefines.hxx"
-#include "InterpKernelGeo2DEdge.hxx"
+#include "Edge.hxx"
 
 namespace INTERP_KERNEL
 {
@@ -44,7 +42,7 @@ namespace INTERP_KERNEL
       double _matrix[4];//SPACEDIM*SPACEDIM
     };
 
-  class INTERPKERNELGEOMETRIC2D_EXPORT EdgeLin : public Edge
+  class EdgeLin : public Edge
   {
     friend class SegSegIntersector;
   public:
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DElementaryEdge.cxx b/src/INTERP_KERNEL/Geometric2D/ElementaryEdge.cxx
similarity index 97%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DElementaryEdge.cxx
rename to src/INTERP_KERNEL/Geometric2D/ElementaryEdge.cxx
index eae4a4051..b26422084 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DElementaryEdge.cxx
+++ b/src/INTERP_KERNEL/Geometric2D/ElementaryEdge.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,10 +16,9 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-#include "InterpKernelGeo2DElementaryEdge.hxx"
+#include "ElementaryEdge.hxx"
 #include "InterpKernelException.hxx"
-#include "InterpKernelGeo2DEdge.hxx"
+#include "Edge.hxx"
 
 using namespace INTERP_KERNEL;
 
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DElementaryEdge.hxx b/src/INTERP_KERNEL/Geometric2D/ElementaryEdge.hxx
similarity index 93%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DElementaryEdge.hxx
rename to src/INTERP_KERNEL/Geometric2D/ElementaryEdge.hxx
index 11168621a..19f4e1968 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DElementaryEdge.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/ElementaryEdge.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,14 +16,13 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-#ifndef __INTERPKERNELGEO2DELEMENTARYEDGE_HXX__
-#define __INTERPKERNELGEO2DELEMENTARYEDGE_HXX__
+#ifndef __ELEMENTARYEDGE_HXX__
+#define __ELEMENTARYEDGE_HXX__
 
 #include "INTERPKERNELGEOMETRIC2DDefines.hxx"
 #include "InterpKernelException.hxx"
-#include "InterpKernelGeo2DAbstractEdge.hxx"
-#include "InterpKernelGeo2DEdge.hxx"
+#include "AbstractEdge.hxx"
+#include "Edge.hxx"
 
 namespace INTERP_KERNEL
 {
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.cxx b/src/INTERP_KERNEL/Geometric2D/Node.cxx
similarity index 96%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.cxx
rename to src/INTERP_KERNEL/Geometric2D/Node.cxx
index d95825f74..fb64ded3c 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.cxx
+++ b/src/INTERP_KERNEL/Geometric2D/Node.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,10 +16,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include "Node.hxx"
+#include "EdgeArcCircle.hxx"
 
-#include "InterpKernelGeo2DNode.hxx"
-#include "InterpKernelGeo2DEdgeArcCircle.hxx"
-
+using namespace std;
 using namespace INTERP_KERNEL;
 
 Node::Node(double x, double y):_cnt(1),_loc(UNKNOWN)
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx b/src/INTERP_KERNEL/Geometric2D/Node.hxx
similarity index 95%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx
rename to src/INTERP_KERNEL/Geometric2D/Node.hxx
index e58d62061..46957dac0 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/Node.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,11 +16,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#ifndef __NODE_HXX__
+#define __NODE_HXX__
 
-#ifndef __INTERPKERNELGEO2DNODE_HXX__
-#define __INTERPKERNELGEO2DNODE_HXX__
-
-#include "InterpKernelGeo2DPrecision.hxx"
+#include "Precision.hxx"
 #include "INTERPKERNELGEOMETRIC2DDefines.hxx"
 
 #include <cmath>
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DPrecision.cxx b/src/INTERP_KERNEL/Geometric2D/Precision.cxx
similarity index 93%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DPrecision.cxx
rename to src/INTERP_KERNEL/Geometric2D/Precision.cxx
index cba6e5881..1e4f3510c 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DPrecision.cxx
+++ b/src/INTERP_KERNEL/Geometric2D/Precision.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,8 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-#include "InterpKernelGeo2DPrecision.hxx"
+#include "Precision.hxx"
 
 double INTERP_KERNEL::QUADRATIC_PLANAR::_precision=1e-14;
 
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DPrecision.hxx b/src/INTERP_KERNEL/Geometric2D/Precision.hxx
similarity index 89%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DPrecision.hxx
rename to src/INTERP_KERNEL/Geometric2D/Precision.hxx
index 371a85e22..31fa8f60a 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DPrecision.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/Precision.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,9 +16,8 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-#ifndef __INTERPKERNELGEO2DPRECISION_HXX__
-#define __INTERPKERNELGEO2DPRECISION_HXX__
+#ifndef __PRECISION_HXX__
+#define __PRECISION_HXX__
 
 #include "INTERPKERNELGEOMETRIC2DDefines.hxx"
 
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DQuadraticPolygon.cxx b/src/INTERP_KERNEL/Geometric2D/QuadraticPolygon.cxx
similarity index 77%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DQuadraticPolygon.cxx
rename to src/INTERP_KERNEL/Geometric2D/QuadraticPolygon.cxx
index ef38d42ce..d8faa8a4c 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DQuadraticPolygon.cxx
+++ b/src/INTERP_KERNEL/Geometric2D/QuadraticPolygon.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,20 +16,18 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-#include "InterpKernelGeo2DQuadraticPolygon.hxx"
-#include "InterpKernelGeo2DElementaryEdge.hxx"
-#include "InterpKernelGeo2DEdgeArcCircle.hxx"
-#include "InterpKernelGeo2DAbstractEdge.hxx"
-#include "InterpKernelGeo2DEdgeLin.hxx"
-#include "InterpKernelGeo2DBounds.hxx"
-#include "InterpKernelGeo2DEdge.txx"
+#include "QuadraticPolygon.hxx"
+#include "ElementaryEdge.hxx"
+#include "EdgeArcCircle.hxx"
+#include "AbstractEdge.hxx"
+#include "EdgeLin.hxx"
+#include "Bounds.hxx"
+#include "Edge.txx"
 
 #include <fstream>
 #include <iomanip>
-#include <cstring>
-#include <limits>
 
+using namespace std;
 using namespace INTERP_KERNEL;
 
 namespace INTERP_KERNEL
@@ -40,8 +38,8 @@ namespace INTERP_KERNEL
 QuadraticPolygon::QuadraticPolygon(const char *file)
 {
   char currentLine[MAX_SIZE_OF_LINE_XFIG_FILE];
-  std::ifstream stream(file);
-  stream.exceptions(std::ios_base::eofbit);
+  ifstream stream(file);
+  stream.exceptions(ios_base::eofbit);
   try
     {
       do
@@ -56,7 +54,7 @@ QuadraticPolygon::QuadraticPolygon(const char *file)
         }
       while(1);
     }
-  catch(std::ifstream::failure&)
+  catch(ifstream::failure& e)
     {
     }
   front()->changeStartNodeWith(back()->getEndNode());
@@ -101,16 +99,16 @@ QuadraticPolygon *QuadraticPolygon::buildArcCirclePolygon(std::vector<Node *>& n
 
 void QuadraticPolygon::buildDbgFile(const std::vector<Node *>& nodes, const char *fileName)
 {
-  std::ofstream file(fileName);
-  file << std::setprecision(16);
-  file << "  double coords[]=" << std::endl << "    { ";
-  for(std::vector<Node *>::const_iterator iter=nodes.begin();iter!=nodes.end();iter++)
+  ofstream file(fileName);
+  file << setprecision(16);
+  file << "  double coords[]=" << endl << "    { ";
+  for(vector<Node *>::const_iterator iter=nodes.begin();iter!=nodes.end();iter++)
     {
       if(iter!=nodes.begin())
-        file << "," << std::endl << "      ";
+        file << "," << endl << "      ";
       file << (*(*iter))[0] << ", " << (*(*iter))[1];
     }
-  file << "};" << std::endl;
+  file << "};" << endl;
 }
 
 void QuadraticPolygon::closeMe() const
@@ -129,35 +127,9 @@ void QuadraticPolygon::circularPermute()
     }
 }
 
-bool QuadraticPolygon::isButterfly() const
-{
-  for(std::list<ElementaryEdge *>::const_iterator it=_sub_edges.begin();it!=_sub_edges.end();it++)
-    {
-      Edge *e1=(*it)->getPtr();
-      std::list<ElementaryEdge *>::const_iterator it2=it;
-      it2++;
-      for(;it2!=_sub_edges.end();it2++)
-        {
-          MergePoints commonNode;
-          ComposedEdge *outVal1=new ComposedEdge;
-          ComposedEdge *outVal2=new ComposedEdge;
-          Edge *e2=(*it2)->getPtr();
-          if(e1->intersectWith(e2,commonNode,*outVal1,*outVal2))
-            {
-              Delete(outVal1);
-              Delete(outVal2);
-              return true;
-            }
-          Delete(outVal1);
-          Delete(outVal2);
-        }
-    }
-  return false;
-}
-
 void QuadraticPolygon::dumpInXfigFileWithOther(const ComposedEdge& other, const char *fileName) const
 {
-  std::ofstream file(fileName);
+  ofstream file(fileName);
   const int resolution=1200;
   Bounds box;
   box.prepareForAggregation();
@@ -169,7 +141,7 @@ void QuadraticPolygon::dumpInXfigFileWithOther(const ComposedEdge& other, const
 
 void QuadraticPolygon::dumpInXfigFile(const char *fileName) const
 {
-  std::ofstream file(fileName);
+  ofstream file(fileName);
   const int resolution=1200;
   Bounds box;
   box.prepareForAggregation();
@@ -179,15 +151,15 @@ void QuadraticPolygon::dumpInXfigFile(const char *fileName) const
 
 void QuadraticPolygon::dumpInXfigFile(std::ostream& stream, int resolution, const Bounds& box) const
 {
-  stream << "#FIG 3.2  Produced by xfig version 3.2.5-alpha5" << std::endl;
-  stream << "Landscape" << std::endl;
-  stream << "Center" << std::endl;
-  stream << "Metric" << std::endl;
-  stream << "Letter" << std::endl;
-  stream << "100.00" << std::endl;
-  stream << "Single" << std::endl;
-  stream << "-2" << std::endl;
-  stream << resolution << " 2" << std::endl;
+  stream << "#FIG 3.2  Produced by xfig version 3.2.5-alpha5" << endl;
+  stream << "Landscape" << endl;
+  stream << "Center" << endl;
+  stream << "Metric" << endl;
+  stream << "Letter" << endl;
+  stream << "100.00" << endl;
+  stream << "Single" << endl;
+  stream << "-2" << endl;
+  stream << resolution << " 2" << endl;
   ComposedEdge::dumpInXfigFile(stream,resolution,box);
 }
 
@@ -196,10 +168,10 @@ void QuadraticPolygon::dumpInXfigFile(std::ostream& stream, int resolution, cons
  */
 double QuadraticPolygon::intersectWithAbs(QuadraticPolygon& other)
 {
-  double ret=0.,xBaryBB,yBaryBB;
-  double fact=normalize(&other,xBaryBB,yBaryBB);
-  std::vector<QuadraticPolygon *> polygs=intersectMySelfWith(other);
-  for(std::vector<QuadraticPolygon *>::iterator iter=polygs.begin();iter!=polygs.end();iter++)
+  double ret=0.;
+  double fact=normalize(&other);
+  vector<QuadraticPolygon *> polygs=intersectMySelfWith(other);
+  for(vector<QuadraticPolygon *>::iterator iter=polygs.begin();iter!=polygs.end();iter++)
     {
       ret+=fabs((*iter)->getArea());
       delete *iter;
@@ -207,33 +179,6 @@ double QuadraticPolygon::intersectWithAbs(QuadraticPolygon& other)
   return ret*fact*fact;
 }
 
-/*!
- * Warning contrary to intersectWith method this method is \b NOT const. 'this' and 'other' are modified after call of this method.
- */
-double QuadraticPolygon::intersectWithAbs(QuadraticPolygon& other, double* barycenter)
-{
-  double ret=0.,bary[2],area,xBaryBB,yBaryBB;
-  barycenter[0] = barycenter[1] = 0.;
-  double fact=normalize(&other,xBaryBB,yBaryBB);
-  std::vector<QuadraticPolygon *> polygs=intersectMySelfWith(other);
-  for(std::vector<QuadraticPolygon *>::iterator iter=polygs.begin();iter!=polygs.end();iter++)
-    {
-      area=fabs((*iter)->getArea());
-      (*iter)->getBarycenter(bary);
-      delete *iter;
-      ret+=area;
-      barycenter[0] += bary[0]*area;
-      barycenter[1] += bary[1]*area;
-    }
-  if ( ret > std::numeric_limits<double>::min() )
-    {
-      barycenter[0]=barycenter[0]/ret*fact+xBaryBB;
-      barycenter[1]=barycenter[1]/ret*fact+yBaryBB;
-      
-    }
-  return ret*fact*fact;
-}
-
 /*!
  * \b WARNING this method is const and other is const too. \b BUT location of Edges in 'this' and 'other' are nevertheless modified.
  * This is possible because loc attribute in Edge class is mutable.
@@ -242,8 +187,8 @@ double QuadraticPolygon::intersectWithAbs(QuadraticPolygon& other, double* baryc
 double QuadraticPolygon::intersectWith(const QuadraticPolygon& other) const
 {
   double ret=0.;
-  std::vector<QuadraticPolygon *> polygs=intersectMySelfWith(other);
-  for(std::vector<QuadraticPolygon *>::iterator iter=polygs.begin();iter!=polygs.end();iter++)
+  vector<QuadraticPolygon *> polygs=intersectMySelfWith(other);
+  for(vector<QuadraticPolygon *>::iterator iter=polygs.begin();iter!=polygs.end();iter++)
     {
       ret+=fabs((*iter)->getArea());
       delete *iter;
@@ -251,33 +196,6 @@ double QuadraticPolygon::intersectWith(const QuadraticPolygon& other) const
   return ret;
 }
 
-/*!
- * \b WARNING this method is const and other is const too. \b BUT location of Edges in 'this' and 'other' are nevertheless modified.
- * This is possible because loc attribute in Edge class is mutable.
- * This implies that if 'this' or/and 'other' are reused for intersect* method initLocations has to be called on each of this/them.
- */
-double QuadraticPolygon::intersectWith(const QuadraticPolygon& other, double* barycenter) const
-{
-  double ret=0., bary[2];
-  barycenter[0] = barycenter[1] = 0.;
-  std::vector<QuadraticPolygon *> polygs=intersectMySelfWith(other);
-  for(std::vector<QuadraticPolygon *>::iterator iter=polygs.begin();iter!=polygs.end();iter++)
-    {
-      double area = fabs((*iter)->getArea());
-      (*iter)->getBarycenter(bary);
-      delete *iter;
-      ret+=area;
-      barycenter[0] += bary[0]*area;
-      barycenter[1] += bary[1]*area;
-    }
-  if ( ret > std::numeric_limits<double>::min() )
-    {
-      barycenter[0] /= ret;
-      barycenter[1] /= ret;
-    }
-  return ret;
-}
-
 /*!
  * \b WARNING this method is const and other is const too. \b BUT location of Edges in 'this' and 'other' are nevertheless modified.
  * This is possible because loc attribute in Edge class is mutable.
@@ -450,8 +368,8 @@ void QuadraticPolygon::performLocatingOperation(QuadraticPolygon& pol2) const
  */
 std::vector<QuadraticPolygon *> QuadraticPolygon::buildIntersectionPolygons(const QuadraticPolygon& pol1, const QuadraticPolygon& pol2) const
 {
-  std::vector<QuadraticPolygon *> ret;
-  std::list<QuadraticPolygon *> pol2Zip=pol2.zipConsecutiveInSegments();
+  vector<QuadraticPolygon *> ret;
+  list<QuadraticPolygon *> pol2Zip=pol2.zipConsecutiveInSegments();
   if(!pol2Zip.empty())
     closePolygons(pol2Zip,pol1,ret);
   else
@@ -473,7 +391,7 @@ std::vector<QuadraticPolygon *> QuadraticPolygon::buildIntersectionPolygons(cons
  */
 std::list<QuadraticPolygon *> QuadraticPolygon::zipConsecutiveInSegments() const
 {
-  std::list<QuadraticPolygon *> ret;
+  list<QuadraticPolygon *> ret;
   IteratorOnComposedEdge it((ComposedEdge *)this);
   int nbOfTurns=recursiveSize();
   int i=0;
@@ -514,7 +432,7 @@ void QuadraticPolygon::closePolygons(std::list<QuadraticPolygon *>& pol2Zip, con
 {
   bool directionKnownInPol1=false;
   bool directionInPol1;
-  for(std::list<QuadraticPolygon *>::iterator iter=pol2Zip.begin();iter!=pol2Zip.end();)
+  for(list<QuadraticPolygon *>::iterator iter=pol2Zip.begin();iter!=pol2Zip.end();)
     {
       if((*iter)->completed())
         {
@@ -524,14 +442,12 @@ void QuadraticPolygon::closePolygons(std::list<QuadraticPolygon *>& pol2Zip, con
           continue;
         }
       if(!directionKnownInPol1)
-        {
-          if(!(*iter)->amIAChanceToBeCompletedBy(pol1,*this,directionInPol1))
-            { delete *iter; iter=pol2Zip.erase(iter); continue; }
-          else
-            directionKnownInPol1=true;
-        }
-      std::list<QuadraticPolygon *>::iterator iter2=iter; iter2++;
-      std::list<QuadraticPolygon *>::iterator iter3=(*iter)->fillAsMuchAsPossibleWith(pol1,iter2,pol2Zip.end(),directionInPol1);
+        if(!(*iter)->amIAChanceToBeCompletedBy(pol1,*this,directionInPol1))
+          { delete *iter; iter=pol2Zip.erase(iter); continue; }
+        else
+          directionKnownInPol1=true;
+      list<QuadraticPolygon *>::iterator iter2=iter; iter2++;
+      list<QuadraticPolygon *>::iterator iter3=(*iter)->fillAsMuchAsPossibleWith(pol1,iter2,pol2Zip.end(),directionInPol1);
       if(iter3!=pol2Zip.end())
         {
           (*iter)->pushBack(*iter3);
@@ -630,7 +546,7 @@ std::list<QuadraticPolygon *>::iterator QuadraticPolygon::fillAsMuchAsPossibleWi
 std::list<QuadraticPolygon *>::iterator QuadraticPolygon::checkInList(Node *n, std::list<QuadraticPolygon *>::iterator iStart,
                                                                       std::list<QuadraticPolygon *>::iterator iEnd)
 {
-  for(std::list<QuadraticPolygon *>::iterator iter=iStart;iter!=iEnd;iter++)
+  for(list<QuadraticPolygon *>::iterator iter=iStart;iter!=iEnd;iter++)
     if((*iter)->isNodeIn(n))
       return iter;
   return iEnd;
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DQuadraticPolygon.hxx b/src/INTERP_KERNEL/Geometric2D/QuadraticPolygon.hxx
similarity index 89%
rename from src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DQuadraticPolygon.hxx
rename to src/INTERP_KERNEL/Geometric2D/QuadraticPolygon.hxx
index 52f985b91..78977ecf5 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DQuadraticPolygon.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/QuadraticPolygon.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,15 +16,14 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-#ifndef __INTERPKERNELGEO2DQUADRATICPOLYGON_HXX__
-#define __INTERPKERNELGEO2DQUADRATICPOLYGON_HXX__
+#ifndef __QUADRATICPOLYGON_HXX__
+#define __QUADRATICPOLYGON_HXX__
 
 #include "INTERPKERNELGEOMETRIC2DDefines.hxx"
 
-#include "InterpKernelGeo2DComposedEdge.hxx"
-#include "InterpKernelGeo2DAbstractEdge.hxx"
-#include "InterpKernelGeo2DElementaryEdge.hxx"
+#include "ComposedEdge.hxx"
+#include "AbstractEdge.hxx"
+#include "ElementaryEdge.hxx"
 
 #include <list>
 #include <vector>
@@ -46,15 +45,11 @@ namespace INTERP_KERNEL
     ~QuadraticPolygon();
     void closeMe() const;
     void circularPermute();
-    bool isButterfly() const;
     void dumpInXfigFile(const char *fileName) const;
     void dumpInXfigFileWithOther(const ComposedEdge& other, const char *fileName) const;
     //! Before intersecting as intersectWith a normalization is done.
     double intersectWithAbs(QuadraticPolygon& other);
-    //! Before intersecting as intersectWith a normalization is done.
-    double intersectWithAbs(QuadraticPolygon& other, double* barycenter);
     double intersectWith(const QuadraticPolygon& other) const;
-    double intersectWith(const QuadraticPolygon& other, double* barycenter) const;
     std::vector<QuadraticPolygon *> intersectMySelfWith(const QuadraticPolygon& other) const;
     void intersectForPerimeter(const QuadraticPolygon& other, double& perimeterThisPart, double& perimeterOtherPart, double& perimeterCommonPart) const;
     void intersectForPerimeterAdvanced(const QuadraticPolygon& other, std::vector< double >& polThis, std::vector< double >& polOther) const;
diff --git a/src/INTERP_KERNEL/IntegralUniformIntersector.hxx b/src/INTERP_KERNEL/IntegralUniformIntersector.hxx
deleted file mode 100644
index e7fe7e9f2..000000000
--- a/src/INTERP_KERNEL/IntegralUniformIntersector.hxx
+++ /dev/null
@@ -1,71 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __INTEGRALUNIFORMINTERSECTOR_HXX__
-#define __INTEGRALUNIFORMINTERSECTOR_HXX__
-
-#include "TargetIntersector.hxx"
-
-#include <cmath>
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  class IntegralUniformIntersector : public TargetIntersector<MyMeshType,MyMatrix>
-  {
-  public:
-    typedef typename MyMeshType::MyConnType ConnType;
-  public:
-    IntegralUniformIntersector(const MyMeshType& mesh, bool isAbs);
-    double performNormalization(double val) const { if(_is_abs) return fabs(val); else return val; }
-    void setFromTo(bool val) { _from_to=val; }
-    void putValueIn(ConnType i, double val, MyMatrix& res) const;
-  protected:
-    const MyMeshType& _mesh;
-    //! if false means fromIntegralUniform if true means toIntegralUniform
-    bool _from_to;
-    bool _is_abs;
-  };
-
-  template<class MyMeshType, class MyMatrix>
-  class IntegralUniformIntersectorP0 : public IntegralUniformIntersector<MyMeshType,MyMatrix>
-  {
-  public:
-    typedef typename MyMeshType::MyConnType ConnType;
-  public:
-    IntegralUniformIntersectorP0(const MyMeshType& mesh, bool isAbs);
-    int getNumberOfRowsOfResMatrix() const;
-    int getNumberOfColsOfResMatrix() const;
-    void intersectCells(ConnType targetCell, const std::vector<ConnType>& srcCells, MyMatrix& res);
-  };
-
-  template<class MyMeshType, class MyMatrix>
-  class IntegralUniformIntersectorP1 : public IntegralUniformIntersector<MyMeshType,MyMatrix>
-  {
-  public:
-    typedef typename MyMeshType::MyConnType ConnType;
-  public:
-    IntegralUniformIntersectorP1(const MyMeshType& mesh, bool isAbs);
-    int getNumberOfRowsOfResMatrix() const;
-    int getNumberOfColsOfResMatrix() const;
-    void intersectCells(ConnType targetCell, const std::vector<ConnType>& srcCells, MyMatrix& res);
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/IntegralUniformIntersector.txx b/src/INTERP_KERNEL/IntegralUniformIntersector.txx
deleted file mode 100644
index 334d9e0b0..000000000
--- a/src/INTERP_KERNEL/IntegralUniformIntersector.txx
+++ /dev/null
@@ -1,155 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-#ifndef __INTEGRALUNIFORMINTERSECTOR_TXX__
-#define __INTEGRALUNIFORMINTERSECTOR_TXX__
-
-#include "IntegralUniformIntersector.hxx"
-#include "VolSurfUser.txx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  IntegralUniformIntersector<MyMeshType,MyMatrix>::IntegralUniformIntersector(const MyMeshType& mesh, bool isAbs):_mesh(mesh),_from_to(false),_is_abs(isAbs)
-  {
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  void IntegralUniformIntersector<MyMeshType,MyMatrix>::putValueIn(ConnType iInCMode, double val1, MyMatrix& res) const
-  {
-    static const NumberingPolicy numPol=MyMeshType::My_numPol;
-    double val=performNormalization(val1);
-    if(_from_to)
-      {
-        typename MyMatrix::value_type& resRow=res[0];
-        typename MyMatrix::value_type::const_iterator iterRes=resRow.find(OTT<ConnType,numPol>::indFC(iInCMode));
-        if(iterRes==resRow.end())
-          resRow.insert(std::make_pair(OTT<ConnType,numPol>::indFC(iInCMode),val));
-        else
-          {
-            double val2=(*iterRes).second+val;
-            resRow.erase(OTT<ConnType,numPol>::indFC(iInCMode));
-            resRow.insert(std::make_pair(OTT<ConnType,numPol>::indFC(iInCMode),val2));
-          }
-      }
-    else
-      {
-        typename MyMatrix::value_type& resRow=res[iInCMode];
-        typename MyMatrix::value_type::const_iterator iterRes=resRow.find(OTT<ConnType,numPol>::indFC(0));
-        if(iterRes==resRow.end())
-          resRow.insert(std::make_pair(OTT<ConnType,numPol>::indFC(0),val));
-        else
-          {
-            double val2=(*iterRes).second+val;
-            resRow.erase(OTT<ConnType,numPol>::indFC(0));
-            resRow.insert(std::make_pair(OTT<ConnType,numPol>::indFC(0),val2));
-          }
-      }
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  IntegralUniformIntersectorP0<MyMeshType,MyMatrix>::IntegralUniformIntersectorP0(const MyMeshType& mesh, bool isAbs):IntegralUniformIntersector<MyMeshType,MyMatrix>(mesh,isAbs)
-  {
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  int IntegralUniformIntersectorP0<MyMeshType,MyMatrix>::getNumberOfRowsOfResMatrix() const
-  {
-    if(IntegralUniformIntersector<MyMeshType,MyMatrix>::_from_to)
-      return 1;
-    else
-      return IntegralUniformIntersector<MyMeshType,MyMatrix>::_mesh.getNumberOfElements();
-  }
-  
-  template<class MyMeshType, class MyMatrix>
-  int IntegralUniformIntersectorP0<MyMeshType,MyMatrix>::getNumberOfColsOfResMatrix() const
-  {
-    if(IntegralUniformIntersector<MyMeshType,MyMatrix>::_from_to)
-      return IntegralUniformIntersector<MyMeshType,MyMatrix>::_mesh.getNumberOfElements();
-    else
-      return 1;
-  }
-  
-  template<class MyMeshType, class MyMatrix>
-  void IntegralUniformIntersectorP0<MyMeshType,MyMatrix>::intersectCells(ConnType targetCell, const std::vector<ConnType>& srcCells, MyMatrix& res)
-  {
-    static const NumberingPolicy numPol=MyMeshType::My_numPol;
-    res.resize(getNumberOfRowsOfResMatrix());
-    unsigned long nbelem=IntegralUniformIntersector<MyMeshType,MyMatrix>::_mesh.getNumberOfElements();
-    const ConnType *connIndx=IntegralUniformIntersector<MyMeshType,MyMatrix>::_mesh.getConnectivityIndexPtr();
-    const ConnType *conn=IntegralUniformIntersector<MyMeshType,MyMatrix>::_mesh.getConnectivityPtr();
-    const double *coords=IntegralUniformIntersector<MyMeshType,MyMatrix>::_mesh.getCoordinatesPtr();
-    for(unsigned long i=0;i<nbelem;i++)
-      {
-        INTERP_KERNEL::NormalizedCellType t=IntegralUniformIntersector<MyMeshType,MyMatrix>::_mesh.getTypeOfElement(OTT<ConnType,numPol>::indFC(i));
-        double val=computeVolSurfOfCell<ConnType,numPol,MyMeshType::MY_SPACEDIM>(t,conn+OTT<ConnType,numPol>::ind2C(connIndx[i]),connIndx[i+1]-connIndx[i],coords);
-        IntegralUniformIntersector<MyMeshType,MyMatrix>::putValueIn(i,val,res);
-      }
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  IntegralUniformIntersectorP1<MyMeshType,MyMatrix>::IntegralUniformIntersectorP1(const MyMeshType& mesh, bool isAbs):IntegralUniformIntersector<MyMeshType,MyMatrix>(mesh,isAbs)
-  {
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  int IntegralUniformIntersectorP1<MyMeshType,MyMatrix>::getNumberOfRowsOfResMatrix() const
-  {
-    if(IntegralUniformIntersector<MyMeshType,MyMatrix>::_from_to)
-      return 1;
-    else
-      return IntegralUniformIntersector<MyMeshType,MyMatrix>::_mesh.getNumberOfNodes();
-  }
-  
-  template<class MyMeshType, class MyMatrix>
-  int IntegralUniformIntersectorP1<MyMeshType,MyMatrix>::getNumberOfColsOfResMatrix() const
-  {
-    if(IntegralUniformIntersector<MyMeshType,MyMatrix>::_from_to)
-      return IntegralUniformIntersector<MyMeshType,MyMatrix>::_mesh.getNumberOfNodes();
-    else
-      return 1;
-  }
-  
-  template<class MyMeshType, class MyMatrix>
-  void IntegralUniformIntersectorP1<MyMeshType,MyMatrix>::intersectCells(ConnType targetCell, const std::vector<ConnType>& srcCells, MyMatrix& res)
-  {
-    static const NumberingPolicy numPol=MyMeshType::My_numPol;
-    res.resize(getNumberOfRowsOfResMatrix());
-    unsigned long nbelem=IntegralUniformIntersector<MyMeshType,MyMatrix>::_mesh.getNumberOfElements();
-    const ConnType *connIndx=IntegralUniformIntersector<MyMeshType,MyMatrix>::_mesh.getConnectivityIndexPtr();
-    const ConnType *conn=IntegralUniformIntersector<MyMeshType,MyMatrix>::_mesh.getConnectivityPtr();
-    const double *coords=IntegralUniformIntersector<MyMeshType,MyMatrix>::_mesh.getCoordinatesPtr();
-    for(unsigned long i=0;i<nbelem;i++)
-      {
-        INTERP_KERNEL::NormalizedCellType t=IntegralUniformIntersector<MyMeshType,MyMatrix>::_mesh.getTypeOfElement(OTT<ConnType,numPol>::indFC(i));
-        int lgth=connIndx[i+1]-connIndx[i];
-        const ConnType *locConn=conn+OTT<ConnType,numPol>::ind2C(connIndx[i]);
-        double val=computeVolSurfOfCell<ConnType,numPol,MyMeshType::MY_SPACEDIM>(t,locConn,lgth,coords);
-        if(t==NORM_TRI3)
-          val/=3.;
-        else if(t==NORM_TETRA4)
-          val/=4.;
-        else
-          throw INTERP_KERNEL::Exception("Invalid cell type detected : must be TRI3 or TETRA4 ! ");
-        for(int j=0;j<lgth;j++)
-          IntegralUniformIntersector<MyMeshType,MyMatrix>::putValueIn(OTT<ConnType,numPol>::coo2C(locConn[j]),val,res);
-      }
-  }
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/Interpolation.txx b/src/INTERP_KERNEL/Interpolation.txx
deleted file mode 100644
index 6e59eb88c..000000000
--- a/src/INTERP_KERNEL/Interpolation.txx
+++ /dev/null
@@ -1,76 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-#ifndef __INTERPOLATION_TXX__
-#define __INTERPOLATION_TXX__
-
-#include "Interpolation.hxx"
-#include "IntegralUniformIntersector.hxx"
-#include "IntegralUniformIntersector.txx"
-
-namespace INTERP_KERNEL
-{ 
-  template<class TrueMainInterpolator>
-  template<class MyMeshType, class MatrixType>
-  int Interpolation<TrueMainInterpolator>::fromToIntegralUniform(bool fromTo, const MyMeshType& mesh, MatrixType& result, const char *method)
-  {
-    typedef typename MyMeshType::MyConnType ConnType;
-    std::string methodCPP(method);
-    int ret=-1;
-    if(methodCPP=="P0")
-      {
-        IntegralUniformIntersectorP0<MyMeshType,MatrixType> intersector(mesh,InterpolationOptions::getMeasureAbsStatus());
-        intersector.setFromTo(fromTo);
-        std::vector<ConnType> tmp;
-        intersector.intersectCells(0,tmp,result);
-        ret=intersector.getNumberOfColsOfResMatrix();
-      }
-    else if(methodCPP=="P1")
-      {
-        IntegralUniformIntersectorP1<MyMeshType,MatrixType> intersector(mesh,InterpolationOptions::getMeasureAbsStatus());
-        intersector.setFromTo(fromTo);
-        std::vector<ConnType> tmp;
-        intersector.intersectCells(0,tmp,result);
-        ret=intersector.getNumberOfColsOfResMatrix();
-      }
-    else
-      throw INTERP_KERNEL::Exception("Invalid method specified in fromIntegralUniform : must be in { \"P0\", \"P1\"}");
-    return ret;
-  }
-
-  template<class TrueMainInterpolator>
-  void Interpolation<TrueMainInterpolator>::checkAndSplitInterpolationMethod(const char *method, std::string& srcMeth, std::string& trgMeth) throw(INTERP_KERNEL::Exception)
-  {
-    const int NB_OF_METH_MANAGED=4;
-    const char *METH_MANAGED[NB_OF_METH_MANAGED]={"P0P0","P0P1","P1P0","P1P1"};
-    std::string methodC(method);
-    bool found=false;
-    for(int i=0;i<NB_OF_METH_MANAGED && !found;i++)
-      found=(methodC==METH_MANAGED[i]);
-    if(!found)
-      {
-        std::string msg("The interpolation method : \'"); msg+=method; msg+="\' not managed !";
-        throw INTERP_KERNEL::Exception(msg.c_str());
-      }
-    srcMeth=methodC.substr(0,2);
-    trgMeth=methodC.substr(2);
-  }
-}
-
-#endif
-
diff --git a/src/INTERP_KERNEL/Interpolation1D.txx b/src/INTERP_KERNEL/Interpolation1D.txx
deleted file mode 100644
index 05e57f29a..000000000
--- a/src/INTERP_KERNEL/Interpolation1D.txx
+++ /dev/null
@@ -1,26 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-#ifndef __INTERPOLATION1D_TXX__
-#define __INTERPOLATION1D_TXX__
-
-#include "Interpolation1D.hxx"
-
-#include "InterpolationCurve.txx"
-
-#endif
diff --git a/src/INTERP_KERNEL/Interpolation2DCurve.hxx b/src/INTERP_KERNEL/Interpolation2DCurve.hxx
deleted file mode 100644
index 72a36b6f4..000000000
--- a/src/INTERP_KERNEL/Interpolation2DCurve.hxx
+++ /dev/null
@@ -1,38 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __INTERPOLATION2DCURVE_HXX__
-#define __INTERPOLATION2DCURVE_HXX__
-
-#include "InterpolationCurve.hxx"
-#include "InterpolationOptions.hxx"
-
-namespace INTERP_KERNEL
-{
-  class Interpolation2DCurve : public InterpolationCurve<Interpolation2DCurve>
-  {
-  public:
-    Interpolation2DCurve();
-    Interpolation2DCurve(const InterpolationOptions& io);
-    // geometric precision, intersection tolerance, coice of the median line,
-    void setOptions(double precision, double tolerance, double medianLine);
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/Interpolation2DCurve.txx b/src/INTERP_KERNEL/Interpolation2DCurve.txx
deleted file mode 100644
index 0aafe3f91..000000000
--- a/src/INTERP_KERNEL/Interpolation2DCurve.txx
+++ /dev/null
@@ -1,63 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-#ifndef __INTERPOLATION2DCURVE_TXX__
-#define __INTERPOLATION2DCURVE_TXX__
-
-#include "Interpolation2DCurve.hxx"
-#include "InterpolationCurve.txx"
-
-namespace INTERP_KERNEL
-{
-  Interpolation2DCurve::Interpolation2DCurve()
-  {
-    // to have non-zero default thickness of target element
-    InterpolationOptions::setBoundingBoxAdjustmentAbs( InterpolationOptions::getPrecision() );
-  }
-
-  Interpolation2DCurve::Interpolation2DCurve
-    (const InterpolationOptions& io):InterpolationCurve<Interpolation2DCurve>(io)
-  {
-    // to have non-zero default thickness of target element
-    InterpolationOptions::setBoundingBoxAdjustmentAbs( InterpolationOptions::getPrecision() );
-  }
-
-  /**
-   *  \brief  Function used to set the options for the intersection calculation
-   * \details The following options can be modified:
-   *  -# Precision: Level of precision of the computations.
-   *   - Values: positive real number.
-   *   - Default: 1.0E-12.
-   *  -# Tolerance: Thickness of target element.
-   *   - Values: positive real number.
-   *   - Default: 1.0E-12.
-   *  -# Median line: Position of the median line where both segments will be projected.
-   *   - Values: real number between 0.0 and 1.0.
-   *   - Default: 0.5
-   */
-  void Interpolation2DCurve::setOptions (double precision,
-                                         double tolerance,
-                                         double medianLine)
-  {
-    InterpolationOptions::setPrecision(precision);
-    InterpolationOptions::setBoundingBoxAdjustmentAbs(tolerance);
-    InterpolationOptions::setMedianPlane(medianLine);
-  }
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/InterpolationCC.hxx b/src/INTERP_KERNEL/InterpolationCC.hxx
deleted file mode 100644
index 738bdb0c5..000000000
--- a/src/INTERP_KERNEL/InterpolationCC.hxx
+++ /dev/null
@@ -1,51 +0,0 @@
-//  Copyright (C) 2009-2010  OPEN CASCADE
-//
-//  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
-//
-
-// File      : InterpolationCC.hxx
-// Created   : Fri Aug 14 11:33:17 2009
-// Author    : Edward AGAPOV (eap)
-//
-#ifndef __InterpolationCC_HXX__
-#define __InterpolationCC_HXX__
-
-#include "Interpolation.hxx"
-
-namespace INTERP_KERNEL
-{
-  /*!
-   * \brief Interpolator of cartesian/cartesian meshes
-   */
-  class InterpolationCC : public Interpolation<InterpolationCC>
-  {
-//     static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-//     static const int MESHDIM=MyMeshType::MY_MESHDIM;
-//     typedef typename MyMeshType::MyConnType ConnType;
-//     static const NumberingPolicy numPol=MyMeshType::My_numPol;
-  public:
-    InterpolationCC();
-    //InterpolationCC(const InterpolationOptions& io);
-    template<class MyMeshType, class MatrixType>
-    int interpolateMeshes(const MyMeshType& srcMesh, const MyMeshType& targetMesh, MatrixType& result, const char *method);
-
-  private:
-  };
-}
-
-
-#endif
diff --git a/src/INTERP_KERNEL/InterpolationCC.txx b/src/INTERP_KERNEL/InterpolationCC.txx
deleted file mode 100644
index 9b08c68f6..000000000
--- a/src/INTERP_KERNEL/InterpolationCC.txx
+++ /dev/null
@@ -1,248 +0,0 @@
-//  Copyright (C) 2009-2010  OPEN CASCADE
-//
-//  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
-//
-// File      : InterpolationCC.txx
-// Created   : Fri Aug 14 11:39:27 2009
-// Author    : Edward AGAPOV (eap)
-//
-
-#include "InterpolationCC.hxx"
-#include "InterpolationUtils.hxx"
-
-// convert index "From Mesh Index"
-#define _FMI(i) OTT<typename MyMeshType::MyConnType,MyMeshType::My_numPol>::ind2C((i))
-// convert index "To Mesh Index"
-#define _TMI(i) OTT<typename MyMeshType::MyConnType,MyMeshType::My_numPol>::indFC((i))
-
-namespace INTERP_KERNEL
-{
-  //================================================================================
-  /*!
-   * \brief Constructor does nothing
-   */
-  //================================================================================
-  InterpolationCC::InterpolationCC()
-  {
-  }
-
-  //================================================================================
-  /*!
-   * \brief An 1D intersection result
-   */
-  //================================================================================
-
-  struct Interference
-  {
-    int _src_index; // source cell index along an axis
-    int _tgt_index; // target cell index along an axis
-    double _length; // interference length
-    Interference(int is = -1, int it = -1, double l = 0):_src_index(is),_tgt_index(it),_length(l){}
-  };
-
-  //================================================================================
-  /*!
-   * \brief Fills the matrix by precomputed cell interferences along axes
-   *  \param inter_of_axis - cell/cell interferences along each axis
-   *  \param result - matrix to fill in
-   *  \param src_nb_cells[] - nb of cells along each of axes in the source mesh
-   *  \param tgt_nb_cells[] - nb of cells along each of axes in the target mesh
-   *  \param src_i_cell - source cell number accumulated by previous axes
-   *  \param tgt_i_cell - target cell number accumulated by previous axes
-   *  \param src_prev_area - factor by which this axis icreases cell number
-   *  \param tgt_prev_area - factor by which this axis icreases cell number
-   *  \param axis - the axis to treat
-   *  \param prev_value - intersection size computed by previous axes
-   */
-  //================================================================================
-
-  template <class MyMeshType, class MatrixType, int dim>
-  void fillMatrix(const std::list< Interference >  inter_of_axis[dim],
-                  MatrixType&                      result,
-                  const int                        src_nb_cells[dim],
-                  const int                        tgt_nb_cells[dim],
-                  const int                        src_i_cell = 0,
-                  const int                        tgt_i_cell = 0,
-                  const int                        src_prev_area = 1,
-                  const int                        tgt_prev_area = 1,
-                  const int                        axis = 0,
-                  const double                     prev_value = 1.0)
-  {
-    typedef std::list < Interference >::const_iterator TIntIterator;
-
-    if ( axis + 1 == dim )
-    {
-      for ( TIntIterator i = inter_of_axis[axis].begin(); i != inter_of_axis[axis].end(); ++i )
-      {
-        double value = i->_length * prev_value;
-        int src_i    = i->_src_index * src_prev_area + src_i_cell;
-        int tgt_i    = i->_tgt_index * tgt_prev_area + tgt_i_cell;
-
-        result[ tgt_i ].insert( std::make_pair( _TMI( src_i ), value ));
-      }
-    }
-    else
-    {
-      int src_prev_area_next = src_prev_area * src_nb_cells[ axis ];
-      int tgt_prev_area_next = tgt_prev_area * tgt_nb_cells[ axis ];
-
-      for ( TIntIterator i = inter_of_axis[axis].begin(); i != inter_of_axis[axis].end(); ++i )
-      {
-        double value = i->_length * prev_value;
-        int src_i    = i->_src_index * src_prev_area + src_i_cell;
-        int tgt_i    = i->_tgt_index * tgt_prev_area + tgt_i_cell;
-
-        // call for the next axis
-        fillMatrix<MyMeshType, MatrixType, dim>(inter_of_axis, result,
-                                                src_nb_cells, tgt_nb_cells, src_i, tgt_i,
-                                                src_prev_area_next, tgt_prev_area_next,
-                                                axis+1, value );
-      }
-    }
-  }
-
-  //================================================================================
-  /*!
-   * \brief Calculates the matrix of volumes of intersection between the elements of
-   *        src_mesh and the elements of targetMesh
-   *  \param src_mesh - source mesh
-   *  \param tgt_mesh - target mesh
-   *  \param result - matrix in which the result is stored 
-   *  \param method - interpolation method, not used as only "P0P0" is implemented so far
-   * 
-   * The matrix is partially sparse : it is a vector of maps of integer - double pairs. 
-   * It can also be an INTERP_KERNEL::Matrix object.
-   * The length of the vector is equal to the number of target elements - for each target
-   * element there is a map, regardless of whether the element intersects any source
-   * elements or not. But in the maps there are only entries for those source elements
-   * which have a non-zero intersection volume with the target element. The vector has
-   * indices running from 0 to (nb target elements - 1), meaning that the map for target
-   * element i is stored at index i - 1. In the maps, however, the indexing is more natural:
-   * the intersection volume of the target element i with source element j is found at matrix[i-1][j]
-   */
-  //================================================================================
-
-  template<class MyMeshType, class MatrixType>
-  int InterpolationCC::interpolateMeshes(const MyMeshType& src_mesh,
-                                         const MyMeshType& tgt_mesh,
-                                         MatrixType&       result,
-                                         const char *      method)
-  {
-    if ( std::string("P0P0") != method )
-      throw Exception("Only P0P0 method is implemented so far");
-
-    // create empty maps for all target elements
-    result.resize( tgt_mesh.getNumberOfElements() );
-
-    const int ret = src_mesh.getNumberOfElements();
-
-    const double eps = getPrecision();
-    const int dim = MyMeshType::MY_MESHDIM;
-    //const NumberingPolicy numPol = MyMeshType::My_numPol;
-
-    const double* src_coords[ dim ];
-    const double* tgt_coords[ dim ];
-    int src_nb_cells[ dim ];
-    int tgt_nb_cells[ dim ];
-    for ( int j = 0; j < dim; ++j )
-    {
-      src_coords[ j ] = src_mesh.getCoordsAlongAxis( _TMI( j ));
-      tgt_coords[ j ] = tgt_mesh.getCoordsAlongAxis( _TMI( j ));
-      src_nb_cells[ j ] = src_mesh.nbCellsAlongAxis( _TMI( j ));
-      tgt_nb_cells[ j ] = tgt_mesh.nbCellsAlongAxis( _TMI( j ));
-    }
-    
-    // ============================================
-    // Calculate cell interferences along the axes
-    // ============================================
-
-    std::list < Interference > interferences[ dim ];
-
-    for ( int j = 0; j < dim; ++j ) // loop on axes of castesian space
-    {
-      std::list < Interference >& axis_interferences = interferences[j];
-
-      int it = 0, is = 0;
-      double x1t, x2t, x1s, x2s; // left and right ordinates of target and source cells
-
-      // look for the first interference
-      // --------------------------------
-      bool intersection = false;
-      while ( !intersection && it < tgt_nb_cells[j] && is < src_nb_cells[j] )
-      {
-        x1s = src_coords[ j ][ is ];
-        x2t = tgt_coords[ j ][ it+1 ];
-        if ( x2t < x1s+eps )
-        {
-          it++; // source lays on the right of target
-          continue;
-        }
-        x1t = tgt_coords[ j ][ it ];
-        x2s = src_coords[ j ][ is+1 ];
-        if ( x2s < x1t+eps )
-        {
-          is++; // source lays on the left of target
-          continue;
-        }
-        intersection = true;
-      }
-      if ( !intersection ) return ret; // no intersections
-
-      // get all interferences
-      // ----------------------
-      while ( intersection )
-      {
-        x1s = src_coords[ j ][ is ];
-        x1t = tgt_coords[ j ][ it ];
-        x2t = tgt_coords[ j ][ it+1 ];
-        x2s = src_coords[ j ][ is+1 ];
-
-        double x1 = std::max( x1s ,x1t );
-        double x2 = std::min( x2s ,x2t );
-        axis_interferences.push_back( Interference( is, it, x2 - x1 ));
-
-        // to the next target and/or source cell
-        double diff2 = x2s - x2t;
-        if ( diff2 > -eps )
-          intersection = ( ++it < tgt_nb_cells[j] );
-        if ( diff2 < eps )
-          intersection = ( ++is < src_nb_cells[j] && intersection);
-      }
-    }
-
-    // ================
-    // Fill the matrix
-    // ================
-
-    switch ( dim )
-    {
-    case 3:
-      fillMatrix<MyMeshType,MatrixType,3>( interferences, result, src_nb_cells,tgt_nb_cells );
-      break;
-
-    case 2:
-      fillMatrix<MyMeshType,MatrixType,2>( interferences, result, src_nb_cells,tgt_nb_cells );
-      break;
-
-    case 1:
-      fillMatrix<MyMeshType,MatrixType,1>( interferences, result, src_nb_cells,tgt_nb_cells );
-      break;
-    }
-
-    return ret;
-  }
-}
diff --git a/src/INTERP_KERNEL/InterpolationCU.hxx b/src/INTERP_KERNEL/InterpolationCU.hxx
deleted file mode 100644
index ea73b3667..000000000
--- a/src/INTERP_KERNEL/InterpolationCU.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-//  Copyright (C) 2009-2010  OPEN CASCADE
-//
-//  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
-//
-
-// File      : InterpolationCU.hxx
-// Created   : Mon Dec 14 16:52:53 2009
-// Author    : Edward AGAPOV (eap)
-//
-#ifndef __InterpolationCU_HXX__
-#define __InterpolationCU_HXX__
-
-#include "Interpolation.hxx"
-#include "NormalizedUnstructuredMesh.hxx"
-
-namespace INTERP_KERNEL
-{
-  class InterpolationCU : public Interpolation< InterpolationCU >
-  {
-  public:
-    InterpolationCU();
-    InterpolationCU(const InterpolationOptions & io);
-
-    template<class MyCMeshType, class MyUMeshType, class MatrixType>
-    int interpolateMeshes(const MyCMeshType& meshS, const MyUMeshType& meshT, MatrixType& result, const char *method);
-
-    template<class MyUMeshType, class MyCMeshType, class MatrixType>
-    int interpolateMeshesRev(const MyUMeshType& meshS, const MyCMeshType& meshT, MatrixType& result, const char *method);
-
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/InterpolationCU.txx b/src/INTERP_KERNEL/InterpolationCU.txx
deleted file mode 100644
index 18d09ef97..000000000
--- a/src/INTERP_KERNEL/InterpolationCU.txx
+++ /dev/null
@@ -1,237 +0,0 @@
-//  Copyright (C) 2009-2010  OPEN CASCADE
-//
-//  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
-//
-// File      : InterpolationCU.txx
-// Created   : Mon Dec 14 17:30:25 2009
-// Author    : Edward AGAPOV (eap)
-
-#ifndef __InterpolationCU_TXX__
-#define __InterpolationCU_TXX__
-
-#include "InterpolationCU.hxx"
-
-#include "Interpolation.txx"
-#include "IntersectorCU1D.txx"
-#include "IntersectorCU2D.txx"
-#include "IntersectorCU3D.txx"
-
-#include <map>
-
-// // convert index "From Mesh Index"
-#define _FMIU(i) OTT<typename MyUMeshType::MyConnType,MyUMeshType::My_numPol>::ind2C((i))
-#define _FMIC(i) OTT<typename MyCMeshType::MyConnType,MyCMeshType::My_numPol>::ind2C((i))
-// convert index "To Mesh Index"
-#define _TMIU(i) OTT<typename MyUMeshType::MyConnType,MyUMeshType::My_numPol>::indFC((i))
-#define _TMIC(i) OTT<typename MyCMeshType::MyConnType,MyCMeshType::My_numPol>::indFC((i))
-// convert coord "From Mesh Coord"
-#define _FMCOO(i) OTT<typename MyUMeshType::MyConnType,MyUMeshType::My_numPol>::coo2C((i))
-// convert connectivity "From Mesh Connectivity"
-#define _FMCON(i) OTT<typename MyUMeshType::MyConnType,MyUMeshType::My_numPol>::conn2C((i))
-
-namespace INTERP_KERNEL
-{
-  /**
-   * \defgroup InterpolationCU InterpolationCU
-   * \class InterpolationCU
-   * \brief Class used to calculate the volumes of intersection between the elements of a cartesian and an unstructured  meshes.
-   * 
-   */
-  //================================================================================
-  /**
-   * Default constructor
-   * 
-   */
-  //================================================================================
-
-  InterpolationCU::InterpolationCU()
-  {
-  }
-
-  InterpolationCU::InterpolationCU(const InterpolationOptions & io)
-    :Interpolation<InterpolationCU>(io)
-  {
-  }
-
-  //================================================================================
-  /**
-   * Calculates the matrix of volumes of intersection between the elements of srcMesh and the elements of targetMesh.
-   * The calculation is done in two steps. First a filtering process reduces the number of pairs of elements for which the
-   * calculation must be carried out by eliminating pairs that do not intersect based on their bounding boxes. Then, the 
-   * volume of intersection is calculated for the remaining pairs, and entered into the
-   * intersection matrix. 
-   * 
-   * The matrix is partially sparse : it is a vector of maps of integer - double pairs. 
-   * It can also be an INTERP_KERNEL::Matrix object.
-   * The length of the vector is equal to the number of target elements - for each target element there is a map, regardless
-   * of whether the element intersects any source elements or not. But in the maps there are only entries for those source elements
-   * which have a non-zero intersection volume with the target element. The vector has indices running from 
-   * 0 to (nb target elements - 1), meaning that the map for target element i is stored at index i - 1. In the maps, however,
-   * the indexing is more natural : the intersection volume of the target element i with source element j is found at matrix[i-1][j].
-   * 
-
-   * @param srcMesh     cartesian source mesh
-   * @param targetMesh  unstructured target mesh
-   * @param result      matrix in which the result is stored 
-   * @param method      interpolation method
-   */
-  //================================================================================
-
-  template<class MyCMeshType, class MyUMeshType, class MatrixType>
-  int InterpolationCU::interpolateMeshes(const MyCMeshType& src_mesh,
-                                         const MyUMeshType& tgt_mesh,
-                                         MatrixType&        result,
-                                         const char *       method)
-  {
-    typedef typename MyUMeshType::MyConnType ConnType;
-    typedef typename MyCMeshType::MyConnType CConnType;
-
-    if ( std::string("P0P0") != method )
-      throw Exception("Only P0P0 method is implemented so far");
-    if ( MyCMeshType::MY_SPACEDIM != MyUMeshType::MY_SPACEDIM ||
-         MyCMeshType::MY_SPACEDIM != MyUMeshType::MY_MESHDIM )
-      throw Exception("InterpolationCU::interpolateMeshes(): dimension of meshes must be same");
-
-    const double eps = getPrecision();
-    const int dim = MyCMeshType::MY_SPACEDIM;
-
-    TargetIntersector<MyCMeshType, MatrixType>* intersector = 0;
-    switch( dim )
-      {
-      case 1: intersector = new IntersectorCU1D<MyCMeshType, MyUMeshType, MatrixType>( src_mesh, tgt_mesh ); break;
-      case 2: intersector = new IntersectorCU2D<MyCMeshType, MyUMeshType, MatrixType>( src_mesh, tgt_mesh ); break;
-      case 3: intersector = new IntersectorCU3D<MyCMeshType, MyUMeshType, MatrixType>( src_mesh, tgt_mesh, getSplittingPolicy() ); break;
-      }
-    // create empty maps for all target elements
-    result.resize( intersector->getNumberOfRowsOfResMatrix() );
-    const int ret = intersector->getNumberOfColsOfResMatrix();
-
-    const double* src_coords[ dim ];
-    int        src_nb_coords[ dim ];
-    std::map< double, int> src_coord_to_index[ dim ];
-    for ( int j = 0; j < dim; ++j )
-      {
-        src_coords   [j] = src_mesh.getCoordsAlongAxis( _TMIC( j ));
-        src_nb_coords[j] = src_mesh.nbCellsAlongAxis  ( _TMIC( j )) + 1;
-        for (int i = 0; i < src_nb_coords[j]; ++i )
-          src_coord_to_index[j].insert( std::make_pair( src_coords[j][i], i ));
-      }
-
-    const unsigned long tgtu_nb_cells = tgt_mesh.getNumberOfElements();
-
-    IntersectorCU<MyCMeshType, MyUMeshType, MatrixType> bbHelper(src_mesh, tgt_mesh);
-    double bb[2*dim];
-
-    // loop on unstructured tgt cells
-
-    for(unsigned int iT=0; iT<tgtu_nb_cells; iT++)
-      {
-        result[ iT ].clear();
-
-        // get bounding box of target cell
-        bbHelper.getUElemBB( bb, _TMIU(iT));
-
-        bool doItersect = true;
-        for ( int j = 0; j < dim && doItersect; ++j )
-          doItersect =
-            bb[j*2]   < src_coords[j][ src_nb_coords[0]-1 ] - eps &&
-            bb[j*2+1] > src_coords[j][0] + eps;
-        if ( !doItersect )
-          continue; // no intersection
-
-        // find structured src cells intersecting iT cell
-        std::vector< std::vector< CConnType > > structIndices(1);
-        std::map< double, int>::iterator coo_ind;
-        for ( int j = 0; j < dim; ++j )
-          {
-            coo_ind = src_coord_to_index[j].lower_bound( bb[2*j+1] - eps );
-            if ( coo_ind == src_coord_to_index[j].end() )
-              --coo_ind;
-            int max_i = coo_ind->second;
-
-            coo_ind = src_coord_to_index[j].upper_bound( bb[2*j  ] + eps );
-            if ( coo_ind != src_coord_to_index[j].begin() )
-              --coo_ind;
-            int min_i = coo_ind->second;
-
-            std::vector< std::vector< CConnType > > newStructIndices;
-            for ( unsigned int iInd = 0; iInd < structIndices.size(); ++iInd )
-              {
-                for ( int i = min_i; i < max_i; ++i )
-                  {
-                    std::vector< CConnType > index = structIndices[iInd];
-                    index.push_back( i );
-                    newStructIndices.push_back( index );
-                  }
-              }
-            structIndices.swap( newStructIndices );
-          }
-
-        // perform intersection
-
-        for ( unsigned int iInd = 0; iInd < structIndices.size(); ++iInd )
-          intersector->intersectCells( iT, structIndices[iInd], result );
-      }
-    delete intersector;
-    return ret;
-  }
-
-  //================================================================================
-  /**
-   * Calculates the matrix of volumes of intersection between the elements of srcMesh and the elements of targetMesh.
-   * The calculation is done in two steps. First a filtering process reduces the number of pairs of elements for which the
-   * calculation must be carried out by eliminating pairs that do not intersect based on their bounding boxes. Then, the 
-   * volume of intersection is calculated for the remaining pairs, and entered into the
-   * intersection matrix. 
-   * 
-   * The matrix is partially sparse : it is a vector of maps of integer - double pairs. 
-   * It can also be an INTERP_KERNEL::Matrix object.
-   * The length of the vector is equal to the number of target elements - for each target element there is a map, regardless
-   * of whether the element intersects any source elements or not. But in the maps there are only entries for those source elements
-   * which have a non-zero intersection volume with the target element. The vector has indices running from 
-   * 0 to (nb target elements - 1), meaning that the map for target element i is stored at index i - 1. In the maps, however,
-   * the indexing is more natural : the intersection volume of the target element i with source element j is found at matrix[i-1][j].
-   * 
-
-   * @param srcMesh     2-dimesional unstructured target mesh
-   * @param targetMesh  2-dimensional cartesian source mesh
-   * @param result      matrix in which the result is stored 
-   * @param method      interpolation method
-   */
-  //================================================================================
-
-  template<class MyUMeshType, class MyCMeshType, class MatrixType>
-  int InterpolationCU::interpolateMeshesRev(const MyUMeshType& meshS, const MyCMeshType& meshT, MatrixType& result, const char *method)
-  {
-    MatrixType revResult;
-    int sizeT = interpolateMeshes( meshT, meshS, revResult, method );
-    int sizeS = revResult.size();
-    result.resize( sizeT );
-
-    for ( int iS = 0; iS < sizeS; ++iS )
-      {
-        typename MatrixType::value_type & row = revResult[iS];
-        typename MatrixType::value_type::iterator iT_surf = row.begin();
-        for ( ; iT_surf != row.end(); ++iT_surf )
-          result[ iT_surf->first ][ iS ] = iT_surf->second;
-      }
-    return sizeS;
-  }
-
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/InterpolationCurve.hxx b/src/INTERP_KERNEL/InterpolationCurve.hxx
deleted file mode 100644
index 0c3f11ad3..000000000
--- a/src/INTERP_KERNEL/InterpolationCurve.hxx
+++ /dev/null
@@ -1,43 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __INTERPOLATIONCURVE_HXX__
-#define __INTERPOLATIONCURVE_HXX__
-
-#include "Interpolation.hxx"
-#include "InterpolationOptions.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class RealCurve>
-  class InterpolationCurve : public Interpolation< InterpolationCurve<RealCurve> >
-  {
-  public:
-    InterpolationCurve();
-    InterpolationCurve(const InterpolationOptions & io);
-
-    // Main function to interpolate
-    template<class MyMeshType, class MatrixType>
-    int interpolateMeshes(const MyMeshType& meshS, const MyMeshType& meshT,
-                          MatrixType& result, const char *method);
-    
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/InterpolationCurve.txx b/src/INTERP_KERNEL/InterpolationCurve.txx
deleted file mode 100644
index e4b908322..000000000
--- a/src/INTERP_KERNEL/InterpolationCurve.txx
+++ /dev/null
@@ -1,176 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-#ifndef __INTERPOLATIONCURVE_TXX__
-#define __INTERPOLATIONCURVE_TXX__
-
-#include "InterpolationCurve.hxx"
-#include "InterpolationOptions.hxx"
-#include "CurveIntersectorP0P0.txx"
-#include "CurveIntersectorP1P0.txx"
-#include "CurveIntersectorP0P1.txx"
-#include "CurveIntersectorP1P1.txx"
-#include "BBTree.txx"
-
-#include <time.h>
-
-namespace INTERP_KERNEL
-{
-  /**
-   * \defgroup interpolationCurve InterpolationCurve
-   *
-   * \class InterpolationCurve
-   * \brief Class used to compute the coefficients of the interpolation matrix between 
-   * two local meshes in two dimensions.
-   */
-  template<class RealCurve>
-  InterpolationCurve<RealCurve>::InterpolationCurve()
-  {
-  }
-
-  template<class RealCurve>
-  InterpolationCurve<RealCurve>::InterpolationCurve (const InterpolationOptions& io)
-    :Interpolation< InterpolationCurve<RealCurve> >(io)
-  {
-  }
-
-  /** \brief Main function to interpolate 1D meshes.
-      \details  The algorithm proceeds in two steps: first a filtering process reduces the number of pairs of elements for which the
-      * calculation must be carried out by eliminating pairs that do not intersect based on their bounding boxes. Then, the 
-      * volume of intersection is calculated by an object of type IntersectorPlanar for the remaining pairs, and entered into the
-      * intersection matrix. 
-      * 
-      * The matrix is partially sparse : it is a vector of maps of integer - double pairs. 
-      * The length of the vector is equal to the number of target elements - for each target element there is a map, regardless
-      * of whether the element intersects any source elements or not. But in the maps there are only entries for those source elements
-      * which have a non-zero intersection volume with the target element. The vector has indices running from 
-      * 0 to (#target elements - 1), meaning that the map for target element i is stored at index i - 1. In the maps, however,
-      * the indexing is more natural : the intersection volume of the target element i with source element j is found at matrix[i-1][j].
-      * 
-   
-      * @param myMeshS  Planar source mesh
-      * @Param myMeshT  Planar target mesh
-      * @return vector containing for each element i of the source mesh, a map giving for each element j
-      *         of the target mesh which i intersects, the area of the intersection
-      *
-      */
-  template<class RealCurve>
-  template<class MyMeshType, class MatrixType>
-  int InterpolationCurve<RealCurve>::interpolateMeshes (const MyMeshType& myMeshS,
-                                                        const MyMeshType& myMeshT,
-                                                        MatrixType&       result,
-                                                        const char *      method)
-  {
-    static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-    typedef typename MyMeshType::MyConnType ConnType;
-    static const NumberingPolicy numPol = MyMeshType::My_numPol;
-
-    long global_start = clock();
-    int counter=0;   
-
-    long nbMailleS = myMeshS.getNumberOfElements();
-    long nbMailleT = myMeshT.getNumberOfElements();
-    
-    CurveIntersector<MyMeshType,MatrixType>* intersector=0;
-    std::string meth(method);
-    if(meth=="P0P0")
-      {
-        intersector = new CurveIntersectorP0P0<MyMeshType,MatrixType>
-          (myMeshT, myMeshS,
-           InterpolationOptions::getPrecision(),
-           InterpolationOptions::getBoundingBoxAdjustmentAbs(),
-           InterpolationOptions::getMedianPlane(),
-           InterpolationOptions::getPrintLevel());
-      }
-    else if(meth=="P0P1")
-      {
-        intersector = new CurveIntersectorP0P1<MyMeshType,MatrixType>
-          (myMeshT, myMeshS,
-           InterpolationOptions::getPrecision(),
-           InterpolationOptions::getBoundingBoxAdjustmentAbs(),
-           InterpolationOptions::getMedianPlane(),
-           InterpolationOptions::getPrintLevel());
-      }
-    else if(meth=="P1P0")
-      {
-        intersector = new CurveIntersectorP1P0<MyMeshType,MatrixType>
-          (myMeshT, myMeshS,
-           InterpolationOptions::getPrecision(),
-           InterpolationOptions::getBoundingBoxAdjustmentAbs(),
-           InterpolationOptions::getMedianPlane(),
-           InterpolationOptions::getPrintLevel());
-      }
-    else if(meth=="P1P1")
-      {
-        intersector = new CurveIntersectorP1P1<MyMeshType,MatrixType>
-          (myMeshT, myMeshS,
-           InterpolationOptions::getPrecision(),
-           InterpolationOptions::getBoundingBoxAdjustmentAbs(),
-           InterpolationOptions::getMedianPlane(),
-           InterpolationOptions::getPrintLevel());
-      }
-    else
-      throw INTERP_KERNEL::Exception("Invalid method specified ! Must be in : \"P0P0\" \"P0P1\" \"P1P0\" or \"P1P1\"");
-    /****************************************************************/
-    /* Create a search tree based on the bounding boxes             */
-    /* Instanciate the intersector and initialise the result vector */
-    /****************************************************************/
- 
-    long start_filtering=clock();
- 
-    std::vector<double> bbox;
-    intersector->createBoundingBoxes(myMeshS,bbox); // create the bounding boxes
-    intersector->adjustBoundingBoxes(bbox, InterpolationOptions::getBoundingBoxAdjustmentAbs());
-    BBTree<SPACEDIM,ConnType> my_tree(&bbox[0], 0, 0, nbMailleS);//creating the search structure 
-
-    long end_filtering = clock();
-
-    result.resize(intersector->getNumberOfRowsOfResMatrix());//on initialise.
-
-    /****************************************************/
-    /* Loop on the target cells - core of the algorithm */
-    /****************************************************/
-    long start_intersection = clock();
-    const ConnType *connIndxT = myMeshT.getConnectivityIndexPtr();
-    for(int iT=0; iT<nbMailleT; iT++)
-      {
-        int nb_nodesT = connIndxT[iT+1] - connIndxT[iT];
-        std::vector<int> intersecting_elems;
-        double bb[2*SPACEDIM];
-        intersector->getElemBB(bb,myMeshT,OTT<ConnType,numPol>::indFC(iT),nb_nodesT);
-        my_tree.getIntersectingElems(bb, intersecting_elems);
-        intersector->intersectCells(iT,intersecting_elems,result);
-        counter += intersecting_elems.size();
-      }
-    int ret = intersector->getNumberOfColsOfResMatrix();
-    delete intersector;
-    
-    if (InterpolationOptions::getPrintLevel() >= 1)
-      {
-        long end_intersection=clock();
-        std::cout << "Filtering time= " << end_filtering-start_filtering << std::endl;
-        std::cout << "Intersection time= " << end_intersection-start_intersection << std::endl;
-        long global_end =clock();    
-        std::cout << "Number of computed intersections = " << counter << std::endl;
-        std::cout << "Global time= " << global_end - global_start << std::endl;
-      }
-    return ret;
-  }
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/InterpolationOptions.cxx b/src/INTERP_KERNEL/InterpolationOptions.cxx
deleted file mode 100644
index 6eb93e9aa..000000000
--- a/src/INTERP_KERNEL/InterpolationOptions.cxx
+++ /dev/null
@@ -1,209 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "InterpolationOptions.hxx"
-
-const double INTERP_KERNEL::InterpolationOptions::DFT_MEDIAN_PLANE=0.5;
-
-const double INTERP_KERNEL::InterpolationOptions::DFT_SURF3D_ADJ_EPS=1.e-4;
-
-const double INTERP_KERNEL::InterpolationOptions::DFT_MAX_DIST_3DSURF_INTERSECT=-1.;
-
-const char INTERP_KERNEL::InterpolationOptions::PRECISION_STR[]="Precision";
-
-const char INTERP_KERNEL::InterpolationOptions::MEDIANE_PLANE_STR[]="MedianPlane";
-
-const char INTERP_KERNEL::InterpolationOptions::BOUNDING_BOX_ADJ_STR[]="BoundingBoxAdjustment";
-
-const char INTERP_KERNEL::InterpolationOptions::BOUNDING_BOX_ADJ_ABS_STR[]="BoundingBoxAdjustmentAbs";
-
-const char INTERP_KERNEL::InterpolationOptions::MAX_DISTANCE_3DSURF_INSECT_STR[]="MaxDistance3DSurfIntersect";
-
-const char INTERP_KERNEL::InterpolationOptions::PRINT_LEV_STR[]="PrintLevel";
-
-const char INTERP_KERNEL::InterpolationOptions::DO_ROTATE_STR[]="DoRotate";
-
-const char INTERP_KERNEL::InterpolationOptions::ORIENTATION_STR[]="Orientation";
-
-const char INTERP_KERNEL::InterpolationOptions::MEASURE_ABS_STR[]="MeasureAbs";
-
-const char INTERP_KERNEL::InterpolationOptions::INTERSEC_TYPE_STR[]="IntersectionType";
-
-const char INTERP_KERNEL::InterpolationOptions::SPLITTING_POLICY_STR[]="SplittingPolicy";
-
-const char INTERP_KERNEL::InterpolationOptions::TRIANGULATION_INTERSECT2D_STR[]="Triangulation";
-
-const char INTERP_KERNEL::InterpolationOptions::CONVEX_INTERSECT2D_STR[]="Convex";
-
-const char INTERP_KERNEL::InterpolationOptions::GEOMETRIC_INTERSECT2D_STR[]="Geometric2D";
-
-const char INTERP_KERNEL::InterpolationOptions::POINTLOCATOR_INTERSECT_STR[]="PointLocator";
-
-const char INTERP_KERNEL::InterpolationOptions::PLANAR_SPLIT_FACE_5_STR[]="PLANAR_FACE_5";
-
-const char INTERP_KERNEL::InterpolationOptions::PLANAR_SPLIT_FACE_6_STR[]="PLANAR_FACE_6";
-
-const char INTERP_KERNEL::InterpolationOptions::GENERAL_SPLIT_24_STR[]="GENERAL_24";
-
-const char INTERP_KERNEL::InterpolationOptions::GENERAL_SPLIT_48_STR[]="GENERAL_48";
-
-bool INTERP_KERNEL::InterpolationOptions::setOptionDouble(const std::string& key, double value)
-{
-  if(key==PRECISION_STR) 
-    {
-      setPrecision(value);
-      return true;
-    }
-  else if(key==MEDIANE_PLANE_STR) 
-    {
-      setMedianPlane(value);
-      return true;
-    }
-  else if(key==BOUNDING_BOX_ADJ_STR) 
-    {
-      setBoundingBoxAdjustment(value);
-      return true;
-    }
-  else if(key==BOUNDING_BOX_ADJ_ABS_STR) 
-    {
-      setBoundingBoxAdjustmentAbs(value);
-      return true;
-    }
-  else if(key==MAX_DISTANCE_3DSURF_INSECT_STR) 
-    {
-      setMaxDistance3DSurfIntersect(value);
-      return true;
-    }
-  else
-    return false;
-}
-
-bool INTERP_KERNEL::InterpolationOptions::setOptionInt(const std::string& key, int value)
-{
-  if(key==PRINT_LEV_STR) 
-    {
-      setPrintLevel(value);
-      return true;
-    }
-    else if(key==DO_ROTATE_STR) 
-      {
-        setDoRotate(value != 0);
-        return true;
-      }
-    else if(key==ORIENTATION_STR) 
-      {
-        setOrientation(value);
-        return true;
-      }
-    else if(key==MEASURE_ABS_STR)
-      {
-        bool valBool=(value!=0);
-        setMeasureAbsStatus(valBool);
-        return true;
-      }
-    else
-      return false;
-}
-
-bool INTERP_KERNEL::InterpolationOptions::setOptionString(const std::string& key, std::string& value)
-{
-  if(key==INTERSEC_TYPE_STR) 
-    {
-      if(value==TRIANGULATION_INTERSECT2D_STR)
-        {
-          setIntersectionType(INTERP_KERNEL::Triangulation);
-          return true;
-        }
-      else if(value==CONVEX_INTERSECT2D_STR)
-        {
-          setIntersectionType(INTERP_KERNEL::Convex);
-          return true;
-        }
-      else if(value==GEOMETRIC_INTERSECT2D_STR)
-        {
-          setIntersectionType(INTERP_KERNEL::Geometric2D);
-          return true;
-        }
-      else if(value==POINTLOCATOR_INTERSECT_STR)
-        {
-          setIntersectionType(INTERP_KERNEL::PointLocator);
-          return true;
-        }
-    }
-  else if(key==SPLITTING_POLICY_STR) 
-    {
-      if(value==PLANAR_SPLIT_FACE_5_STR)
-        {
-          setSplittingPolicy(INTERP_KERNEL::PLANAR_FACE_5);
-          return true;
-        }
-      else if(value==PLANAR_SPLIT_FACE_6_STR)
-        {
-          setSplittingPolicy(INTERP_KERNEL::PLANAR_FACE_6);
-          return true;
-        }
-      else if(value==GENERAL_SPLIT_24_STR)
-        {
-          setSplittingPolicy(INTERP_KERNEL::GENERAL_24);
-          return true;
-        }
-      else if(value==GENERAL_SPLIT_48_STR)
-        {
-          setSplittingPolicy(INTERP_KERNEL::GENERAL_48);
-          return true;
-        }
-      else
-        return false;
-    }
-  return false;
-}
-
-std::string INTERP_KERNEL::InterpolationOptions::filterInterpolationMethod(const std::string& meth) const
-{
-  if ( _P1P0_bary_method && meth == "P1P0" )
-    return "P1P0Bary";
-  return meth;
-}
-
-bool INTERP_KERNEL::InterpolationOptions::setInterpolationOptions(long print_level,
-                                                                  std::string intersection_type,
-                                                                  double precision,
-                                                                  double median_plane,
-                                                                  bool do_rotate,
-                                                                  double bounding_box_adjustment,
-                                                                  double bounding_box_adjustment_abs,
-                                                                  double max_distance_for_3Dsurf_intersect,
-                                                                  long orientation,
-                                                                  bool measure_abs,
-                                                                  std::string splitting_policy,
-                                                                  bool P1P0_bary_method )
-{
-  _print_level=print_level;
-  _precision=precision;
-  _median_plane=median_plane;
-  _do_rotate=do_rotate;
-  _bounding_box_adjustment=bounding_box_adjustment;
-  _bounding_box_adjustment_abs=bounding_box_adjustment_abs;
-  _max_distance_for_3Dsurf_intersect=max_distance_for_3Dsurf_intersect;
-  _orientation=orientation;
-  _measure_abs=measure_abs;
-  _P1P0_bary_method=P1P0_bary_method;
-  return(setOptionString(INTERSEC_TYPE_STR,intersection_type) && setOptionString(SPLITTING_POLICY_STR,splitting_policy));
-}
-
diff --git a/src/INTERP_KERNEL/Intersector3DP1P0Bary.hxx b/src/INTERP_KERNEL/Intersector3DP1P0Bary.hxx
deleted file mode 100644
index b47ba5ccd..000000000
--- a/src/INTERP_KERNEL/Intersector3DP1P0Bary.hxx
+++ /dev/null
@@ -1,37 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __Intersector3DP1P0Bary_HXX__
-#define __Intersector3DP1P0Bary_HXX__
-
-#include "Intersector3D.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  class Intersector3DP1P0Bary : public Intersector3D<MyMeshType,MyMatrix>
-  {
-  public:
-    Intersector3DP1P0Bary(const MyMeshType& targetMesh, const MyMeshType& srcMesh);
-    int getNumberOfRowsOfResMatrix() const;
-    int getNumberOfColsOfResMatrix() const;
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/Intersector3DP1P0Bary.txx b/src/INTERP_KERNEL/Intersector3DP1P0Bary.txx
deleted file mode 100644
index f0883fe3c..000000000
--- a/src/INTERP_KERNEL/Intersector3DP1P0Bary.txx
+++ /dev/null
@@ -1,45 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-#ifndef __Intersector3DP1P0Bary_TXX__
-#define __Intersector3DP1P0Bary_TXX__
-
-#include "Intersector3DP1P0Bary.hxx"
-#include "Intersector3D.txx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  Intersector3DP1P0Bary<MyMeshType,MyMatrix>::Intersector3DP1P0Bary(const MyMeshType& targetMesh, const MyMeshType& srcMesh):Intersector3D<MyMeshType,MyMatrix>(targetMesh,srcMesh)
-  {
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  int Intersector3DP1P0Bary<MyMeshType,MyMatrix>::getNumberOfRowsOfResMatrix() const
-  {
-    return Intersector3D<MyMeshType,MyMatrix>::_target_mesh.getNumberOfElements();
-  }
-  
-  template<class MyMeshType, class MyMatrix>
-  int Intersector3DP1P0Bary<MyMeshType,MyMatrix>::getNumberOfColsOfResMatrix() const
-  {
-    return Intersector3D<MyMeshType,MyMatrix>::_src_mesh.getNumberOfNodes();
-  }
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/Intersector3DP1P1.hxx b/src/INTERP_KERNEL/Intersector3DP1P1.hxx
deleted file mode 100644
index a6961b7f2..000000000
--- a/src/INTERP_KERNEL/Intersector3DP1P1.hxx
+++ /dev/null
@@ -1,37 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __Intersector3DP1P1_HXX__
-#define __Intersector3DP1P1_HXX__
-
-#include "Intersector3D.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  class Intersector3DP1P1 : public Intersector3D<MyMeshType,MyMatrix>
-  {
-  public:
-    Intersector3DP1P1(const MyMeshType& targetMesh, const MyMeshType& srcMesh);
-    int getNumberOfRowsOfResMatrix() const;
-    int getNumberOfColsOfResMatrix() const;
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/Intersector3DP1P1.txx b/src/INTERP_KERNEL/Intersector3DP1P1.txx
deleted file mode 100644
index c41a1d0d4..000000000
--- a/src/INTERP_KERNEL/Intersector3DP1P1.txx
+++ /dev/null
@@ -1,45 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-#ifndef __Intersector3DP1P1_TXX__
-#define __Intersector3DP1P1_TXX__
-
-#include "Intersector3DP1P1.hxx"
-#include "Intersector3D.txx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  Intersector3DP1P1<MyMeshType,MyMatrix>::Intersector3DP1P1(const MyMeshType& targetMesh, const MyMeshType& srcMesh):Intersector3D<MyMeshType,MyMatrix>(targetMesh,srcMesh)
-  {
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  int Intersector3DP1P1<MyMeshType,MyMatrix>::getNumberOfRowsOfResMatrix() const
-  {
-    return Intersector3D<MyMeshType,MyMatrix>::_target_mesh.getNumberOfNodes();
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  int Intersector3DP1P1<MyMeshType,MyMatrix>::getNumberOfColsOfResMatrix() const
-  {
-    return Intersector3D<MyMeshType,MyMatrix>::_src_mesh.getNumberOfNodes();
-  }
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/IntersectorCU.hxx b/src/INTERP_KERNEL/IntersectorCU.hxx
deleted file mode 100644
index 75c5d405e..000000000
--- a/src/INTERP_KERNEL/IntersectorCU.hxx
+++ /dev/null
@@ -1,78 +0,0 @@
-//  Copyright (C) 2009-2010  OPEN CASCADE
-//
-//  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
-//
-// File      : IntersectorCU.hxx
-// Created   : Thu Dec 17 12:30:17 2009
-// Author    : Edward AGAPOV (eap)
-//
-
-#ifndef __IntersectorCU_HXX__
-#define __IntersectorCU_HXX__
-
-#include "TargetIntersector.hxx"
-#include "NormalizedUnstructuredMesh.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyCMeshType, class MyUMeshType, class MyMatrix> class _StabIntersector;
-
-  template<class MyCMeshType, class MyUMeshType, class MyMatrix, class ConcreteIntersector=_StabIntersector<MyCMeshType,MyUMeshType,MyMatrix> >
-  class IntersectorCU : public TargetIntersector<MyCMeshType,MyMatrix>
-  {
-  public:
-    static const int SPACEDIM=MyCMeshType::MY_SPACEDIM;
-    static const int MESHDIM=MyCMeshType::MY_MESHDIM;
-    typedef typename MyUMeshType::MyConnType UConnType;
-    typedef typename MyCMeshType::MyConnType CConnType;
-  public:
-    //! \addtogroup InterpKerGrpIntCU @{
-    IntersectorCU(const MyCMeshType& meshS, const MyUMeshType& meshT);
-    //! @}
-    virtual ~IntersectorCU();
-    void getUElemBB(double* bb, UConnType iP);
-    void getUCoordinates(UConnType icell, std::vector<double>& coords);
-
-    int getNumberOfRowsOfResMatrix() const;
-    int getNumberOfColsOfResMatrix() const;
-    void intersectCells(CConnType icellU, const std::vector<CConnType>& icellC, MyMatrix& res);
-    double intersectGeometry(CConnType icellT, const std::vector<CConnType>& icellC) { return asLeaf().intersectGeometry(icellT,icellC); }
-  protected:
-    ConcreteIntersector& asLeaf() { return static_cast<ConcreteIntersector&>(*this); }
-
-  protected:
-    const UConnType *_connectU;
-    const UConnType *_connIndexU;
-    const double *  _coordsU;
-    const MyUMeshType& _meshU;
-
-    const double *     _coordsC[SPACEDIM];
-    int                _nbCellsC[SPACEDIM];
-    const MyCMeshType& _meshC;
-  };
-
-  // class to enable usage of IntersectorCU not for intersection but for access to data it encapsulates
-  template<class MyCMeshType, class MyUMeshType, class MyMatrix>
-  class _StabIntersector: public IntersectorCU<MyCMeshType, MyUMeshType, MyMatrix, _StabIntersector<MyCMeshType, MyUMeshType, MyMatrix> >
-  {
-  public:
-    _StabIntersector(const MyCMeshType& meshS, const MyUMeshType& meshT) : IntersectorCU<MyCMeshType, MyUMeshType, MyMatrix, _StabIntersector<MyCMeshType, MyUMeshType, MyMatrix> >(meshS, meshT) {}
-    double intersectGeometry(typename MyUMeshType::MyConnType icellT, const std::vector<typename MyCMeshType::MyConnType>& icellC) { throw Exception("You must provide an intersector as the 4-th template argument of IntersectorCU"); return 0; }
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/IntersectorCU.txx b/src/INTERP_KERNEL/IntersectorCU.txx
deleted file mode 100644
index f9a3155a4..000000000
--- a/src/INTERP_KERNEL/IntersectorCU.txx
+++ /dev/null
@@ -1,163 +0,0 @@
-//  Copyright (C) 2009-2010  OPEN CASCADE
-//
-//  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
-//
-// File      : IntersectorCU.txx
-// Created   : Thu Dec 17 12:30:17 2009
-// Author    : Edward AGAPOV (eap)
-//
-#ifndef __IntersectorCU_TXX__
-#define __IntersectorCU_TXX__
-
-#include "IntersectorCU.hxx"
-
-// convert index "From Mesh Index"
-#define _FMIU(i) OTT<typename MyUMeshType::MyConnType,MyUMeshType::My_numPol>::ind2C((i))
-#define _FMIC(i) OTT<typename MyCMeshType::MyConnType,MyCMeshType::My_numPol>::ind2C((i))
-// convert index "To Mesh Index"
-#define _TMIU(i) OTT<typename MyUMeshType::MyConnType,MyUMeshType::My_numPol>::indFC((i))
-#define _TMIC(i) OTT<typename MyCMeshType::MyConnType,MyCMeshType::My_numPol>::indFC((i))
-// convert coord "From Mesh Coord"
-#define _FMCOO(i) OTT<typename MyUMeshType::MyConnType,MyUMeshType::My_numPol>::coo2C((i))
-// convert connectivity "From Mesh Connectivity"
-#define _FMCON(i) OTT<typename MyUMeshType::MyConnType,MyUMeshType::My_numPol>::conn2C((i))
-
-
-#define _CU_TEMPLATE \
-template<class MyCMeshType, class MyUMeshType, class MyMatrix, class ConcreteIntersector>
-#define _INTERSECTOR_CU_ \
-IntersectorCU<MyCMeshType, MyUMeshType, MyMatrix, ConcreteIntersector>
-
-namespace INTERP_KERNEL
-{
-  //================================================================================
-  /*!
-   * \brief Constructor
-   */
-  //================================================================================
-
-  _CU_TEMPLATE
-  _INTERSECTOR_CU_::IntersectorCU(const MyCMeshType& meshS, const MyUMeshType& meshT):
-    _meshU(meshT), _meshC(meshS)
-  {
-    _connectU  =meshT.getConnectivityPtr();
-    _connIndexU=meshT.getConnectivityIndexPtr();
-    _coordsU   =meshT.getCoordinatesPtr();
-
-    for ( int j = 0; j < SPACEDIM; ++j )
-      {
-        _coordsC [ j ] = _meshC.getCoordsAlongAxis( _TMIC( j ));
-        _nbCellsC[ j ] = _meshC.nbCellsAlongAxis  ( _TMIC( j ));
-      }
-  }
-
-  //================================================================================
-  /*!
-   * \brief Destructor
-   */
-  //================================================================================
-
-  _CU_TEMPLATE
-  _INTERSECTOR_CU_::~IntersectorCU()
-  {
-  }
-
-  //================================================================================
-  /*!
-   * \brief Return bounding box of an unstructured element
-   */
-  //================================================================================
-
-  _CU_TEMPLATE
-  void _INTERSECTOR_CU_::getUElemBB(double* bb, UConnType icell)
-  {
-    //initializing bounding box limits
-    for(int idim=0; idim<SPACEDIM; idim++)
-      {
-        bb[2*idim  ] =  std::numeric_limits<double>::max();
-        bb[2*idim+1] = -std::numeric_limits<double>::max();
-      }
-
-    UConnType nb_nodes = _connIndexU[icell+1] - _connIndexU[icell];
-    for (UConnType i=0; i<nb_nodes; i++)
-      {
-        //const double* coord_node=_coordsU+SPACEDIM*(OTT<ConnType,numPol>::coo2C(conn[OTT<ConnType,numPol>::conn2C(conn_index[OTT<ConnType,numPol>::ind2C(iP)]+i)]));
-        const double* coord_node=_coordsU+SPACEDIM*(_FMCOO( _connectU[_FMCON (_connIndexU[_FMIU(icell)]+i)]));
-        for(int idim=0; idim<SPACEDIM; idim++)
-          {            
-            double x = *(coord_node+idim);
-            bb[2*idim  ] = (x<bb[2*idim  ])?x:bb[2*idim  ];
-            bb[2*idim+1] = (x>bb[2*idim+1])?x:bb[2*idim+1];
-          }
-      }
-  }
-
-  //================================================================================
-  /*!
-   * \brief Return coordinates of nodes of an unstructured element
-   */
-  //================================================================================
-
-  _CU_TEMPLATE
-  void _INTERSECTOR_CU_::getUCoordinates(UConnType icell, std::vector<double>& coords)
-  {
-    UConnType nb_nodes = _connIndexU[icell+1] - _connIndexU[icell];
-    coords.resize( SPACEDIM * nb_nodes );
-    for (UConnType i=0; i<nb_nodes; i++)
-      for(int j=0; j<SPACEDIM; j++)
-        coords[SPACEDIM*i+j]=_coordsU[SPACEDIM*_FMCOO( _connectU[_FMCON (_connIndexU[_FMIU(icell)]+i)])+j];
-  }
-
-  _CU_TEMPLATE
-  int _INTERSECTOR_CU_::getNumberOfRowsOfResMatrix() const
-  {
-    return _meshU.getNumberOfElements();
-  }
-  _CU_TEMPLATE
-  int _INTERSECTOR_CU_::getNumberOfColsOfResMatrix() const
-  {
-    return _meshC.getNumberOfElements();
-  }
-
-  //================================================================================
-  /*!
-   * \brief Intersects unstructured target cell with structured source cell given by
-   *        its indices
-   *  \param icellU - index of an unstructured element
-   *  \param icellC - i,j,k of a structured element
-   *  \param res - matrix to fill in
-   */
-  //================================================================================
-
-  _CU_TEMPLATE
-  void _INTERSECTOR_CU_::intersectCells(CConnType                     icellU,
-                                        const std::vector<CConnType>& icellC,
-                                        MyMatrix&                     res)
-  {
-    double v = intersectGeometry(icellU, icellC);
-
-    CConnType iC = icellC[0], area = _nbCellsC[0];
-    for ( int j = 1; j < SPACEDIM; ++j )
-      {
-        iC += icellC[j] * area;
-        area *= _nbCellsC[j];
-      }
-    res[ icellU ][ iC ] = v;
-  }
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/IntersectorCU1D.hxx b/src/INTERP_KERNEL/IntersectorCU1D.hxx
deleted file mode 100644
index 0da006bcb..000000000
--- a/src/INTERP_KERNEL/IntersectorCU1D.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-//  Copyright (C) 2009-2010  OPEN CASCADE
-//
-//  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
-//
-
-// File      : IntersectorCU1D.hxx
-// Created   : Thu Dec 17 14:10:00 2009
-// Author    : Edward AGAPOV (eap)
-//
-#ifndef __IntersectorCU1D_HXX__
-#define __IntersectorCU1D_HXX__
-
-#include "IntersectorCU.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyCMeshType, class MyUMeshType, class MyMatrix >
-  class IntersectorCU1D : public IntersectorCU<MyCMeshType,MyUMeshType,MyMatrix,IntersectorCU1D<MyCMeshType,MyUMeshType,MyMatrix> >
-  {
-  public:
-    typedef typename MyUMeshType::MyConnType UConnType;
-    typedef typename MyCMeshType::MyConnType CConnType;
-  public:
-    IntersectorCU1D(const MyCMeshType& meshS, const MyUMeshType& meshT);
-    ~IntersectorCU1D();
-    double intersectGeometry(UConnType icellT, const std::vector<CConnType>& icellC);
-
-  private:
-  };
-}
-
-
-#endif
diff --git a/src/INTERP_KERNEL/IntersectorCU1D.txx b/src/INTERP_KERNEL/IntersectorCU1D.txx
deleted file mode 100644
index 1eff67400..000000000
--- a/src/INTERP_KERNEL/IntersectorCU1D.txx
+++ /dev/null
@@ -1,82 +0,0 @@
-//  Copyright (C) 2009-2010  OPEN CASCADE
-//
-//  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
-//
-// File      : IntersectorCU1D.txx
-// Created   : Thu Dec 17 14:17:49 2009
-// Author    : Edward AGAPOV (eap)
-
-#ifndef __IntersectorCU1D_TXX__
-#define __IntersectorCU1D_TXX__
-
-#include "IntersectorCU1D.hxx"
-#include "IntersectorCU.txx"
-
-#define  IntersectorCU1D_TEMPLATE template<class MyCMeshType, class MyUMeshType, class MyMatrix>
-#define  INTERSECTOR_CU1D IntersectorCU1D<MyCMeshType,MyUMeshType,MyMatrix >
-#define _INTER_CU         IntersectorCU  <MyCMeshType,MyUMeshType,MyMatrix,IntersectorCU1D<MyCMeshType,MyUMeshType,MyMatrix> >
-
-namespace INTERP_KERNEL
-{
-  //================================================================================
-  /*!
-   * \brief intersector of the unstructured mesh and the cartesian mesh in 1D
-   */
-  //================================================================================
-
-  IntersectorCU1D_TEMPLATE
-  INTERSECTOR_CU1D::IntersectorCU1D(const MyCMeshType& meshS,
-                                    const MyUMeshType& meshT):
-    _INTER_CU( meshS, meshT )
-  {
-    if ( MyCMeshType::MY_SPACEDIM != 1 || MyCMeshType::MY_MESHDIM != 1 ||
-         MyUMeshType::MY_SPACEDIM != 1 || MyUMeshType::MY_MESHDIM != 1 )
-      throw Exception("IntersectorCU1D(): Invalid mesh dimension, it must be 1");
-  }
-
-  //================================================================================
-  /*!
-   * \brief destructor
-   */
-  //================================================================================
-
-  IntersectorCU1D_TEMPLATE
-  INTERSECTOR_CU1D::~IntersectorCU1D()
-  {
-  }
-
-  //================================================================================
-  /*!
-   * \brief Calculate length of intersection of an unstructured cell and a cartesian one.
-   * The cartesian cell is given by its [i,j,k] indices
-   */
-  //================================================================================
-
-  IntersectorCU1D_TEMPLATE
-  double INTERSECTOR_CU1D::intersectGeometry(UConnType                     icellT,
-                                             const std::vector<CConnType>& icellS)
-  {
-    std::vector<double> coordsU;
-    _INTER_CU::getUCoordinates(icellT, coordsU);
-
-    const double* coordsC = & _INTER_CU::_coordsC[0][ _FMIC(icellS[0]) ];
-
-    double res = std::min( coordsU[1], coordsC[1] ) - std::max( coordsU[0], coordsC[0] );
-    return res;
-  }
-}
-#endif
diff --git a/src/INTERP_KERNEL/IntersectorCU2D.hxx b/src/INTERP_KERNEL/IntersectorCU2D.hxx
deleted file mode 100644
index b6f335c2a..000000000
--- a/src/INTERP_KERNEL/IntersectorCU2D.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-//  Copyright (C) 2009-2010  OPEN CASCADE
-//
-//  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
-//
-
-// File      : IntersectorCU2D.hxx
-// Created   : Thu Dec 17 14:10:00 2009
-// Author    : Edward AGAPOV (eap)
-//
-#ifndef __IntersectorCU2D_HXX__
-#define __IntersectorCU2D_HXX__
-
-#include "IntersectorCU.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyCMeshType, class MyUMeshType, class MyMatrix >
-  class IntersectorCU2D : public IntersectorCU<MyCMeshType,MyUMeshType,MyMatrix,IntersectorCU2D<MyCMeshType,MyUMeshType,MyMatrix> >
-  {
-  public:
-    typedef typename MyUMeshType::MyConnType UConnType;
-    typedef typename MyCMeshType::MyConnType CConnType;
-  public:
-    IntersectorCU2D(const MyCMeshType& meshS, const MyUMeshType& meshT);
-    double intersectGeometry(UConnType icellT, const std::vector<CConnType>& icellC);
-
-  private:
-    TriangulationIntersector<MyUMeshType,MyMatrix,PlanarIntersectorP0P0> _intersector;
-  };
-}
-
-
-#endif
diff --git a/src/INTERP_KERNEL/IntersectorCU2D.txx b/src/INTERP_KERNEL/IntersectorCU2D.txx
deleted file mode 100644
index e6174d823..000000000
--- a/src/INTERP_KERNEL/IntersectorCU2D.txx
+++ /dev/null
@@ -1,76 +0,0 @@
-//  Copyright (C) 2009-2010  OPEN CASCADE
-//
-//  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
-//
-// File      : IntersectorCU2D.txx
-// Created   : Thu Dec 17 14:17:49 2009
-// Author    : Edward AGAPOV (eap)
-
-#ifndef __IntersectorCU2D_TXX__
-#define __IntersectorCU2D_TXX__
-
-#include "IntersectorCU2D.hxx"
-#include "IntersectorCU.txx"
-
-#define IntersectorCU2D_TEMPLATE template<class MyCMeshType, class MyUMeshType, class MyMatrix>
-#define INTERSECTOR_CU2D IntersectorCU2D<MyCMeshType, MyUMeshType, MyMatrix >
-#define INTER_CU IntersectorCU<MyCMeshType,MyUMeshType,MyMatrix,IntersectorCU2D<MyCMeshType,MyUMeshType,MyMatrix> >
-
-
-namespace INTERP_KERNEL
-{
-  IntersectorCU2D_TEMPLATE
-  INTERSECTOR_CU2D::IntersectorCU2D(const MyCMeshType& meshS,
-                                    const MyUMeshType& meshT):
-    IntersectorCU<MyCMeshType, MyUMeshType, MyMatrix, IntersectorCU2D<MyCMeshType,MyUMeshType,MyMatrix> >( meshS, meshT ),
-    _intersector(meshT, meshT, 0,0,0,0,0,0 )
-  {
-    if ( MyCMeshType::MY_SPACEDIM != 2 || MyCMeshType::MY_MESHDIM != 2 ||
-         MyUMeshType::MY_SPACEDIM != 2 || MyUMeshType::MY_MESHDIM != 2 )
-      throw Exception("IntersectorCU2D(): Invalid mesh dimension, it must be 2");
-  }
-
-
-  //================================================================================
-  /*!
-   * \brief Calculate area of intersection of an unstructured cell and a cartesian one.
-   * The cartesian cell is given by its [i,j] indices
-   */
-  //================================================================================
-
-  IntersectorCU2D_TEMPLATE
-  double INTERSECTOR_CU2D::intersectGeometry(UConnType                     icellT,
-                                             const std::vector<CConnType>& icellS)
-  {
-    std::vector<double> uCoords;
-    getUCoordinates( icellT, uCoords );
-
-    NormalizedCellType tT = INTER_CU::_meshU.getTypeOfElement( _TMIU(icellT));
-    bool is_tgt_quad = CellModel::getCellModel(tT).isQuadratic();
-
-    double quad[8] = { INTER_CU::_coordsC[0][icellS[0]],   INTER_CU::_coordsC[1][icellS[1]],
-                       INTER_CU::_coordsC[0][icellS[0]+1], INTER_CU::_coordsC[1][icellS[1]], 
-                       INTER_CU::_coordsC[0][icellS[0]+1], INTER_CU::_coordsC[1][icellS[1]+1], 
-                       INTER_CU::_coordsC[0][icellS[0]],   INTER_CU::_coordsC[1][icellS[1]+1] };
-
-    double surf = _intersector.intersectGeometryWithQuadrangle( quad,
-                                                                uCoords,
-                                                                is_tgt_quad);
-    return surf;
-  }
-}
-#endif
diff --git a/src/INTERP_KERNEL/IntersectorCU3D.hxx b/src/INTERP_KERNEL/IntersectorCU3D.hxx
deleted file mode 100644
index c74565220..000000000
--- a/src/INTERP_KERNEL/IntersectorCU3D.hxx
+++ /dev/null
@@ -1,55 +0,0 @@
-//  Copyright (C) 2009-2010  OPEN CASCADE
-//
-//  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
-//
-
-// File      : IntersectorCU3D.hxx
-// Created   : Thu Dec 17 14:10:00 2009
-// Author    : Edward AGAPOV (eap)
-//
-#ifndef __IntersectorCU3D_HXX__
-#define __IntersectorCU3D_HXX__
-
-#include "IntersectorCU.hxx"
-#include "SplitterTetra.hxx"
-
-namespace INTERP_KERNEL
-{
-  class _Cartesian3D2UnstructHexMesh;
-
-  template<class MyCMeshType, class MyUMeshType, class MyMatrix >
-  class IntersectorCU3D : public IntersectorCU<MyCMeshType,MyUMeshType,MyMatrix,IntersectorCU3D<MyCMeshType,MyUMeshType,MyMatrix> >
-  {
-  public:
-    typedef typename MyUMeshType::MyConnType UConnType;
-    typedef typename MyCMeshType::MyConnType CConnType;
-  public:
-    IntersectorCU3D(const MyCMeshType& meshS, const MyUMeshType& meshT, SplittingPolicy splitting_policy);
-    ~IntersectorCU3D();
-    double intersectGeometry(UConnType icellT, const std::vector<CConnType>& icellC);
-
-  private:
-
-    typedef SplitterTetra2<MyUMeshType, _Cartesian3D2UnstructHexMesh > TSplitter;
-    typedef SplitterTetra <_Cartesian3D2UnstructHexMesh >              TTetra;
-    _Cartesian3D2UnstructHexMesh* _uHexMesh;
-    TSplitter*                    _split;
-  };
-}
-
-
-#endif
diff --git a/src/INTERP_KERNEL/IntersectorCU3D.txx b/src/INTERP_KERNEL/IntersectorCU3D.txx
deleted file mode 100644
index 6a94f91a9..000000000
--- a/src/INTERP_KERNEL/IntersectorCU3D.txx
+++ /dev/null
@@ -1,156 +0,0 @@
-//  Copyright (C) 2009-2010  OPEN CASCADE
-//
-//  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
-//
-// File      : IntersectorCU3D.txx
-// Created   : Thu Dec 17 14:17:49 2009
-// Author    : Edward AGAPOV (eap)
-
-#ifndef __IntersectorCU3D_TXX__
-#define __IntersectorCU3D_TXX__
-
-#include "IntersectorCU3D.hxx"
-#include "IntersectorCU.txx"
-#include "SplitterTetra.txx"
-
-#define  IntersectorCU3D_TEMPLATE template<class MyCMeshType, class MyUMeshType, class MyMatrix>
-#define  INTERSECTOR_CU3D IntersectorCU3D<MyCMeshType,MyUMeshType,MyMatrix >
-#define _INTERSECTOR_CU   IntersectorCU  <MyCMeshType,MyUMeshType,MyMatrix,IntersectorCU3D<MyCMeshType,MyUMeshType,MyMatrix> >
-
-namespace INTERP_KERNEL
-{
-  //================================================================================
-  /*!
-   * \brief Unstructured hexahedral mesh derived from cartesian 3D mesh.
-   *        Mesh contains one HEXA8 element
-   */
-  //================================================================================
-
-  class _Cartesian3D2UnstructHexMesh : public INTERP_KERNEL::GenericMesh
-  {
-  public:
-    static const int MY_SPACEDIM=3;
-    static const int MY_MESHDIM=3;
-    typedef int MyConnType;
-    static const NumberingPolicy My_numPol=ALL_C_MODE;
-
-    _Cartesian3D2UnstructHexMesh(const double * coords[3]): _coordsC(coords) {}
-    void setHexa(int I, int J, int K) // indices in C mode
-    {
-      double* pCoord = _coordsU;
-      for ( int k = K; k < K+2; ++k )
-        for ( int j = J; j < J+2; ++j )
-          for ( int i = I; i < I+2; ++i )
-            {
-              *pCoord++ = _coordsC[0][i];
-              *pCoord++ = _coordsC[1][j];
-              *pCoord++ = _coordsC[2][k];
-            }
-    }
-    const int *getConnectivityPtr() const
-    {
-      static int conn[] = { 1,0,2,3,5,4,6,7 };
-      return conn;
-    }
-    const int *getConnectivityIndexPtr() const
-    {
-      static int conInd[] = { 0,8 };
-      return conInd;
-    }
-    void getBoundingBox(double *boundingBox) const
-    {
-      boundingBox[BoundingBox::XMIN] = _coordsU[0];
-      boundingBox[BoundingBox::XMAX] = _coordsU[0+1*MY_SPACEDIM];
-      boundingBox[BoundingBox::YMIN] = _coordsU[1];
-      boundingBox[BoundingBox::YMAX] = _coordsU[1+2*MY_SPACEDIM];
-      boundingBox[BoundingBox::ZMIN] = _coordsU[2];
-      boundingBox[BoundingBox::ZMAX] = _coordsU[2+4*MY_SPACEDIM];
-    }
-    NormalizedCellType getTypeOfElement(int eltId) const { return NORM_HEXA8; }
-    unsigned char getNumberOfNodesOfElement(int eltId) const { return 8; }
-    unsigned long getNumberOfElements() const { return 1; }
-    unsigned long getNumberOfNodes()    const { return 8; }
-    const double *getCoordinatesPtr()   const { return _coordsU; }
-    void releaseTempArrays() {}
-  private:
-    const double** _coordsC;
-    double         _coordsU[3*8];
-  };
-
-  //================================================================================
-  /*!
-   * \brief intersector of the unstructured mesh and the cartesian mesh in 3D
-   */
-  //================================================================================
-
-  IntersectorCU3D_TEMPLATE
-  INTERSECTOR_CU3D::IntersectorCU3D(const MyCMeshType& meshS,
-                                    const MyUMeshType& meshT,
-                                    SplittingPolicy    splitting_policy):
-    _INTERSECTOR_CU( meshS, meshT )
-  {
-    if ( MyCMeshType::MY_SPACEDIM != 3 || MyCMeshType::MY_MESHDIM != 3 ||
-         MyUMeshType::MY_SPACEDIM != 3 || MyUMeshType::MY_MESHDIM != 3 )
-      throw Exception("IntersectorCU3D(): Invalid mesh dimension, it must be 3");
-
-    _uHexMesh = new _Cartesian3D2UnstructHexMesh( _INTERSECTOR_CU::_coordsC );
-    _split    = new TSplitter( meshT, *_uHexMesh, splitting_policy );
-  }
-
-  //================================================================================
-  /*!
-   * \brief destructor
-   */
-  //================================================================================
-
-  IntersectorCU3D_TEMPLATE
-  INTERSECTOR_CU3D::~IntersectorCU3D()
-  {
-    delete _uHexMesh; _uHexMesh=0;
-    delete _split; _split=0;
-  }
-
-  //================================================================================
-  /*!
-   * \brief Calculate volume of intersection of an unstructured cell and a cartesian one.
-   * The cartesian cell is given by its [i,j,k] indices
-   */
-  //================================================================================
-
-  IntersectorCU3D_TEMPLATE
-  double INTERSECTOR_CU3D::intersectGeometry(UConnType                     icellT,
-                                             const std::vector<CConnType>& icellS)
-  {
-    // split an unstructured cell into tetra
-    std::vector< TTetra* > tetra;
-    UConnType nb_nodes =
-      _INTERSECTOR_CU::_connIndexU[icellT+1] - _INTERSECTOR_CU::_connIndexU[icellT];
-    _split->releaseArrays();
-    _split->splitTargetCell( icellT, nb_nodes, tetra);
-
-    // intersect a cartesian 3d cell with tetra
-    _uHexMesh->setHexa( _FMIC(icellS[0]),_FMIC(icellS[1]),_FMIC(icellS[2])); // set cell at i,j,k
-    double res = 0;
-    for ( unsigned int t = 0; t < tetra.size(); ++t )
-      {
-        res += tetra[t]->intersectSourceCell( 0 );
-        delete tetra[t];
-      }
-    return res;
-  }
-}
-#endif
diff --git a/src/INTERP_KERNEL/PlanarIntersectorP0P1PL.hxx b/src/INTERP_KERNEL/PlanarIntersectorP0P1PL.hxx
deleted file mode 100644
index 8426e7e6e..000000000
--- a/src/INTERP_KERNEL/PlanarIntersectorP0P1PL.hxx
+++ /dev/null
@@ -1,43 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __PLANARINTERSECTORP0P1PL_HXX__
-#define __PLANARINTERSECTORP0P1PL_HXX__
-
-#include "PlanarIntersector.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  class PlanarIntersectorP0P1PL : public PlanarIntersector<MyMeshType,MyMatrix>
-  {
-   public:
-    static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-    static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    typedef typename MyMeshType::MyConnType ConnType;
-    static const NumberingPolicy numPol=MyMeshType::My_numPol;
-  public:
-    PlanarIntersectorP0P1PL(const MyMeshType& meshT, const MyMeshType& meshS, double dimCaracteristic, double md3DSurf, double medianPlane, double precision, int orientation);
-    void intersectCells(ConnType icellT, const std::vector<ConnType>& icellsS, MyMatrix& res);
-    int getNumberOfRowsOfResMatrix() const;
-    int getNumberOfColsOfResMatrix() const;
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PlanarIntersectorP0P1PL.txx b/src/INTERP_KERNEL/PlanarIntersectorP0P1PL.txx
deleted file mode 100644
index 29dba1bb9..000000000
--- a/src/INTERP_KERNEL/PlanarIntersectorP0P1PL.txx
+++ /dev/null
@@ -1,83 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-#ifndef __PLANARINTERSECTORP0P1PL_TXX__
-#define __PLANARINTERSECTORP0P1PL_TXX__
-
-#include "PlanarIntersectorP0P1PL.hxx"
-#include "PlanarIntersector.txx"
-#include "CellModel.hxx"
-
-#include "PointLocatorAlgos.txx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  PlanarIntersectorP0P1PL<MyMeshType,MyMatrix>::PlanarIntersectorP0P1PL(const MyMeshType& meshT, const MyMeshType& meshS,
-                                                                        double dimCaracteristic, double md3DSurf,
-                                                                        double medianPlane, double precision, int orientation):
-    PlanarIntersector<MyMeshType,MyMatrix>(meshT,meshS,dimCaracteristic,precision,md3DSurf,medianPlane,true,orientation,0)
-  {
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  void PlanarIntersectorP0P1PL<MyMeshType,MyMatrix>::intersectCells(ConnType icellT, const std::vector<ConnType>& icellsS, MyMatrix& res)
-  {
-    std::vector< std::vector<double> > coordsOfSources(icellsS.size());
-    int ii=0;
-    for(typename std::vector<ConnType>::const_iterator iter=icellsS.begin();iter!=icellsS.end();iter++,ii++)
-      PlanarIntersector<MyMeshType,MyMatrix>::getRealSourceCoordinates(OTT<ConnType,numPol>::indFC(*iter),coordsOfSources[ii]);
-    const ConnType *startOfCellNodeConnT=PlanarIntersector<MyMeshType,MyMatrix>::_connectT+OTT<ConnType,numPol>::conn2C(PlanarIntersector<MyMeshType,MyMatrix>::_connIndexT[icellT]);
-    std::vector<double> coordsTarget;
-    PlanarIntersector<MyMeshType,MyMatrix>::getRealTargetCoordinates(OTT<ConnType,numPol>::indFC(icellT),coordsTarget);
-    int nbNodesT=coordsTarget.size()/SPACEDIM;
-    ii=0;
-    for(typename std::vector<ConnType>::const_iterator iter2=icellsS.begin();iter2!=icellsS.end();iter2++,ii++)
-      {
-        std::vector<double> tmpSource(coordsOfSources[ii]);
-        std::vector<double> tmpTarget(coordsTarget);
-        if(SPACEDIM==3)
-          PlanarIntersector<MyMeshType,MyMatrix>::projectionThis(&tmpSource[0],&tmpTarget[0],tmpSource.size()/SPACEDIM,nbNodesT);
-        for(int nodeIdT=0;nodeIdT<nbNodesT;nodeIdT++)
-          {
-            if(PointLocatorAlgos<MyMeshType>::isElementContainsPointAlg2D(&tmpTarget[0]+nodeIdT*SPACEDIM,&tmpSource[0],tmpSource.size()/SPACEDIM,PlanarIntersector<MyMeshType,MyMatrix>::_precision))
-              {
-                ConnType curNodeTInCmode=OTT<ConnType,numPol>::coo2C(startOfCellNodeConnT[nodeIdT]);
-                typename MyMatrix::value_type& resRow=res[curNodeTInCmode];
-                typename MyMatrix::value_type::const_iterator iterRes=resRow.find(OTT<ConnType,numPol>::indFC(*iter2));
-                if(iterRes==resRow.end())
-                  resRow.insert(std::make_pair(OTT<ConnType,numPol>::indFC(*iter2),1.));
-              }
-          }
-      }
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  int PlanarIntersectorP0P1PL<MyMeshType,MyMatrix>::getNumberOfRowsOfResMatrix() const
-  {
-    return PlanarIntersector<MyMeshType,MyMatrix>::_meshT.getNumberOfNodes();
-  }
-  
-  template<class MyMeshType, class MyMatrix>
-  int PlanarIntersectorP0P1PL<MyMeshType,MyMatrix>::getNumberOfColsOfResMatrix() const
-  {
-    return PlanarIntersector<MyMeshType,MyMatrix>::_meshS.getNumberOfElements();
-  }
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P0Bary.hxx b/src/INTERP_KERNEL/PlanarIntersectorP1P0Bary.hxx
deleted file mode 100644
index d58cffc9c..000000000
--- a/src/INTERP_KERNEL/PlanarIntersectorP1P0Bary.hxx
+++ /dev/null
@@ -1,54 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __PlanarIntersectorP1P0Bary_HXX__
-#define __PlanarIntersectorP1P0Bary_HXX__
-
-#include "PlanarIntersector.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix, class ConcreteP1P0Intersector>
-  class PlanarIntersectorP1P0Bary : public PlanarIntersector<MyMeshType,MyMatrix>
-  {
-  public:
-    static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-    static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    typedef typename MyMeshType::MyConnType ConnType;
-    static const NumberingPolicy numPol=MyMeshType::My_numPol;
-  protected:
-    PlanarIntersectorP1P0Bary(const MyMeshType& meshT, const MyMeshType& meshS, double dimCaracteristic, double precision, double md3DSurf, double medianPlane, bool doRotate, int orientation, int printLevel);
-  public:
-    void intersectCells(ConnType icellT, const std::vector<ConnType>& icellsS, MyMatrix& res);
-    int getNumberOfRowsOfResMatrix() const;
-    int getNumberOfColsOfResMatrix() const;
-    /*!
-     * Contrary to intersectCells method here icellS and icellT are \b not in \b C mode but in mode of MyMeshType.
-     */
-    double intersectGeoBary(const std::vector<double>& targetCell,
-                            bool                       targetCellQuadratic,
-                            const double *             sourceTria,
-                            std::vector<double>&       res)
-    { return asLeaf().intersectGeoBary(targetCell,targetCellQuadratic,sourceTria,res); }
-  protected:
-    ConcreteP1P0Intersector& asLeaf() { return static_cast<ConcreteP1P0Intersector&>(*this); }
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P0Bary.txx b/src/INTERP_KERNEL/PlanarIntersectorP1P0Bary.txx
deleted file mode 100644
index dd59b8c42..000000000
--- a/src/INTERP_KERNEL/PlanarIntersectorP1P0Bary.txx
+++ /dev/null
@@ -1,116 +0,0 @@
-//  Copyright (C) 2007-2010  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
-#ifndef __PlanarIntersectorP1P0Bary_TXX__
-#define __PlanarIntersectorP1P0Bary_TXX__
-
-#include "PlanarIntersectorP1P0Bary.hxx"
-#include "InterpolationUtils.hxx"
-
-#define PLAN_INTERSECTOR PlanarIntersectorP1P0Bary<MyMeshType,MyMatrix,ConcreteP1P0Intersector>
-#define PLAN_INTER_TEMPLATE template<class MyMeshType, class MyMatrix, class ConcreteP1P0Intersector>
-
-namespace INTERP_KERNEL
-{
-  PLAN_INTER_TEMPLATE
-  PLAN_INTERSECTOR::PlanarIntersectorP1P0Bary(const MyMeshType& meshT, const MyMeshType& meshS,
-                                              double dimCaracteristic, double precision,
-                                              double md3DSurf, double medianPlane,
-                                              bool doRotate, int orientation, int printLevel):
-    PlanarIntersector<MyMeshType,MyMatrix>(meshT,meshS,dimCaracteristic,precision,md3DSurf,
-                                           medianPlane,doRotate,orientation,printLevel)
-  {
-    // SPEC:
-    // "Limitation. For the P1P0 barycentric improvement only triangle source cells in 2D and
-    // tetrahedrons in 3D will be supported by interpolators. If a non
-    // triangle/tetrahedron source cell is detected an INTERP_KERNEL::Exception should be thrown."
-
-    // Check types of source elements here rather than in intersectCells() since a wrong type can be
-    // found late after a long time of calculation.
-
-    const unsigned long numSrcElems = meshS.getNumberOfElements();
-    for(unsigned long i = 0 ; i < numSrcElems ; ++i)
-      if ( meshS.getTypeOfElement( OTT<ConnType,numPol>::indFC( i )) != NORM_TRI3 )
-        throw INTERP_KERNEL::Exception("P1P0 barycentric algorithm works only with triangular source meshes");
-  }
-
-  PLAN_INTER_TEMPLATE
-  int PLAN_INTERSECTOR::getNumberOfRowsOfResMatrix() const
-  {
-    return PlanarIntersector<MyMeshType,MyMatrix>::_meshT.getNumberOfElements();
-  }
-
-  PLAN_INTER_TEMPLATE
-  int PLAN_INTERSECTOR::getNumberOfColsOfResMatrix() const
-  {
-    return PlanarIntersector<MyMeshType,MyMatrix>::_meshS.getNumberOfNodes();
-  }
-
-  /*!
-   * This method computes a value per each node of each source triangle for target.
-   */
-  PLAN_INTER_TEMPLATE
-  void PLAN_INTERSECTOR::intersectCells(ConnType                     icellT,
-                                        const std::vector<ConnType>& icellsS,
-                                        MyMatrix&                    res)
-  {
-    int orientation=1;
-    std::vector<double> srcTriaCoords, tgtCellCoords, tgtCellCoordsTmp, nodeCeffs;
-
-    // target cell data
-    PlanarIntersector<MyMeshType,MyMatrix>::getRealTargetCoordinates(OTT<ConnType,numPol>::indFC(icellT),tgtCellCoords);
-    std::vector<double> * tgtCoords = & tgtCellCoords;
-    int tgtNbNodes = tgtCellCoords.size()/SPACEDIM;
-    NormalizedCellType tT=PlanarIntersector<MyMeshType,MyMatrix>::_meshT.getTypeOfElement(OTT<ConnType,numPol>::indFC(icellT));
-    bool isTargetQuad=CellModel::getCellModel(tT).isQuadratic();
-
-    typename MyMatrix::value_type& resRow=res[icellT];
-
-    // treat each source triangle
-    for(typename std::vector<ConnType>::const_iterator iter=icellsS.begin();iter!=icellsS.end();iter++)
-    {
-      int iS=*iter;
-      PlanarIntersector<MyMeshType,MyMatrix>::getRealSourceCoordinates(OTT<ConnType,numPol>::indFC(iS),srcTriaCoords);
-      const ConnType *startOfCellNodeConn=PlanarIntersector<MyMeshType,MyMatrix>::_connectS+OTT<ConnType,numPol>::conn2C(PlanarIntersector<MyMeshType,MyMatrix>::_connIndexS[iS]);
-      if(SPACEDIM==3)
-      {
-        tgtCellCoordsTmp = tgtCellCoords;
-        tgtCoords = & tgtCellCoordsTmp;
-        orientation=PlanarIntersector<MyMeshType,MyMatrix>::projectionThis(&tgtCellCoordsTmp[0], &srcTriaCoords[0],
-                                                                           tgtNbNodes, 3);
-      }
-      //double surf=orientation*intersectGeometryWithQuadrangle(quadrangle,targetCellCoordsTmp,isTargetQuad);
-      double surf=orientation*intersectGeoBary( *tgtCoords, isTargetQuad, &srcTriaCoords[0], nodeCeffs );
-      surf=PlanarIntersector<MyMeshType,MyMatrix>::getValueRegardingOption(surf);
-      if(surf!=0.)
-      {
-        for(int nodeIdS=0;nodeIdS<3;nodeIdS++)
-        {
-          ConnType curNodeS=startOfCellNodeConn[nodeIdS];
-          typename MyMatrix::value_type::const_iterator iterRes=resRow.find(curNodeS);
-          if(iterRes!=resRow.end())
-          {
-            nodeCeffs[nodeIdS] += iterRes->second;
-            resRow.erase( curNodeS );
-          }
-          resRow.insert(std::make_pair(curNodeS,nodeCeffs[nodeIdS]));
-        }
-      }
-    }
-  }
-}
-#endif
diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P0PL.hxx b/src/INTERP_KERNEL/PlanarIntersectorP1P0PL.hxx
deleted file mode 100644
index 31fda104a..000000000
--- a/src/INTERP_KERNEL/PlanarIntersectorP1P0PL.hxx
+++ /dev/null
@@ -1,43 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __PLANARINTERSECTORP1P0PL_HXX__
-#define __PLANARINTERSECTORP1P0PL_HXX__
-
-#include "PlanarIntersector.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  class PlanarIntersectorP1P0PL : public PlanarIntersector<MyMeshType,MyMatrix>
-  {
-   public:
-    static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-    static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    typedef typename MyMeshType::MyConnType ConnType;
-    static const NumberingPolicy numPol=MyMeshType::My_numPol;
-  public:
-    PlanarIntersectorP1P0PL(const MyMeshType& meshT, const MyMeshType& meshS, double dimCaracteristic, double md3DSurf, double medianPlane, double precision, int orientation);
-    void intersectCells(ConnType icellT, const std::vector<ConnType>& icellsS, MyMatrix& res);
-    int getNumberOfRowsOfResMatrix() const;
-    int getNumberOfColsOfResMatrix() const;
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P0PL.txx b/src/INTERP_KERNEL/PlanarIntersectorP1P0PL.txx
deleted file mode 100644
index 4973f93d1..000000000
--- a/src/INTERP_KERNEL/PlanarIntersectorP1P0PL.txx
+++ /dev/null
@@ -1,107 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-#ifndef __PLANARINTERSECTORP1P0PL_TXX__
-#define __PLANARINTERSECTORP1P0PL_TXX__
-
-#include "PlanarIntersectorP1P0PL.hxx"
-#include "PlanarIntersector.txx"
-#include "CellModel.hxx"
-
-#include "PointLocatorAlgos.txx"
-#include "InterpKernelGeo2DQuadraticPolygon.hxx"
-#include "MeshUtils.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  PlanarIntersectorP1P0PL<MyMeshType,MyMatrix>::PlanarIntersectorP1P0PL(const MyMeshType& meshT, const MyMeshType& meshS,
-                                                                        double dimCaracteristic, double md3DSurf,
-                                                                        double medianPlane, double precision, int orientation):
-    PlanarIntersector<MyMeshType,MyMatrix>(meshT,meshS,dimCaracteristic,precision,md3DSurf,medianPlane,true,orientation,0)
-  {
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  void PlanarIntersectorP1P0PL<MyMeshType,MyMatrix>::intersectCells(ConnType icellT, const std::vector<ConnType>& icellsS, MyMatrix& res)
-  {
-    std::vector<double> CoordsT;
-    typename MyMatrix::value_type& resRow=res[icellT];
-    PlanarIntersector<MyMeshType,MyMatrix>::getRealTargetCoordinates(OTT<ConnType,numPol>::indFC(icellT),CoordsT);
-    double baryT[SPACEDIM];
-    double baryTTmp[SPACEDIM];
-    calculateBarycenterDyn2<SPACEDIM>(&CoordsT[0],CoordsT.size()/SPACEDIM,baryT);
-    for(typename std::vector<ConnType>::const_iterator iter=icellsS.begin();iter!=icellsS.end();iter++)
-      {
-        NormalizedCellType tS=PlanarIntersector<MyMeshType,MyMatrix>::_meshS.getTypeOfElement(OTT<ConnType,numPol>::indFC(*iter));
-        if(tS!=NORM_TRI3)
-          throw INTERP_KERNEL::Exception("Invalid source cell detected for meshdim==2. Only TRI3 supported !");
-        std::vector<double> CoordsS;
-        PlanarIntersector<MyMeshType,MyMatrix>::getRealSourceCoordinates(OTT<ConnType,numPol>::indFC(*iter),CoordsS);
-        if(SPACEDIM==2)
-          {
-            std::copy(baryT,baryT+SPACEDIM,baryTTmp);
-          }
-        else
-          {
-            double littleTargetCell[9];
-            std::copy(baryT,baryT+3,littleTargetCell);
-            std::copy(CoordsT.begin(),CoordsT.begin()+3,littleTargetCell+3);
-            std::copy(CoordsT.begin()+3,CoordsT.begin()+6,littleTargetCell+6);
-            PlanarIntersector<MyMeshType,MyMatrix>::projectionThis(&CoordsS[0],littleTargetCell,3,3);
-            std::copy(littleTargetCell,littleTargetCell+3,baryTTmp);
-          }
-        if(PointLocatorAlgos<MyMeshType>::isElementContainsPointAlg2D(baryTTmp,&CoordsS[0],3,PlanarIntersector<MyMeshType,MyMatrix>::_precision))
-          {
-            double resLoc[3];
-            barycentric_coords<SPACEDIM>(&CoordsS[0],baryTTmp,resLoc);
-            const ConnType *startOfCellNodeConnS=PlanarIntersector<MyMeshType,MyMatrix>::_connectS+OTT<ConnType,numPol>::conn2C(PlanarIntersector<MyMeshType,MyMatrix>::_connIndexS[*iter]);
-            for(int nodeIdS=0;nodeIdS<3;nodeIdS++)
-              {
-                if(fabs(resLoc[nodeIdS])>PlanarIntersector<MyMeshType,MyMatrix>::_precision)
-                  {
-                    ConnType curNodeSInCmode=OTT<ConnType,numPol>::coo2C(startOfCellNodeConnS[nodeIdS]);
-                    typename MyMatrix::value_type::const_iterator iterRes=resRow.find(OTT<ConnType,numPol>::indFC(curNodeSInCmode));
-                    if(iterRes==resRow.end())
-                      resRow.insert(std::make_pair(OTT<ConnType,numPol>::indFC(curNodeSInCmode),resLoc[nodeIdS]));
-                    else
-                      {
-                        double val=(*iterRes).second+resLoc[nodeIdS];
-                        resRow.erase(OTT<ConnType,numPol>::indFC(curNodeSInCmode));
-                        resRow.insert(std::make_pair(OTT<ConnType,numPol>::indFC(curNodeSInCmode),val));
-                      }
-                  }
-              }
-          }
-      }
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  int PlanarIntersectorP1P0PL<MyMeshType,MyMatrix>::getNumberOfRowsOfResMatrix() const
-  {
-    return PlanarIntersector<MyMeshType,MyMatrix>::_meshT.getNumberOfElements();
-  }
-  
-  template<class MyMeshType, class MyMatrix>
-  int PlanarIntersectorP1P0PL<MyMeshType,MyMatrix>::getNumberOfColsOfResMatrix() const
-  {
-    return PlanarIntersector<MyMeshType,MyMatrix>::_meshS.getNumberOfNodes();
-  }
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P1.hxx b/src/INTERP_KERNEL/PlanarIntersectorP1P1.hxx
deleted file mode 100644
index 4278bb39a..000000000
--- a/src/INTERP_KERNEL/PlanarIntersectorP1P1.hxx
+++ /dev/null
@@ -1,48 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __PLANARINTERSECTORP1P1_HXX__
-#define __PLANARINTERSECTORP1P1_HXX__
-
-#include "PlanarIntersector.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix, class ConcreteP1P1Intersector>
-  class PlanarIntersectorP1P1 : public PlanarIntersector<MyMeshType,MyMatrix>
-  {
-  public:
-    static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-    static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    typedef typename MyMeshType::MyConnType ConnType;
-    static const NumberingPolicy numPol=MyMeshType::My_numPol;
-  protected:
-    PlanarIntersectorP1P1(const MyMeshType& meshT, const MyMeshType& meshS, double dimCaracteristic, double precision, double md3DSurf, double medianPlane, bool doRotate, int orientation, int printLevel);
-  public:
-    void intersectCells(ConnType icellT, const std::vector<ConnType>& icellsS, MyMatrix& res);
-    int getNumberOfRowsOfResMatrix() const;
-    int getNumberOfColsOfResMatrix() const;
-
-    double intersectGeometryGeneral(const std::vector<double>& targetCoords, const std::vector<double>& sourceCoords) { return asLeaf().intersectGeometryGeneral(targetCoords,sourceCoords); }
-  protected:
-    ConcreteP1P1Intersector& asLeaf() { return static_cast<ConcreteP1P1Intersector&>(*this); }
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P1.txx b/src/INTERP_KERNEL/PlanarIntersectorP1P1.txx
deleted file mode 100644
index dcd85a694..000000000
--- a/src/INTERP_KERNEL/PlanarIntersectorP1P1.txx
+++ /dev/null
@@ -1,100 +0,0 @@
-//  Copyright (C) 2007-2010  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
-#ifndef __PLANARINTERSECTORP1P1_TXX__
-#define __PLANARINTERSECTORP1P1_TXX__
-
-#include "PlanarIntersectorP1P1.hxx"
-#include "InterpolationUtils.hxx"
-#include "CellModel.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix, class ConcreteP1P1Intersector>
-  PlanarIntersectorP1P1<MyMeshType,MyMatrix,ConcreteP1P1Intersector>::PlanarIntersectorP1P1(const MyMeshType& meshT, const MyMeshType& meshS,
-                                                                                            double dimCaracteristic, double precision, double md3DSurf, double medianPlane,
-                                                                                            bool doRotate, int orientation, int printLevel):
-    PlanarIntersector<MyMeshType,MyMatrix>(meshT,meshS,dimCaracteristic,precision,md3DSurf,medianPlane,doRotate,orientation,printLevel)
-  {
-  }
-
-  template<class MyMeshType, class MyMatrix, class ConcreteP1P1Intersector>
-  int PlanarIntersectorP1P1<MyMeshType,MyMatrix,ConcreteP1P1Intersector>::getNumberOfRowsOfResMatrix() const
-  {
-    return PlanarIntersector<MyMeshType,MyMatrix>::_meshT.getNumberOfNodes();
-  }
-
-  template<class MyMeshType, class MyMatrix, class ConcreteP1P1Intersector>
-  int PlanarIntersectorP1P1<MyMeshType,MyMatrix,ConcreteP1P1Intersector>::getNumberOfColsOfResMatrix() const
-  {
-    return PlanarIntersector<MyMeshType,MyMatrix>::_meshS.getNumberOfNodes();
-  }
-
-  /*!
-   * This methods split on the fly, into triangles in order to compute dual mesh of target cell (with icellT id in target mesh in C mode).
-   */
-  template<class MyMeshType, class MyMatrix, class ConcreteP1P1Intersector>
-  void PlanarIntersectorP1P1<MyMeshType,MyMatrix,ConcreteP1P1Intersector>::intersectCells(ConnType icellT, const std::vector<ConnType>& icellsS, MyMatrix& res)
-  {
-    int nbNodesT=PlanarIntersector<MyMeshType,MyMatrix>::_connIndexT[icellT+1]-PlanarIntersector<MyMeshType,MyMatrix>::_connIndexT[icellT];
-    int orientation=1;
-    const ConnType *startOfCellNodeConn=PlanarIntersector<MyMeshType,MyMatrix>::_connectT+OTT<ConnType,numPol>::conn2C(PlanarIntersector<MyMeshType,MyMatrix>::_connIndexT[icellT]);
-    std::vector<double> polygT;
-    PlanarIntersector<MyMeshType,MyMatrix>::getRealTargetCoordinates(OTT<ConnType,numPol>::indFC(icellT),polygT);
-    for(int nodeIdT=0;nodeIdT<nbNodesT;nodeIdT++)
-      {
-        ConnType curNodeTInCmode=OTT<ConnType,numPol>::coo2C(startOfCellNodeConn[nodeIdT]);
-        PlanarIntersector<MyMeshType,MyMatrix>::getRealTargetCoordinatesPermute(OTT<ConnType,numPol>::indFC(icellT),nodeIdT,polygT);
-        std::vector<double> polygDualT(SPACEDIM*2*(nbNodesT-1));
-        fillDualCellOfPolyg<SPACEDIM>(&polygT[0],polygT.size()/SPACEDIM,&polygDualT[0]);
-        typename MyMatrix::value_type& resRow=res[curNodeTInCmode];
-        for(typename std::vector<ConnType>::const_iterator iter=icellsS.begin();iter!=icellsS.end();iter++)
-          {
-            int iS=*iter;
-            int nbNodesS=PlanarIntersector<MyMeshType,MyMatrix>::_connIndexS[iS+1]-PlanarIntersector<MyMeshType,MyMatrix>::_connIndexS[iS];
-            const ConnType *startOfCellNodeConnS=PlanarIntersector<MyMeshType,MyMatrix>::_connectS+OTT<ConnType,numPol>::conn2C(PlanarIntersector<MyMeshType,MyMatrix>::_connIndexS[iS]);
-            for(int nodeIdS=0;nodeIdS<nbNodesS;nodeIdS++)
-              {
-                ConnType curNodeSInCmode=OTT<ConnType,numPol>::coo2C(startOfCellNodeConnS[nodeIdS]);
-                std::vector<double> polygS;
-                PlanarIntersector<MyMeshType,MyMatrix>::getRealSourceCoordinatesPermute(OTT<ConnType,numPol>::indFC(iS),nodeIdS,polygS);
-                std::vector<double> polygDualS(SPACEDIM*2*(nbNodesS-1));
-                fillDualCellOfPolyg<SPACEDIM>(&polygS[0],polygS.size()/SPACEDIM,&polygDualS[0]);
-                std::vector<double> polygDualTTmp(polygDualT);
-                if(SPACEDIM==3)
-                  orientation=PlanarIntersector<MyMeshType,MyMatrix>::projectionThis(&polygDualS[0],&polygDualTTmp[0],polygDualS.size()/SPACEDIM,polygDualT.size()/SPACEDIM);
-                double surf=orientation*intersectGeometryGeneral(polygDualTTmp,polygDualS);
-                surf=PlanarIntersector<MyMeshType,MyMatrix>::getValueRegardingOption(surf);
-                if(surf!=0.)
-                  {
-                    typename MyMatrix::value_type::const_iterator iterRes=resRow.find(OTT<ConnType,numPol>::indFC(curNodeSInCmode));
-                    if(iterRes==resRow.end())
-                      resRow.insert(std::make_pair(OTT<ConnType,numPol>::indFC(curNodeSInCmode),surf));
-                    else
-                      {
-                        double val=(*iterRes).second+surf;
-                        resRow.erase(OTT<ConnType,numPol>::indFC(curNodeSInCmode));
-                        resRow.insert(std::make_pair(OTT<ConnType,numPol>::indFC(curNodeSInCmode),val));
-                      }
-                  }
-              }
-          }
-      }
-  }
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.hxx b/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.hxx
deleted file mode 100644
index a93b16bfa..000000000
--- a/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.hxx
+++ /dev/null
@@ -1,43 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __PLANARINTERSECTORP1P1PL_HXX__
-#define __PLANARINTERSECTORP1P1PL_HXX__
-
-#include "PlanarIntersector.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  class PlanarIntersectorP1P1PL : public PlanarIntersector<MyMeshType,MyMatrix>
-  {
-   public:
-    static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-    static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    typedef typename MyMeshType::MyConnType ConnType;
-    static const NumberingPolicy numPol=MyMeshType::My_numPol;
-  public:
-    PlanarIntersectorP1P1PL(const MyMeshType& meshT, const MyMeshType& meshS, double dimCaracteristic, double md3DSurf, double medianPlane, double precision, int orientation);
-    void intersectCells(ConnType icellT, const std::vector<ConnType>& icellsS, MyMatrix& res);
-    int getNumberOfRowsOfResMatrix() const;
-    int getNumberOfColsOfResMatrix() const;
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.txx b/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.txx
deleted file mode 100644
index 76eaaab10..000000000
--- a/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.txx
+++ /dev/null
@@ -1,98 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-#ifndef __PLANARINTERSECTORP1P1PL_TXX__
-#define __PLANARINTERSECTORP1P1PL_TXX__
-
-#include "PlanarIntersectorP1P1PL.hxx"
-#include "PlanarIntersector.txx"
-#include "CellModel.hxx"
-
-#include "PointLocatorAlgos.txx"
-#include "MeshUtils.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  PlanarIntersectorP1P1PL<MyMeshType,MyMatrix>::PlanarIntersectorP1P1PL(const MyMeshType& meshT, const MyMeshType& meshS,
-                                                                        double dimCaracteristic, double md3DSurf,
-                                                                        double medianPlane, double precision, int orientation):
-    PlanarIntersector<MyMeshType,MyMatrix>(meshT,meshS,dimCaracteristic,precision,md3DSurf,medianPlane,true,orientation,0)
-  {
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  void PlanarIntersectorP1P1PL<MyMeshType,MyMatrix>::intersectCells(ConnType icellT, const std::vector<ConnType>& icellsS, MyMatrix& res)
-  {
-    std::vector<double> CoordsT;
-    PlanarIntersector<MyMeshType,MyMatrix>::getRealTargetCoordinates(OTT<ConnType,numPol>::indFC(icellT),CoordsT);
-    int nbOfNodesT=CoordsT.size()/SPACEDIM;
-    for(typename std::vector<ConnType>::const_iterator iter=icellsS.begin();iter!=icellsS.end();iter++)
-      {
-        NormalizedCellType tS=PlanarIntersector<MyMeshType,MyMatrix>::_meshS.getTypeOfElement(OTT<ConnType,numPol>::indFC(*iter));
-        if(tS!=NORM_TRI3)
-          throw INTERP_KERNEL::Exception("Invalid source cell detected for meshdim==2. Only TRI3 supported !");
-        std::vector<double> CoordsS;
-        PlanarIntersector<MyMeshType,MyMatrix>::getRealSourceCoordinates(OTT<ConnType,numPol>::indFC(*iter),CoordsS);
-        std::vector<double> CoordsTTmp(CoordsT);
-        if(SPACEDIM==3)
-          PlanarIntersector<MyMeshType,MyMatrix>::projectionThis(&CoordsS[0],&CoordsTTmp[0],CoordsS.size()/SPACEDIM,nbOfNodesT);
-        const ConnType *startOfCellNodeConnT=PlanarIntersector<MyMeshType,MyMatrix>::_connectT+OTT<ConnType,numPol>::conn2C(PlanarIntersector<MyMeshType,MyMatrix>::_connIndexT[icellT]);
-        for(int nodeIdT=0;nodeIdT<nbOfNodesT;nodeIdT++)
-          {
-            typename MyMatrix::value_type& resRow=res[OTT<ConnType,numPol>::ind2C(startOfCellNodeConnT[nodeIdT])];
-            if( PointLocatorAlgos<MyMeshType>::isElementContainsPointAlg2D(&CoordsTTmp[nodeIdT*SPACEDIM],&CoordsS[0],3,PlanarIntersector<MyMeshType,MyMatrix>::_precision) )
-              {
-                double resLoc[3];
-                barycentric_coords<SPACEDIM>(&CoordsS[0],&CoordsTTmp[nodeIdT*SPACEDIM],resLoc);
-                const ConnType *startOfCellNodeConnS=PlanarIntersector<MyMeshType,MyMatrix>::_connectS+OTT<ConnType,numPol>::conn2C(PlanarIntersector<MyMeshType,MyMatrix>::_connIndexS[*iter]);
-                for(int nodeIdS=0;nodeIdS<3;nodeIdS++)
-                  {
-                    if(fabs(resLoc[nodeIdS])>PlanarIntersector<MyMeshType,MyMatrix>::_precision)
-                      {
-                        ConnType curNodeSInCmode=OTT<ConnType,numPol>::coo2C(startOfCellNodeConnS[nodeIdS]);
-                        typename MyMatrix::value_type::const_iterator iterRes=resRow.find(OTT<ConnType,numPol>::indFC(curNodeSInCmode));
-                        if(iterRes==resRow.end())
-                          resRow.insert(std::make_pair(OTT<ConnType,numPol>::indFC(curNodeSInCmode),resLoc[nodeIdS]));
-                        else
-                          {
-                            double val=(*iterRes).second+resLoc[nodeIdS];
-                            resRow.erase(OTT<ConnType,numPol>::indFC(curNodeSInCmode));
-                            resRow.insert(std::make_pair(OTT<ConnType,numPol>::indFC(curNodeSInCmode),val));
-                          }
-                      }
-                  }
-              }
-          }
-      }
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  int PlanarIntersectorP1P1PL<MyMeshType,MyMatrix>::getNumberOfRowsOfResMatrix() const
-  {
-    return PlanarIntersector<MyMeshType,MyMatrix>::_meshT.getNumberOfNodes();
-  }
-  
-  template<class MyMeshType, class MyMatrix>
-  int PlanarIntersectorP1P1PL<MyMeshType,MyMatrix>::getNumberOfColsOfResMatrix() const
-  {
-    return PlanarIntersector<MyMeshType,MyMatrix>::_meshS.getNumberOfNodes();
-  }
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PointLocator2DIntersector.hxx b/src/INTERP_KERNEL/PointLocator2DIntersector.hxx
deleted file mode 100644
index 6ee193353..000000000
--- a/src/INTERP_KERNEL/PointLocator2DIntersector.hxx
+++ /dev/null
@@ -1,55 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __POINTLOCATORINTERSECTOR_HXX__
-#define __POINTLOCATORINTERSECTOR_HXX__
-
-#include "PlanarIntersectorP0P0.hxx"
-#include "PlanarIntersectorP0P1.hxx"
-#include "PlanarIntersectorP1P0.hxx"
-#include "PlanarIntersectorP1P1.hxx"
-#include "PlanarIntersectorP1P0Bary.hxx"
-
-namespace INTERP_KERNEL
-{
-  class QuadraticPolygon;
-
-  template<class MyMeshType, class MyMatrix, template <class MeshType, class TheMatrix, class ThisIntersector> class InterpType>
-  class PointLocator2DIntersector : public InterpType<MyMeshType,MyMatrix,PointLocator2DIntersector<MyMeshType,MyMatrix,InterpType> >
-  {
-  public:
-    static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-    static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    typedef typename MyMeshType::MyConnType ConnType;
-    static const NumberingPolicy numPol=MyMeshType::My_numPol;
-  public:
-    PointLocator2DIntersector(const MyMeshType& meshT, const MyMeshType& meshS,
-                           double dimCaracteristic, double md3DSurf, double medianPlane, double precision, int orientation);
-    double intersectGeometry(ConnType icellT, ConnType icellS, ConnType nbNodesT, ConnType nbNodesS);
-    double intersectGeometryWithQuadrangle(const double *quadrangle, const std::vector<double>& sourceCoords, bool isSourceQuad);
-    double intersectGeometryGeneral(const std::vector<double>& targetCoords, const std::vector<double>& sourceCoords);
-    double intersectGeoBary(const std::vector<double>& targetCell, bool targetCellQuadratic, const double *sourceCell, std::vector<double>& res);
-  private:
-    QuadraticPolygon *buildPolygonFrom(const std::vector<double>& coords, NormalizedCellType type);
-    QuadraticPolygon *buildPolygonAFrom(ConnType cell, int nbOfPoints, NormalizedCellType type);
-    QuadraticPolygon *buildPolygonBFrom(ConnType cell, int nbOfPoints, NormalizedCellType type);
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PointLocator2DIntersector.txx b/src/INTERP_KERNEL/PointLocator2DIntersector.txx
deleted file mode 100644
index f6a329047..000000000
--- a/src/INTERP_KERNEL/PointLocator2DIntersector.txx
+++ /dev/null
@@ -1,164 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-#ifndef __POINTLOCATORINTERSECTOR_TXX__
-#define __POINTLOCATORINTERSECTOR_TXX__
-
-#include "PointLocator2DIntersector.hxx"
-#include "PlanarIntersectorP0P0.txx"
-#include "PlanarIntersectorP0P1.txx"
-#include "PlanarIntersectorP1P0.txx"
-#include "PlanarIntersectorP1P1.txx"
-#include "PlanarIntersectorP1P0Bary.txx"
-#include "CellModel.hxx"
-
-#include "InterpKernelGeo2DQuadraticPolygon.hxx"
-#include "PointLocatorAlgos.txx"
-
-#define PTLOC2D_INTERSECTOR PointLocator2DIntersector<MyMeshType,MyMatrix,InterpType>
-#define INTERSECTOR_TEMPLATE template<class MyMeshType, class MyMatrix, template <class MeshType, class TheMatrix, class ThisIntersector> class InterpType>
-
-namespace INTERP_KERNEL
-{
-  INTERSECTOR_TEMPLATE
-  PTLOC2D_INTERSECTOR::PointLocator2DIntersector(const MyMeshType& meshT, const MyMeshType& meshS,
-                                               double dimCaracteristic, double md3DSurf, double medianPlane,
-                                               double precision, int orientation):
-    InterpType<MyMeshType,MyMatrix,PTLOC2D_INTERSECTOR >(meshT,meshS,dimCaracteristic, precision, md3DSurf, medianPlane, true, orientation, 0)
-  {
-  }
-  
-  INTERSECTOR_TEMPLATE
-  double PTLOC2D_INTERSECTOR::intersectGeometry(ConnType icellT,   ConnType icellS,
-                                                ConnType nbNodesT, ConnType nbNodesS)
-  {
-    int orientation = 1;
-    std::vector<double> CoordsT;
-    std::vector<double> CoordsS;
-    PlanarIntersector<MyMeshType,MyMatrix>::getRealCoordinates(icellT,icellS,nbNodesT,nbNodesS,CoordsT,CoordsS,orientation);
-    NormalizedCellType tT=PlanarIntersector<MyMeshType,MyMatrix>::_meshT.getTypeOfElement(icellT);
-    QuadraticPolygon *pT=buildPolygonFrom(CoordsT,tT);
-    double baryT[SPACEDIM];
-    pT->getBarycenterGeneral(baryT);
-    delete pT;
-    if(PointLocatorAlgos<MyMeshType>::isElementContainsPointAlg2D(baryT,&CoordsS[0],nbNodesS,InterpType<MyMeshType,MyMatrix,PTLOC2D_INTERSECTOR >::_precision))
-      return 1.;
-    return 0.;
-  }
-
-  INTERSECTOR_TEMPLATE
-  double PTLOC2D_INTERSECTOR::intersectGeometryWithQuadrangle(const double             * quadrangle,
-                                                              const std::vector<double>& sourceCoords,
-                                                              bool                       isSourceQuad)
-  {
-    int nbOfSourceNodes=sourceCoords.size()/SPACEDIM;
-    std::vector<Node *> nodes2(nbOfSourceNodes);
-    for(int i=0;i<nbOfSourceNodes;i++)
-      nodes2[i]=new Node(sourceCoords[i*SPACEDIM],sourceCoords[i*SPACEDIM+1]);
-    QuadraticPolygon *p2;
-    if(!isSourceQuad)
-      p2=QuadraticPolygon::buildLinearPolygon(nodes2);
-    else
-      p2=QuadraticPolygon::buildArcCirclePolygon(nodes2);
-    double bary[SPACEDIM];
-    p2->getBarycenter(bary);
-    delete p2;
-    if( PointLocatorAlgos<MyMeshType>::isElementContainsPointAlg2D(bary,quadrangle,4) )
-      return 1.;
-    return 0.;
-  }
-
-  INTERSECTOR_TEMPLATE
-  double PTLOC2D_INTERSECTOR::intersectGeometryGeneral(const std::vector<double>& targetCoords,
-                                                       const std::vector<double>& sourceCoords)
-  {
-    int nbOfTargetNodes=targetCoords.size()/SPACEDIM;
-    int nbOfSourceNodes=sourceCoords.size()/SPACEDIM;
-    std::vector<Node *> nodes2(nbOfSourceNodes);
-    for(int i=0;i<nbOfSourceNodes;i++)
-      nodes2[i]=new Node(sourceCoords[i*SPACEDIM],sourceCoords[i*SPACEDIM+1]);
-    QuadraticPolygon *p=QuadraticPolygon::buildLinearPolygon(nodes2);
-    double bary[SPACEDIM];
-    p->getBarycenterGeneral(bary);
-    delete p;
-    if( PointLocatorAlgos<MyMeshType>::isElementContainsPointAlg2D(bary,&targetCoords[0],nbOfTargetNodes) )
-      return 1.;
-    return 0.;
-  }
-
-  //================================================================================
-  /*!
-   * \brief Intersect a triangle and a polygon for P1P0 barycentric algorithm
-   *  \param targetCell - list of coordinates of target polygon in full interlace
-   *  \param targetCellQuadratic - specifies if target polygon is quadratic or not
-   *  \param sourceTria - list of coordinates of source triangle
-   *  \param res - coefficients a,b and c associated to nodes of sourceTria
-   */
-  //================================================================================
-
-  INTERSECTOR_TEMPLATE
-  double PTLOC2D_INTERSECTOR::intersectGeoBary(const std::vector<double>& targetCell,
-                                               bool                       targetCellQuadratic,
-                                               const double *             sourceTria,
-                                               std::vector<double>&       res)
-  {
-    throw INTERP_KERNEL::Exception("intersectGeoBary incompatible with PointLocator. Desactivate P1P0Bary to avoid the problem");
-    return 0.;
-  }
-
-  INTERSECTOR_TEMPLATE
-  QuadraticPolygon *PTLOC2D_INTERSECTOR::buildPolygonFrom(const std::vector<double>& coords, NormalizedCellType type)
-  {
-    int nbNodes=coords.size()/SPACEDIM;
-    std::vector<Node *> nodes(nbNodes);
-    for(int i=0;i<nbNodes;i++)
-      nodes[i]=new Node(coords[i*SPACEDIM],coords[i*SPACEDIM+1]);
-    if(!CellModel::getCellModel(type).isQuadratic())
-      return QuadraticPolygon::buildLinearPolygon(nodes);
-    else
-      return QuadraticPolygon::buildArcCirclePolygon(nodes);
-  }
-
-  INTERSECTOR_TEMPLATE
-  QuadraticPolygon *PTLOC2D_INTERSECTOR::buildPolygonAFrom(ConnType cell, int nbOfPoints, NormalizedCellType type)
-  {
-    const ConnType *startOfCellNodeConn=PlanarIntersector<MyMeshType,MyMatrix>::_connectT+OTT<ConnType,numPol>::conn2C(PlanarIntersector<MyMeshType,MyMatrix>::_connIndexT[OTT<ConnType,numPol>::ind2C(cell)]);
-    std::vector<Node *> nodes(nbOfPoints);
-    for(int i=0;i<nbOfPoints;i++)
-      nodes[i]=new Node(PlanarIntersector<MyMeshType,MyMatrix>::_coordsT+OTT<ConnType,numPol>::coo2C(startOfCellNodeConn[i])*SPACEDIM);
-    if(CellModel::getCellModel(type).isQuadratic())
-      return QuadraticPolygon::buildLinearPolygon(nodes);
-    else
-      return QuadraticPolygon::buildArcCirclePolygon(nodes);
-  }
-
-  INTERSECTOR_TEMPLATE
-  QuadraticPolygon *PTLOC2D_INTERSECTOR::buildPolygonBFrom(ConnType cell, int nbOfPoints, NormalizedCellType type)
-  {
-    const ConnType *startOfCellNodeConn=PlanarIntersector<MyMeshType,MyMatrix>::_connectS+OTT<ConnType,numPol>::conn2C(PlanarIntersector<MyMeshType,MyMatrix>::_connIndexS[OTT<ConnType,numPol>::ind2C(cell)]);
-    std::vector<Node *> nodes(nbOfPoints);
-    for(int i=0;i<nbOfPoints;i++)
-      nodes[i]=new Node(PlanarIntersector<MyMeshType,MyMatrix>::_coordsS+OTT<ConnType,numPol>::coo2C(startOfCellNodeConn[i])*SPACEDIM);
-    if(type!=NORM_TRI6 && type!=NORM_QUAD8)
-      return QuadraticPolygon::buildLinearPolygon(nodes);
-    else
-      return QuadraticPolygon::buildArcCirclePolygon(nodes);
-  }
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.hxx b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.hxx
deleted file mode 100644
index 7c9df49ed..000000000
--- a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __POINTLOCATOR3DINTERSECTORP0P0_HXX__
-#define __POINTLOCATOR3DINTERSECTORP0P0_HXX__
-
-#include "Intersector3DP0P0.hxx"
-#include "NormalizedUnstructuredMesh.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  class PointLocator3DIntersectorP0P0 : public Intersector3DP0P0<MyMeshType,MyMatrix>
-  { 
-  public:
-    static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-    static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    typedef typename MyMeshType::MyConnType ConnType;
-    static const NumberingPolicy numPol=MyMeshType::My_numPol;
-  public:
-    PointLocator3DIntersectorP0P0(const MyMeshType& targetMesh, const MyMeshType& srcMesh, double precision);
-    ~PointLocator3DIntersectorP0P0();
-    void intersectCells(ConnType targetCell, const std::vector<ConnType>& srcCells, MyMatrix& res);
-  protected:
-    double _precision;
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.txx b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.txx
deleted file mode 100644
index b88c0b468..000000000
--- a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.txx
+++ /dev/null
@@ -1,77 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-#ifndef __POINTLOCATOR3DINTERSECTORP0P0_TXX__
-#define __POINTLOCATOR3DINTERSECTORP0P0_TXX__
-
-#include "PointLocator3DIntersectorP0P0.hxx"
-#include "Intersector3DP0P0.txx"
-#include "MeshUtils.hxx"
-
-#include "SplitterTetra.txx"
-#include "PointLocatorAlgos.txx"
-
-namespace INTERP_KERNEL
-{
-
-  /**
-   * @param targetMesh  mesh containing the target elements
-   * @param srcMesh     mesh containing the source elements
-   * @param policy      splitting policy to be used
-   */
-  template<class MyMeshType, class MyMatrix>
-  PointLocator3DIntersectorP0P0<MyMeshType,MyMatrix>::PointLocator3DIntersectorP0P0(const MyMeshType& targetMesh, const MyMeshType& srcMesh, double precision):
-    Intersector3DP0P0<MyMeshType,MyMatrix>(targetMesh,srcMesh),_precision(precision)
-  {
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  PointLocator3DIntersectorP0P0<MyMeshType,MyMatrix>::~PointLocator3DIntersectorP0P0()
-  {
-  }
-
-  /**
-   * 
-   * @param targetCell in C mode.
-   * @param srcCells in C mode.
-   *
-   */
-  template<class MyMeshType, class MyMatrix>
-  void PointLocator3DIntersectorP0P0<MyMeshType,MyMatrix>::intersectCells(ConnType targetCell, const std::vector<ConnType>& srcCells, MyMatrix& res)
-  {
-    std::vector<double> CoordsT;
-    Intersector3DP0P0<MyMeshType,MyMatrix>::getRealTargetCoordinates(OTT<ConnType,numPol>::indFC(targetCell),CoordsT);
-    double bary[SPACEDIM];
-    calculateBarycenterDyn2<SPACEDIM>(&CoordsT[0],CoordsT.size()/SPACEDIM,bary);
-    typename MyMatrix::value_type& resRow=res[targetCell];
-    const double *coordsS=Intersector3DP0P0<MyMeshType,MyMatrix>::_src_mesh.getCoordinatesPtr();
-    for(typename std::vector<ConnType>::const_iterator iterCellS=srcCells.begin();iterCellS!=srcCells.end();iterCellS++)
-      {
-        NormalizedCellType tS=Intersector3DP0P0<MyMeshType,MyMatrix>::_src_mesh.getTypeOfElement(OTT<ConnType,numPol>::indFC(*iterCellS));
-        const CellModel& cmTypeS=CellModel::getCellModel(tS);
-        std::vector<ConnType> connOfCurCellS;
-        Intersector3DP0P0<MyMeshType,MyMatrix>::getConnOfSourceCell(OTT<ConnType,numPol>::indFC(*iterCellS),connOfCurCellS);
-        if(PointLocatorAlgos<MyMeshType>::isElementContainsPointAlg3D(bary,&connOfCurCellS[0],connOfCurCellS.size(),coordsS,cmTypeS,_precision))
-          {
-            resRow.insert(std::make_pair(OTT<ConnType,numPol>::indFC(*iterCellS),1));
-          }
-      }
-  }
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.hxx b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.hxx
deleted file mode 100644
index 9b8c986b1..000000000
--- a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __POINTLOCATOR3DINTERSECTORP0P1_HXX__
-#define __POINTLOCATOR3DINTERSECTORP0P1_HXX__
-
-#include "Intersector3DP0P1.hxx"
-#include "NormalizedUnstructuredMesh.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  class PointLocator3DIntersectorP0P1 : public Intersector3DP0P1<MyMeshType,MyMatrix>
-  { 
-  public:
-    static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-    static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    typedef typename MyMeshType::MyConnType ConnType;
-    static const NumberingPolicy numPol=MyMeshType::My_numPol;
-  public:
-    PointLocator3DIntersectorP0P1(const MyMeshType& targetMesh, const MyMeshType& srcMesh, double precision);
-    ~PointLocator3DIntersectorP0P1();
-    void intersectCells(ConnType targetCell, const std::vector<ConnType>& srcCells, MyMatrix& res);
-  protected:
-    double _precision;
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.txx b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.txx
deleted file mode 100644
index 1f84569d3..000000000
--- a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.txx
+++ /dev/null
@@ -1,80 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-#ifndef __POINTLOCATOR3DINTERSECTORP0P1_TXX__
-#define __POINTLOCATOR3DINTERSECTORP0P1_TXX__
-
-#include "PointLocator3DIntersectorP0P1.hxx"
-#include "Intersector3DP0P1.txx"
-#include "MeshUtils.hxx"
-
-namespace INTERP_KERNEL
-{
-
-  /** 
-   * @param targetMesh  mesh containing the target elements
-   * @param srcMesh     mesh containing the source elements
-   * @param policy      splitting policy to be used
-   */
-  template<class MyMeshType, class MyMatrix>
-  PointLocator3DIntersectorP0P1<MyMeshType,MyMatrix>::PointLocator3DIntersectorP0P1(const MyMeshType& targetMesh, const MyMeshType& srcMesh, double precision):
-    Intersector3DP0P1<MyMeshType,MyMatrix>(targetMesh,srcMesh),_precision(precision)
-  {
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  PointLocator3DIntersectorP0P1<MyMeshType,MyMatrix>::~PointLocator3DIntersectorP0P1()
-  {
-  }
-
-  /**
-   * 
-   * @param targetCell in C mode.
-   * @param srcCells in C mode.
-   *
-   */
-  template<class MyMeshType, class MyMatrix>
-  void PointLocator3DIntersectorP0P1<MyMeshType,MyMatrix>::intersectCells(ConnType targetCell, const std::vector<ConnType>& srcCells, MyMatrix& res)
-  {
-    std::vector<double> coordsTarget;
-    Intersector3DP0P1<MyMeshType,MyMatrix>::getRealTargetCoordinates(OTT<ConnType,numPol>::indFC(targetCell),coordsTarget);
-    int nbNodesT=coordsTarget.size()/SPACEDIM;
-    const double *coordsS=Intersector3DP0P1<MyMeshType,MyMatrix>::_src_mesh.getCoordinatesPtr();
-    const ConnType *startOfCellNodeConnT=Intersector3DP0P1<MyMeshType,MyMatrix>::getStartConnOfTargetCell(targetCell);
-    for(typename std::vector<ConnType>::const_iterator iterCellS=srcCells.begin();iterCellS!=srcCells.end();iterCellS++)
-      {
-        NormalizedCellType tS=Intersector3DP0P1<MyMeshType,MyMatrix>::_src_mesh.getTypeOfElement(OTT<ConnType,numPol>::indFC(*iterCellS));
-        const CellModel& cmTypeS=CellModel::getCellModel(tS);
-        std::vector<ConnType> connOfCurCellS;
-        Intersector3DP0P1<MyMeshType,MyMatrix>::getConnOfSourceCell(OTT<ConnType,numPol>::indFC(*iterCellS),connOfCurCellS);
-        for(int nodeIdT=0;nodeIdT<nbNodesT;nodeIdT++)
-          {
-            if(PointLocatorAlgos<MyMeshType>::isElementContainsPointAlg3D(&coordsTarget[nodeIdT*SPACEDIM],&connOfCurCellS[0],connOfCurCellS.size(),coordsS,cmTypeS,_precision))
-              {
-                ConnType curNodeTInCmode=OTT<ConnType,numPol>::coo2C(startOfCellNodeConnT[nodeIdT]);
-                typename MyMatrix::value_type& resRow=res[curNodeTInCmode];
-                typename MyMatrix::value_type::const_iterator iterRes=resRow.find(OTT<ConnType,numPol>::indFC(*iterCellS));
-                if(iterRes==resRow.end())
-                  resRow.insert(std::make_pair(OTT<ConnType,numPol>::indFC(*iterCellS),1.));
-              }
-          }
-      }
-  }
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP1P0.hxx b/src/INTERP_KERNEL/PointLocator3DIntersectorP1P0.hxx
deleted file mode 100644
index e3da28795..000000000
--- a/src/INTERP_KERNEL/PointLocator3DIntersectorP1P0.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __POINTLOCATOR3DINTERSECTORP1P0_HXX__
-#define __POINTLOCATOR3DINTERSECTORP1P0_HXX__
-
-#include "Intersector3DP1P0.hxx"
-#include "NormalizedUnstructuredMesh.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  class PointLocator3DIntersectorP1P0 : public Intersector3DP1P0<MyMeshType,MyMatrix>
-  { 
-  public:
-    static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-    static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    typedef typename MyMeshType::MyConnType ConnType;
-    static const NumberingPolicy numPol=MyMeshType::My_numPol;
-  public:
-    PointLocator3DIntersectorP1P0(const MyMeshType& targetMesh, const MyMeshType& srcMesh, double precision);
-    ~PointLocator3DIntersectorP1P0();
-    void intersectCells(ConnType targetCell, const std::vector<ConnType>& srcCells, MyMatrix& res);
-  protected:
-    double _precision;
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP1P0.txx b/src/INTERP_KERNEL/PointLocator3DIntersectorP1P0.txx
deleted file mode 100644
index f67c2597d..000000000
--- a/src/INTERP_KERNEL/PointLocator3DIntersectorP1P0.txx
+++ /dev/null
@@ -1,98 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-#ifndef __POINTLOCATOR3DINTERSECTORP1P0_TXX__
-#define __POINTLOCATOR3DINTERSECTORP1P0_TXX__
-
-#include "PointLocator3DIntersectorP1P0.hxx"
-#include "Intersector3DP1P0.txx"
-#include "MeshUtils.hxx"
-
-namespace INTERP_KERNEL
-{
-  /**
-   * @param targetMesh  mesh containing the target elements
-   * @param srcMesh     mesh containing the source elements
-   * @param policy      splitting policy to be used
-   *
-   * WARNING : in _split attribute, sourceMesh and targetMesh are switched in order to fit intersectCells feature.
-   */
-  template<class MyMeshType, class MyMatrix>
-  PointLocator3DIntersectorP1P0<MyMeshType,MyMatrix>::PointLocator3DIntersectorP1P0(const MyMeshType& targetMesh, const MyMeshType& srcMesh, double precision):Intersector3DP1P0<MyMeshType,MyMatrix>(targetMesh,srcMesh),_precision(precision)
-  {
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  PointLocator3DIntersectorP1P0<MyMeshType,MyMatrix>::~PointLocator3DIntersectorP1P0()
-  {
-  }
-
-  /**
-   * @param targetCell in C mode.
-   * @param srcCells in C mode.
-   *
-   * WARNING : for all methods on _split object source and target are switched !
-   */
-  template<class MyMeshType, class MyMatrix>
-  void PointLocator3DIntersectorP1P0<MyMeshType,MyMatrix>::intersectCells(ConnType targetCell, const std::vector<ConnType>& srcCells, MyMatrix& res)
-  {
-    std::vector<double> CoordsT;
-    typename MyMatrix::value_type& resRow=res[targetCell];
-    const double *coordsS=Intersector3DP1P0<MyMeshType,MyMatrix>::_src_mesh.getCoordinatesPtr();
-    Intersector3DP1P0<MyMeshType,MyMatrix>::getRealTargetCoordinates(OTT<ConnType,numPol>::indFC(targetCell),CoordsT);
-    double baryT[SPACEDIM];
-    calculateBarycenterDyn2<SPACEDIM>(&CoordsT[0],CoordsT.size()/SPACEDIM,baryT);
-    for(typename std::vector<ConnType>::const_iterator iterCellS=srcCells.begin();iterCellS!=srcCells.end();iterCellS++)
-      {
-        NormalizedCellType tS=Intersector3DP1P0<MyMeshType,MyMatrix>::_src_mesh.getTypeOfElement(OTT<ConnType,numPol>::indFC(*iterCellS));
-        if(tS!=NORM_TETRA4)
-          throw INTERP_KERNEL::Exception("Invalid source cell detected for meshdim==3. Only TETRA4 supported !");
-        const CellModel& cmTypeS=CellModel::getCellModel(tS);
-        std::vector<ConnType> connOfCurCellS;
-        Intersector3DP1P0<MyMeshType,MyMatrix>::getConnOfSourceCell(OTT<ConnType,numPol>::indFC(*iterCellS),connOfCurCellS);
-        if( PointLocatorAlgos<MyMeshType>::isElementContainsPointAlg3D(baryT,&connOfCurCellS[0],connOfCurCellS.size(),coordsS,cmTypeS,_precision) )
-          {
-            double resLoc[4];
-            std::vector<double> srcCell;
-            Intersector3DP1P0<MyMeshType,MyMatrix>::getRealSourceCoordinates(OTT<ConnType,numPol>::indFC(*iterCellS),srcCell);
-            std::vector<const double*> eap(4);
-            eap[0]=&srcCell[0]; eap[1]=&srcCell[3]; eap[2]=&srcCell[6]; eap[3]=&srcCell[9];
-            barycentric_coords(eap,baryT,resLoc);
-            const ConnType *startOfCellNodeConn=Intersector3DP1P0<MyMeshType,MyMatrix>::getStartConnOfSourceCell(*iterCellS);
-            for(int nodeIdS=0;nodeIdS<4;nodeIdS++)
-              {
-                if(fabs(resLoc[nodeIdS])>_precision)
-                  {
-                    ConnType curNodeSInCmode=OTT<ConnType,numPol>::coo2C(startOfCellNodeConn[nodeIdS]);
-                    typename MyMatrix::value_type::const_iterator iterRes=resRow.find(OTT<ConnType,numPol>::indFC(curNodeSInCmode));
-                    if(iterRes==resRow.end())
-                      resRow.insert(std::make_pair(OTT<ConnType,numPol>::indFC(curNodeSInCmode),resLoc[nodeIdS]));
-                    else
-                      {
-                        double val=(*iterRes).second+resLoc[nodeIdS];
-                        resRow.erase(OTT<ConnType,numPol>::indFC(curNodeSInCmode));
-                        resRow.insert(std::make_pair(OTT<ConnType,numPol>::indFC(curNodeSInCmode),val));
-                      }
-                  }
-              }
-          }
-      }
-  }
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.hxx b/src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.hxx
deleted file mode 100644
index 402124fa4..000000000
--- a/src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __POINTLOCATOR3DINTERSECTORP1P1_HXX__
-#define __POINTLOCATOR3DINTERSECTORP1P1_HXX__
-
-#include "Intersector3DP1P1.hxx"
-#include "NormalizedUnstructuredMesh.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class MyMeshType, class MyMatrix>
-  class PointLocator3DIntersectorP1P1 : public Intersector3DP1P1<MyMeshType,MyMatrix>
-  { 
-  public:
-    static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-    static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    typedef typename MyMeshType::MyConnType ConnType;
-    static const NumberingPolicy numPol=MyMeshType::My_numPol;
-  public:
-    PointLocator3DIntersectorP1P1(const MyMeshType& targetMesh, const MyMeshType& srcMesh, double precision);
-    ~PointLocator3DIntersectorP1P1();
-    void intersectCells(ConnType targetCell, const std::vector<ConnType>& srcCells, MyMatrix& res);
-  protected:
-    double _precision;
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.txx b/src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.txx
deleted file mode 100644
index 78bbb7655..000000000
--- a/src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.txx
+++ /dev/null
@@ -1,101 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-#ifndef __POINTLOCATOR3DINTERSECTORP1P1_TXX__
-#define __POINTLOCATOR3DINTERSECTORP1P1_TXX__
-
-#include "PointLocator3DIntersectorP1P1.hxx"
-#include "Intersector3DP1P1.txx"
-#include "MeshUtils.hxx"
-
-namespace INTERP_KERNEL
-{
-
-  /**
-   * Constructor creating object from target cell global number 
-   * 
-   * @param targetMesh  mesh containing the target elements
-   * @param srcMesh     mesh containing the source elements
-   * @param policy      splitting policy to be used
-   */
-  template<class MyMeshType, class MyMatrix>
-  PointLocator3DIntersectorP1P1<MyMeshType,MyMatrix>::PointLocator3DIntersectorP1P1(const MyMeshType& targetMesh, const MyMeshType& srcMesh, double precision):
-    Intersector3DP1P1<MyMeshType,MyMatrix>(targetMesh,srcMesh),_precision(precision)
-  {
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  PointLocator3DIntersectorP1P1<MyMeshType,MyMatrix>::~PointLocator3DIntersectorP1P1()
-  {
-  }
-
-  /**
-   * @param targetCell in C mode.
-   * @param srcCells in C mode.
-   */
-  template<class MyMeshType, class MyMatrix>
-  void PointLocator3DIntersectorP1P1<MyMeshType,MyMatrix>::intersectCells(ConnType targetCell, const std::vector<ConnType>& srcCells, MyMatrix& res)
-  {
-    std::vector<double> CoordsT;
-    Intersector3DP1P1<MyMeshType,MyMatrix>::getRealTargetCoordinates(OTT<ConnType,numPol>::indFC(targetCell),CoordsT);
-    int nbOfNodesT=CoordsT.size()/SPACEDIM;
-    const double *coordsS=Intersector3DP1P1<MyMeshType,MyMatrix>::_src_mesh.getCoordinatesPtr();
-    for(typename std::vector<ConnType>::const_iterator iterCellS=srcCells.begin();iterCellS!=srcCells.end();iterCellS++)
-      {
-        NormalizedCellType tS=Intersector3DP1P1<MyMeshType,MyMatrix>::_src_mesh.getTypeOfElement(OTT<ConnType,numPol>::indFC(*iterCellS));
-        if(tS!=NORM_TETRA4)
-          throw INTERP_KERNEL::Exception("Invalid source cell detected for meshdim==3. Only TETRA4 supported !");
-        const CellModel& cmTypeS=CellModel::getCellModel(tS);
-        const ConnType *startOfCellNodeConnT=Intersector3DP1P1<MyMeshType,MyMatrix>::getStartConnOfTargetCell(targetCell);
-        for(int nodeIdT=0;nodeIdT<nbOfNodesT;nodeIdT++)
-          {
-            typename MyMatrix::value_type& resRow=res[OTT<ConnType,numPol>::ind2C(startOfCellNodeConnT[nodeIdT])];
-            std::vector<ConnType> connOfCurCellS;
-            Intersector3DP1P1<MyMeshType,MyMatrix>::getConnOfSourceCell(OTT<ConnType,numPol>::indFC(*iterCellS),connOfCurCellS);
-            if( PointLocatorAlgos<MyMeshType>::isElementContainsPointAlg3D(&CoordsT[nodeIdT*SPACEDIM],&connOfCurCellS[0],connOfCurCellS.size(),coordsS,cmTypeS,_precision) )
-              {
-                double resLoc[4];
-                std::vector<double> localCoordsS;
-                Intersector3DP1P1<MyMeshType,MyMatrix>::getRealSourceCoordinates(OTT<ConnType,numPol>::indFC(*iterCellS),localCoordsS);
-                std::vector<const double*> eap(4);
-                eap[0]=&localCoordsS[0]; eap[1]=&localCoordsS[3]; eap[2]=&localCoordsS[6]; eap[3]=&localCoordsS[9];
-                barycentric_coords(eap,&CoordsT[nodeIdT*SPACEDIM],resLoc);
-                const ConnType *startOfCellNodeConnS=Intersector3DP1P1<MyMeshType,MyMatrix>::getStartConnOfSourceCell(*iterCellS);
-                for(int nodeIdS=0;nodeIdS<4;nodeIdS++)
-                  {
-                    if(fabs(resLoc[nodeIdS])>_precision)
-                      {
-                        ConnType curNodeSInCmode=OTT<ConnType,numPol>::coo2C(startOfCellNodeConnS[nodeIdS]);
-                        typename MyMatrix::value_type::const_iterator iterRes=resRow.find(OTT<ConnType,numPol>::indFC(curNodeSInCmode));
-                        if(iterRes==resRow.end())
-                          resRow.insert(std::make_pair(OTT<ConnType,numPol>::indFC(curNodeSInCmode),resLoc[nodeIdS]));
-                        else
-                          {
-                            double val=(*iterRes).second+resLoc[nodeIdS];
-                            resRow.erase(OTT<ConnType,numPol>::indFC(curNodeSInCmode));
-                            resRow.insert(std::make_pair(OTT<ConnType,numPol>::indFC(curNodeSInCmode),val));
-                          }
-                      }
-                  }
-              }
-          }
-      }
-  }
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PointLocatorAlgos.txx b/src/INTERP_KERNEL/PointLocatorAlgos.txx
deleted file mode 100644
index d7dd7432e..000000000
--- a/src/INTERP_KERNEL/PointLocatorAlgos.txx
+++ /dev/null
@@ -1,222 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-#ifndef __POINTLOCATORALGOS_TXX__
-#define __POINTLOCATORALGOS_TXX__
-
-#include "InterpolationUtils.hxx"
-#include "CellModel.hxx"
-#include "BBTree.txx"
-
-#include <list>
-#include <limits>
-
-namespace INTERP_KERNEL
-{
-  class GenericPointLocatorAlgos
-  {
-  public:
-    virtual ~GenericPointLocatorAlgos() { }
-    virtual std::list<int> locates(const double* x, double eps) = 0;     
-  };
-        
-  template<class MyMeshType>
-  class PointLocatorAlgos: public GenericPointLocatorAlgos
-  {
-  private : 
-    double* _bb;
-    BBTree<MyMeshType::MY_SPACEDIM,typename MyMeshType::MyConnType>* _tree;
-    const MyMeshType& _mesh;
-  public:
-    PointLocatorAlgos(const MyMeshType& mesh):_mesh(mesh)
-    {
-      typedef typename MyMeshType::MyConnType ConnType;
-      const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-      const NumberingPolicy numPol=MyMeshType::My_numPol;
-      int nelem = _mesh.getNumberOfElements();
-      _bb = new double[SPACEDIM*2*nelem];
-      const ConnType* conn = _mesh.getConnectivityPtr();
-      const ConnType* conn_index = _mesh.getConnectivityIndexPtr();
-      const double* coords=_mesh.getCoordinatesPtr();
-      for (int i=0; i<nelem; i++)
-        {
-          for (int idim=0; idim<SPACEDIM; idim++)
-            {
-              _bb[2*(i*SPACEDIM+idim)]=std::numeric_limits<double>::max();
-              _bb[2*(i*SPACEDIM+idim)+1]=-std::numeric_limits<double>::max();
-            }
-          for (int index= conn_index[i]; index < conn_index[i+1];index++)
-            {
-              //coordelem points to the coordinates of the current node of the i-th element
-              const double* coordelem = coords+OTT<ConnType,numPol>::ind2C(conn[OTT<ConnType,numPol>::ind2C(index)])*SPACEDIM;
-
-              //the bounding box is updated by checking wheher the node is at the min/max in exach dimension
-              for (int idim=0; idim<SPACEDIM;idim++)
-                {
-                  _bb[2*(i*SPACEDIM+idim)]=(coordelem[idim]<_bb[2*(i*SPACEDIM+idim)])?coordelem[idim]:_bb[2*(i*SPACEDIM+idim)];
-                  _bb[2*(i*SPACEDIM+idim)+1]=(coordelem[idim]>_bb[2*(i*SPACEDIM+idim)+1])?coordelem[idim]:_bb[2*(i*SPACEDIM+idim)+1];
-                }
-            }
-        }
-      _tree=new BBTree<SPACEDIM,typename MyMeshType::MyConnType>(_bb,0,0,nelem);
-    }
-
-    ~PointLocatorAlgos()
-    {
-      delete[] _bb;
-      delete _tree;
-    }
-        
-    //returns the list of elements that contains 
-    //the point pointed to by x
-    std::list<typename MyMeshType::MyConnType> locates(const double* x, double eps)
-    {
-      typedef typename MyMeshType::MyConnType ConnType;
-      const NumberingPolicy numPol=MyMeshType::My_numPol;
-      std::vector<ConnType> candidates;
-      _tree->getElementsAroundPoint(x,candidates);
-      std::list<ConnType> retlist;
-      for(unsigned int i=0; i< candidates.size(); i++)
-        {
-          int ielem=candidates[i];
-          if (elementContainsPoint(ielem,x,eps))
-            retlist.push_back(OTT<ConnType,numPol>::indFC(ielem));
-        }
-      return retlist;
-    }
-
-    static bool isElementContainsPointAlg2D(const double *ptToTest, const double *cellPts, int nbEdges, double eps)
-    {
-      /* with dimension 2, it suffices to check all the edges
-         and see if the sign of double products from the point
-         is always the same.
-                         C
-                        / \
-                       /   \
-             Xo       /     \ 
-                     A-------B
-       
-         here XA^XC and XC^XB have different signs*/
-      const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-      int* sign = new int[nbEdges];
-      for (int iedge=0; iedge<nbEdges; iedge++)
-        {
-          const double* A=cellPts+SPACEDIM*iedge;
-          const double* B=cellPts+SPACEDIM*((iedge+1)%nbEdges);
-          double a=mon_determinant(ptToTest, A, B);
-          if(a<-eps)
-            sign[iedge]=-1;
-          else if(a>eps)
-            sign[iedge]=1;
-          else
-            sign[iedge]=0;
-        }
-      bool ret=decideFromSign(sign, nbEdges);
-      delete [] sign;
-      return ret;
-    }
-
-    static bool isElementContainsPointAlg3D(const double *ptToTest, const typename MyMeshType::MyConnType *conn_elem, int conn_elem_sz, const double *coords, const CellModel& cmType, double eps)
-    {
-      const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-      typedef typename MyMeshType::MyConnType ConnType;
-      const NumberingPolicy numPol=MyMeshType::My_numPol;
-      
-      int nbfaces = cmType.getNumberOfSons2(conn_elem,conn_elem_sz);
-      int *sign = new int[nbfaces];
-      int *connOfSon = new int[conn_elem_sz];
-      for (int iface=0; iface<nbfaces; iface++)
-        {
-          NormalizedCellType typeOfSon;
-          cmType.fillSonCellNodalConnectivity2(iface,conn_elem,conn_elem_sz,connOfSon,typeOfSon);
-          const double* AA=coords+SPACEDIM*(OTT<ConnType,numPol>::coo2C(connOfSon[0]));
-          const double* BB=coords+SPACEDIM*(OTT<ConnType,numPol>::coo2C(connOfSon[1]));
-          const double* CC=coords+SPACEDIM*(OTT<ConnType,numPol>::coo2C(connOfSon[2]));                                                       
-          double Vol=triple_product(AA,BB,CC,ptToTest);
-          if (Vol<-eps)
-            sign[iface]=-1;
-          else if (Vol>eps)
-            sign[iface]=1;
-              else
-                sign[iface]=0;
-        }
-      bool ret=decideFromSign(sign, nbfaces);
-      delete [] sign;
-      delete [] connOfSon;
-      return ret;
-    }
-
-    static bool isElementContainsPoint(const double *ptToTest, NormalizedCellType type, const double *coords, const typename MyMeshType::MyConnType *conn_elem, int conn_elem_sz, double eps)
-    {
-      const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-      typedef typename MyMeshType::MyConnType ConnType;
-      const NumberingPolicy numPol=MyMeshType::My_numPol;
-
-      const CellModel& cmType=CellModel::getCellModel(type);
-      //
-      if (SPACEDIM==2)
-        {
-          int nbEdges=cmType.getNumberOfSons();
-          double *pts = new double[nbEdges*SPACEDIM];
-          for (int iedge=0; iedge<nbEdges; iedge++)
-            {
-              const double* a=coords+SPACEDIM*(OTT<ConnType,numPol>::ind2C(conn_elem[iedge]));
-              std::copy(a,a+SPACEDIM,pts+iedge*SPACEDIM);
-            }
-          bool ret=isElementContainsPointAlg2D(ptToTest,pts,nbEdges,eps);
-          delete [] pts;
-          return ret;
-        }
-                        
-      if (SPACEDIM==3)
-        {
-          return isElementContainsPointAlg3D(ptToTest,conn_elem,conn_elem_sz,coords,cmType,eps);
-        }
-    }
-        
-    bool elementContainsPoint(typename MyMeshType::MyConnType i, const double* x, double eps)
-    {
-      //as i is extracted from the BBTRee, it is already in C numbering
-      //it is not necessary to convert it from F to C
-      typedef typename MyMeshType::MyConnType ConnType;
-      const NumberingPolicy numPol=MyMeshType::My_numPol;
-      
-      const double* coords= _mesh.getCoordinatesPtr();
-      const ConnType* conn=_mesh.getConnectivityPtr();
-      const ConnType* conn_index= _mesh.getConnectivityIndexPtr();
-      const ConnType* conn_elem=conn+OTT<ConnType,numPol>::ind2C(conn_index[i]);
-      int conn_elem_sz=conn_index[i+1]-conn_index[i];
-      NormalizedCellType type=_mesh.getTypeOfElement(OTT<ConnType,numPol>::indFC(i));
-      return isElementContainsPoint(x,type,coords,conn_elem,conn_elem_sz,eps);
-    }
-                
-    static bool decideFromSign(const int* sign, int nbelem)
-    {
-      int min_sign = 1;
-      int max_sign = -1;
-      for (int i=0; i<nbelem;i++)
-        {
-          min_sign=(sign[i]<min_sign)?sign[i]:min_sign;
-          max_sign=(sign[i]>max_sign)?sign[i]:max_sign;
-        }
-      return (min_sign!=-1 || max_sign!=1);     
-    }
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PolyhedronIntersectorP0P0.hxx b/src/INTERP_KERNEL/PolyhedronIntersector.hxx
similarity index 82%
rename from src/INTERP_KERNEL/PolyhedronIntersectorP0P0.hxx
rename to src/INTERP_KERNEL/PolyhedronIntersector.hxx
index 30d3b2af7..4cf4fb4ee 100644
--- a/src/INTERP_KERNEL/PolyhedronIntersectorP0P0.hxx
+++ b/src/INTERP_KERNEL/PolyhedronIntersector.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,9 +16,8 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-#ifndef __POLYHEDRONINTERSECTORP0P0_HXX__
-#define __POLYHEDRONINTERSECTORP0P0_HXX__
+#ifndef __POLYHEDRONINTERSECTOR_HXX__
+#define __POLYHEDRONINTERSECTOR_HXX__
 
 #include "Intersector3DP0P0.hxx"
 #include "SplitterTetra.hxx"
@@ -34,7 +33,7 @@ namespace INTERP_KERNEL
    *
    */
   template<class MyMeshType, class MyMatrix>
-  class PolyhedronIntersectorP0P0 : public Intersector3DP0P0<MyMeshType,MyMatrix>
+  class PolyhedronIntersector : public Intersector3DP0P0<MyMeshType,MyMatrix>
   { 
   public:
     static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
@@ -43,9 +42,9 @@ namespace INTERP_KERNEL
     static const NumberingPolicy numPol=MyMeshType::My_numPol;
   public:
 
-    PolyhedronIntersectorP0P0(const MyMeshType& targetMesh, const MyMeshType& srcMesh, SplittingPolicy policy = GENERAL_24);
+    PolyhedronIntersector(const MyMeshType& targetMesh, const MyMeshType& srcMesh, SplittingPolicy policy = GENERAL_24);
 
-    ~PolyhedronIntersectorP0P0();
+    ~PolyhedronIntersector();
 
     void intersectCells(ConnType targetCell, const std::vector<ConnType>& srcCells, MyMatrix& res);
 
diff --git a/src/INTERP_KERNEL/PolyhedronIntersectorP0P0.txx b/src/INTERP_KERNEL/PolyhedronIntersector.txx
similarity index 80%
rename from src/INTERP_KERNEL/PolyhedronIntersectorP0P0.txx
rename to src/INTERP_KERNEL/PolyhedronIntersector.txx
index 1fde5d1ae..1d58f7a58 100644
--- a/src/INTERP_KERNEL/PolyhedronIntersectorP0P0.txx
+++ b/src/INTERP_KERNEL/PolyhedronIntersector.txx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,10 +16,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#ifndef __POLYHEDRONINTERSECTORP0P0_TXX__
-#define __POLYHEDRONINTERSECTORP0P0_TXX__
+#ifndef __POLYHEDRONINTERSECTOR_TXX__
+#define __POLYHEDRONINTERSECTOR_TXX__
 
-#include "PolyhedronIntersectorP0P0.hxx"
+#include "PolyhedronIntersector.hxx"
 #include "Intersector3DP0P0.txx"
 #include "MeshUtils.hxx"
 
@@ -39,7 +39,7 @@ namespace INTERP_KERNEL
    * @param policy      splitting policy to be used
    */
   template<class MyMeshType, class MyMatrix>
-  PolyhedronIntersectorP0P0<MyMeshType,MyMatrix>::PolyhedronIntersectorP0P0(const MyMeshType& targetMesh, const MyMeshType& srcMesh, SplittingPolicy policy):Intersector3DP0P0<MyMeshType,MyMatrix>(targetMesh,srcMesh),_split(targetMesh,srcMesh,policy)
+  PolyhedronIntersector<MyMeshType,MyMatrix>::PolyhedronIntersector(const MyMeshType& targetMesh, const MyMeshType& srcMesh, SplittingPolicy policy):Intersector3DP0P0<MyMeshType,MyMatrix>(targetMesh,srcMesh),_split(targetMesh,srcMesh,policy)
   {
   }
 
@@ -49,13 +49,13 @@ namespace INTERP_KERNEL
    *
    */
   template<class MyMeshType, class MyMatrix>
-  PolyhedronIntersectorP0P0<MyMeshType,MyMatrix>::~PolyhedronIntersectorP0P0()
+  PolyhedronIntersector<MyMeshType,MyMatrix>::~PolyhedronIntersector()
   {
     releaseArrays();
   }
     
   template<class MyMeshType, class MyMatrix>
-  void PolyhedronIntersectorP0P0<MyMeshType,MyMatrix>::releaseArrays()
+  void PolyhedronIntersector<MyMeshType,MyMatrix>::releaseArrays()
   {
     for(typename std::vector< SplitterTetra<MyMeshType>* >::iterator iter = _tetra.begin(); iter != _tetra.end(); ++iter)
       delete *iter;
@@ -74,7 +74,7 @@ namespace INTERP_KERNEL
    *
    */
   template<class MyMeshType, class MyMatrix>
-  void PolyhedronIntersectorP0P0<MyMeshType,MyMatrix>::intersectCells(ConnType targetCell, const std::vector<ConnType>& srcCells, MyMatrix& res)
+  void PolyhedronIntersector<MyMeshType,MyMatrix>::intersectCells(ConnType targetCell, const std::vector<ConnType>& srcCells, MyMatrix& res)
   {
     int nbOfNodesT=Intersector3D<MyMeshType,MyMatrix>::_target_mesh.getNumberOfNodesOfElement(OTT<ConnType,numPol>::indFC(targetCell));
     releaseArrays();
diff --git a/src/INTERP_KERNEL/PolyhedronIntersectorP1P0Bary.hxx b/src/INTERP_KERNEL/PolyhedronIntersectorP1P0Bary.hxx
deleted file mode 100644
index 899adc731..000000000
--- a/src/INTERP_KERNEL/PolyhedronIntersectorP1P0Bary.hxx
+++ /dev/null
@@ -1,64 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __PolyhedronIntersectorP1P0Bary_HXX__
-#define __PolyhedronIntersectorP1P0Bary_HXX__
-
-#include "Intersector3DP1P0Bary.hxx"
-#include "SplitterTetra.hxx"
-#include "NormalizedUnstructuredMesh.hxx"
-
-namespace INTERP_KERNEL
-{
-
-
-  /** 
-   * \brief Class responsible for calculating intersection between a hexahedron target element and  
-   * the source elements.
-   *
-   */
-  template<class MyMeshType, class MyMatrix>
-  class PolyhedronIntersectorP1P0Bary : public Intersector3DP1P0Bary<MyMeshType,MyMatrix>
-  { 
-  public:
-    static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-    static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    typedef typename MyMeshType::MyConnType ConnType;
-    static const NumberingPolicy numPol=MyMeshType::My_numPol;
-  public:
-
-    PolyhedronIntersectorP1P0Bary(const MyMeshType& targetMesh, const MyMeshType& srcMesh, SplittingPolicy policy = GENERAL_24);
-
-    ~PolyhedronIntersectorP1P0Bary();
-
-    void intersectCells(ConnType targetCell, const std::vector<ConnType>& srcCells, MyMatrix& res);
-
-  private:
-    void releaseArrays();
-  private:
-    /// pointers to the SplitterTetra objects representing the tetrahedra 
-    /// that result from the splitting of the hexahedron target cell
-    std::vector< SplitterTetra<MyMeshType>* > _tetra;
-    
-    SplitterTetra2<MyMeshType> _split;
-    
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PolyhedronIntersectorP1P0Bary.txx b/src/INTERP_KERNEL/PolyhedronIntersectorP1P0Bary.txx
deleted file mode 100644
index c38e16d50..000000000
--- a/src/INTERP_KERNEL/PolyhedronIntersectorP1P0Bary.txx
+++ /dev/null
@@ -1,153 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-#ifndef __PolyhedronIntersectorP1P0Bary_TXX__
-#define __PolyhedronIntersectorP1P0Bary_TXX__
-
-#include "PolyhedronIntersectorP1P0Bary.hxx"
-#include "Intersector3DP1P0Bary.txx"
-#include "MeshUtils.hxx"
-
-#include "SplitterTetra.txx"
-
-namespace INTERP_KERNEL
-{
-
-  /**
-   * Constructor creating object from target cell global number 
-   * The constructor first calculates the necessary nodes, 
-   * (depending on the splitting policy) and then splits the hexahedron into 
-   * tetrahedra, placing these in the internal vector _tetra.
-   * 
-   * @param targetMesh  mesh containing the target elements
-   * @param srcMesh     mesh containing the source elements
-   * @param policy      splitting policy to be used
-   *
-   * WARNING : in _split attribute, sourceMesh and targetMesh are switched in order to fit intersectCells feature.
-   */
-  template<class MyMeshType, class MyMatrix>
-  PolyhedronIntersectorP1P0Bary<MyMeshType,MyMatrix>::PolyhedronIntersectorP1P0Bary(const MyMeshType& targetMesh,
-                                                                                    const MyMeshType& srcMesh,
-                                                                                    SplittingPolicy policy)
-    :Intersector3DP1P0Bary<MyMeshType,MyMatrix>(targetMesh,srcMesh),_split(targetMesh,srcMesh,policy)
-  {
-    // SPEC:
-    // "Limitation. For the P1P0 barycentric improvement only triangle source cells in 2D and
-    // tetrahedrons in 3D will be supported by interpolators. If a non
-    // triangle/tetrahedron source cell is detected an INTERP_KERNEL::Exception should be thrown."
-
-    // Check types of source elements here rather than in intersectCells() since a wrong type can be
-    // found late after a long time of calculation.
-
-    const unsigned long numSrcElems = srcMesh.getNumberOfElements();
-    for(unsigned long i = 0 ; i < numSrcElems ; ++i)
-      if ( srcMesh.getTypeOfElement( OTT<ConnType,numPol>::indFC(i) ) != NORM_TETRA4 )
-        throw INTERP_KERNEL::Exception("P1P0 barycentric algorithm works only with tetrahedral source meshes");
-  }
-
-  /**
-   * Destructor.
-   * Liberates the SplitterTetra objects and potential sub-node points that have been allocated.
-   *
-   */
-  template<class MyMeshType, class MyMatrix>
-  PolyhedronIntersectorP1P0Bary<MyMeshType,MyMatrix>::~PolyhedronIntersectorP1P0Bary()
-  {
-    releaseArrays();
-  }
-
-  template<class MyMeshType, class MyMatrix>
-  void PolyhedronIntersectorP1P0Bary<MyMeshType,MyMatrix>::releaseArrays()
-  {
-    for(typename std::vector< SplitterTetra<MyMeshType>* >::iterator iter = _tetra.begin(); iter != _tetra.end(); ++iter)
-      delete *iter;
-    _split.releaseArrays();
-    _tetra.clear();
-  }
-
-  //================================================================================
-  /*!
-   * \brief This method computes a value per each node of source cell for each target cell.
-   *  \param srcCell - a source tetrahedron
-   *  \param tgtCells - target elements
-   *  \param res - matrix to fill in 
-   */
-  //================================================================================
-
-  template<class MyMeshType, class MyMatrix>
-  void PolyhedronIntersectorP1P0Bary<MyMeshType,MyMatrix>::intersectCells(ConnType                     tgtCell,
-                                                                          const std::vector<ConnType>& srcCells,
-                                                                          MyMatrix&                    res)
-  {
-    typename MyMatrix::value_type& resRow=res[tgtCell];
-
-    int nbOfNodesT=Intersector3D<MyMeshType,MyMatrix>::_target_mesh.getNumberOfNodesOfElement(OTT<ConnType,numPol>::indFC(tgtCell));
-    releaseArrays();
-    _split.splitTargetCell(tgtCell,nbOfNodesT,_tetra);
-
-    for(typename std::vector<ConnType>::const_iterator iterCellS=srcCells.begin();iterCellS!=srcCells.end();iterCellS++)
-    {
-      // intersect a source tetrahedron with each target tetrahedron: get intersection volume and barycenter
-      double baryCentre[SPACEDIM], total_baryCentre[3] = { 0., 0., 0.};
-      double interVolume = 0;
-      for(typename std::vector<SplitterTetra<MyMeshType>*>::iterator iterTetraT = _tetra.begin(); iterTetraT != _tetra.end(); ++iterTetraT)
-      {
-        SplitterTetra<MyMeshType> *tmp=*iterTetraT;
-        tmp->clearVolumesCache();
-        double volume = tmp->intersectSourceCell(*iterCellS, baryCentre);
-        if ( volume > 0 )
-        {
-          interVolume += volume;
-          for ( int i = 0; i < SPACEDIM; ++i )
-            total_baryCentre[i] += baryCentre[i]*volume;
-        }
-      }
-      if(interVolume!=0)
-      {
-        for ( int i = 0; i < SPACEDIM; ++i )
-          total_baryCentre[i] /= interVolume;
-
-        // coordinates of the source tetrahedron
-        std::vector<const double*> srcCellCoords(4);
-        for ( int n = 0; n < 4; ++n )
-          srcCellCoords[ n ] = getCoordsOfNode( n, *iterCellS, Intersector3D<MyMeshType,MyMatrix>::_src_mesh );
-
-        // compute barycentric coordinates
-        double baryCoords[4];
-        barycentric_coords( srcCellCoords, total_baryCentre, baryCoords);
-
-        // store coeffs of each node of the source tetrahedron
-        const ConnType *srcCellNodes=Intersector3D<MyMeshType,MyMatrix>::_src_mesh.getConnectivityPtr()+OTT<ConnType,numPol>::conn2C(Intersector3D<MyMeshType,MyMatrix>::_src_mesh.getConnectivityIndexPtr()[*iterCellS]);
-        for ( int n = 0; n < 4; ++n )
-        {
-          double val = baryCoords[n] * interVolume;
-          ConnType curNodeS = srcCellNodes[n];
-          typename MyMatrix::value_type::const_iterator iterRes=resRow.find(curNodeS);
-          if(iterRes!=resRow.end())
-          {
-            val += iterRes->second;
-            resRow.erase( curNodeS );
-          }
-          resRow.insert(std::make_pair(curNodeS,val));
-        }
-      }
-    }
-  }
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.hxx b/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.hxx
deleted file mode 100644
index 736188661..000000000
--- a/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.hxx
+++ /dev/null
@@ -1,55 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __PolyhedronIntersectorP1P1_HXX__
-#define __PolyhedronIntersectorP1P1_HXX__
-
-#include "Intersector3DP1P1.hxx"
-#include "SplitterTetra.hxx"
-#include "NormalizedUnstructuredMesh.hxx"
-
-namespace INTERP_KERNEL
-{
-
-
-  /** 
-   * \brief Class responsible for calculating intersection between a hexahedron target element and  
-   * the source elements.
-   *
-   */
-  template<class MyMeshType, class MyMatrix>
-  class PolyhedronIntersectorP1P1 : public Intersector3DP1P1<MyMeshType,MyMatrix>
-  { 
-  public:
-    static const int SPACEDIM=MyMeshType::MY_SPACEDIM;
-    static const int MESHDIM=MyMeshType::MY_MESHDIM;
-    typedef typename MyMeshType::MyConnType ConnType;
-    static const NumberingPolicy numPol=MyMeshType::My_numPol;
-  public:
-
-    PolyhedronIntersectorP1P1(const MyMeshType& targetMesh, const MyMeshType& srcMesh, SplittingPolicy policy = GENERAL_24);
-
-    ~PolyhedronIntersectorP1P1();
-
-    void intersectCells(ConnType targetCell, const std::vector<ConnType>& srcCells, MyMatrix& res);
-    
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.txx b/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.txx
deleted file mode 100644
index f80348924..000000000
--- a/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.txx
+++ /dev/null
@@ -1,133 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-#ifndef __PolyhedronIntersectorP1P1_TXX__
-#define __PolyhedronIntersectorP1P1_TXX__
-
-#include "PolyhedronIntersectorP1P1.hxx"
-#include "Intersector3DP1P1.txx"
-#include "MeshUtils.hxx"
-
-#include "SplitterTetra.txx"
-
-namespace INTERP_KERNEL
-{
-
-  /**
-   * Constructor creating object from target cell global number 
-   * 
-   * @param targetMesh  mesh containing the target elements
-   * @param srcMesh     mesh containing the source elements
-   * @param policy      splitting policy to be used
-   */
-  template<class MyMeshType, class MyMatrix>
-  PolyhedronIntersectorP1P1<MyMeshType,MyMatrix>::PolyhedronIntersectorP1P1(const MyMeshType& targetMesh, const MyMeshType& srcMesh, SplittingPolicy policy):Intersector3DP1P1<MyMeshType,MyMatrix>(targetMesh,srcMesh)
-  {
-    // SPEC:
-    // "Limitation. Concerning P1P1 3D improvement only tetrahedron will be supported.
-    // If another type than tetrahedron is detected an INTERP_KERNEL::Exception should be thrown"
-
-    // Check types of elements here rather than in intersectCells() since a wrong type can be
-    // found late after a long time of calculation.
-
-    const unsigned long numSrcElems = srcMesh.getNumberOfElements();
-    for(unsigned long i = 0 ; i < numSrcElems ; ++i)
-      if ( srcMesh.getTypeOfElement( OTT<ConnType,numPol>::indFC( i )) != NORM_TETRA4 )
-        throw INTERP_KERNEL::Exception("P1P1 3D algorithm works only with tetrahedral meshes");
-
-    const unsigned long numTgtElems = targetMesh.getNumberOfElements();
-    for(unsigned long i = 0 ; i < numTgtElems ; ++i)
-      if ( targetMesh.getTypeOfElement( OTT<ConnType,numPol>::indFC( i )) != NORM_TETRA4 )
-        throw INTERP_KERNEL::Exception("P1P1 3D algorithm works only with tetrahedral meshes");
-  }
-
-  /**
-   * Destructor.
-   */
-  template<class MyMeshType, class MyMatrix>
-  PolyhedronIntersectorP1P1<MyMeshType,MyMatrix>::~PolyhedronIntersectorP1P1()
-  {
-  }
-
-  /**
-   * Calculates the volume of intersection of an element in the source mesh and the target element
-   * represented by the object.
-   * 
-   * @param targetCell in C mode.
-   * @param srcCells in C mode.
-   */
-  template<class MyMeshType, class MyMatrix>
-  void PolyhedronIntersectorP1P1<MyMeshType,MyMatrix>::intersectCells(ConnType targetCell, const std::vector<ConnType>& srcCells, MyMatrix& res)
-  {
-#ifdef _DEBUG_
-    UnitTetraIntersectionBary b; b.init();
-#endif
-    // split the targetCell into dual cells
-    std::pair< int, std::vector<double> > subTetraNodes[24]; // a node of sub tetra and its coordinates
-    const double* nodes[4]; int conn[4];
-    for(int node = 0; node < 4 ; ++node)
-      nodes[node]=getCoordsOfNode2(node, OTT<ConnType,numPol>::indFC(targetCell),
-                                   Intersector3D<MyMeshType,MyMatrix>::_target_mesh,conn[node]);
-    SplitterTetra<MyMeshType> tgtTetra(Intersector3D<MyMeshType,MyMatrix>::_src_mesh, nodes, conn);
-    for (int i=0; i<24; i++)
-      {
-        subTetraNodes[i].second.resize(12);
-        tgtTetra.splitMySelfForDual(&subTetraNodes[i].second[0],i,subTetraNodes[i].first);
-      }
-    // intersect each source tetrahedron with each of target dual cells
-    SplitterTetra<MyMeshType>* subTetrasS[24];
-    for(typename std::vector<ConnType>::const_iterator iterCellS=srcCells.begin();iterCellS!=srcCells.end();iterCellS++)
-      {
-        // split a source cell into dual cells
-        for(int node = 0; node < 4 ; ++node)
-          nodes[node]=getCoordsOfNode2(node, OTT<ConnType,numPol>::indFC(*iterCellS),
-                                       Intersector3D<MyMeshType,MyMatrix>::_src_mesh,conn[node]);
-
-        SplitterTetra<MyMeshType> srcTetra(Intersector3D<MyMeshType,MyMatrix>::_target_mesh, nodes, conn);
-        srcTetra.splitIntoDualCells(subTetrasS);
-
-        // intersect each target subTetra with each source one
-        for(int i=0;i<24;i++)
-          {
-            SplitterTetra<MyMeshType> *tmp=subTetrasS[i];
-            ConnType sourceNode=OTT<ConnType,numPol>::indFC(tmp->getId(0));
-            for(int j=0;j<24;j++)
-              {
-                const double* tetraNodes12 = &subTetraNodes[j].second[0];
-                const double* tetraNodesT[4]={ tetraNodes12, tetraNodes12+3, tetraNodes12+6, tetraNodes12+9 };
-                double volume = tmp->intersectTetra( tetraNodesT );
-                if(volume!=0.)
-                  {
-                    ConnType tgtNode=subTetraNodes[j].first;
-                    typename MyMatrix::value_type& resRow = res[tgtNode];
-                    typename MyMatrix::value_type::const_iterator iterRes=resRow.find( sourceNode );
-                    if(iterRes!=resRow.end())
-                      {
-                        volume += (*iterRes).second;
-                        resRow.erase(sourceNode);
-                      }
-                    resRow.insert(std::make_pair(sourceNode,volume));
-                  }
-              }
-            delete tmp;
-          }
-      }
-  }
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/VolSurfUser.hxx b/src/INTERP_KERNEL/VolSurfUser.hxx
deleted file mode 100644
index a0eafd221..000000000
--- a/src/INTERP_KERNEL/VolSurfUser.hxx
+++ /dev/null
@@ -1,34 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __VOLSURFUSER_HXX__
-#define __VOLSURFUSER_HXX__
-
-#include "NormalizedUnstructuredMesh.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class ConnType, NumberingPolicy numPolConn, int SPACEDIM>
-  double computeVolSurfOfCell(NormalizedCellType type, const ConnType *connec, int lgth, const double *coords);
-
-  template<class ConnType, NumberingPolicy numPolConn>
-  double computeVolSurfOfCell2(NormalizedCellType type, const ConnType *connec, int lgth, const double *coords, int spaceDim);
-}
-
-#endif
diff --git a/src/INTERP_KERNEL/VolSurfUser.txx b/src/INTERP_KERNEL/VolSurfUser.txx
deleted file mode 100644
index d6fcd11bf..000000000
--- a/src/INTERP_KERNEL/VolSurfUser.txx
+++ /dev/null
@@ -1,168 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-#ifndef __VOLSURFUSER_TXX__
-#define __VOLSURFUSER_TXX__
-
-#include "VolSurfUser.hxx"
-#include "VolSurfFormulae.hxx"
-#include "InterpolationUtils.hxx"
-
-namespace INTERP_KERNEL
-{
-  template<class ConnType, NumberingPolicy numPol, int SPACEDIM>
-  double computeVolSurfOfCell(NormalizedCellType type, const ConnType *connec, int lgth, const double *coords)
-  {
-    switch(type)
-      {
-      case INTERP_KERNEL::NORM_TRI3 :
-      case INTERP_KERNEL::NORM_TRI6 :
-        {
-          int N1 = OTT<ConnType,numPol>::coo2C(connec[0]);
-          int N2 = OTT<ConnType,numPol>::coo2C(connec[1]);
-          int N3 = OTT<ConnType,numPol>::coo2C(connec[2]);
-              
-          return INTERP_KERNEL::calculateAreaForTria(coords+(SPACEDIM*N1),
-                                                     coords+(SPACEDIM*N2),
-                                                     coords+(SPACEDIM*N3),
-                                                     SPACEDIM);
-        }
-        break;
-            
-      case INTERP_KERNEL::NORM_QUAD4 :
-      case INTERP_KERNEL::NORM_QUAD8 :
-        {
-          int N1 = OTT<ConnType,numPol>::coo2C(connec[0]);
-          int N2 = OTT<ConnType,numPol>::coo2C(connec[1]);
-          int N3 = OTT<ConnType,numPol>::coo2C(connec[2]);
-          int N4 = OTT<ConnType,numPol>::coo2C(connec[3]);
-              
-          return INTERP_KERNEL::calculateAreaForQuad(coords+SPACEDIM*N1,
-                                                     coords+SPACEDIM*N2,
-                                                     coords+SPACEDIM*N3,
-                                                     coords+SPACEDIM*N4,
-                                                     SPACEDIM);
-        }
-        break;
-            
-      case INTERP_KERNEL::NORM_POLYGON :
-        {          
-          const double **pts=new const double *[lgth];
-          for(int inod=0;inod<lgth;inod++)
-            pts[inod] = coords+3*OTT<ConnType,numPol>::coo2C(connec[inod]);
-          double val=INTERP_KERNEL::calculateAreaForPolyg(pts,lgth,SPACEDIM);
-          delete [] pts;
-          return val;
-        }
-        break;
-      case INTERP_KERNEL::NORM_TETRA4 :
-      case INTERP_KERNEL::NORM_TETRA10 :
-        {
-          int N1 = OTT<ConnType,numPol>::coo2C(connec[0]);
-          int N2 = OTT<ConnType,numPol>::coo2C(connec[1]);
-          int N3 = OTT<ConnType,numPol>::coo2C(connec[2]);
-          int N4 = OTT<ConnType,numPol>::coo2C(connec[3]);
-              
-          return INTERP_KERNEL::calculateVolumeForTetra(coords+SPACEDIM*N1,
-                                                        coords+SPACEDIM*N2,
-                                                        coords+SPACEDIM*N3,
-                                                        coords+SPACEDIM*N4);
-        }
-        break;
-            
-      case INTERP_KERNEL::NORM_PYRA5 :
-      case INTERP_KERNEL::NORM_PYRA13 :
-        {
-          int N1 = OTT<ConnType,numPol>::coo2C(connec[0]);
-          int N2 = OTT<ConnType,numPol>::coo2C(connec[1]);
-          int N3 = OTT<ConnType,numPol>::coo2C(connec[2]);
-          int N4 = OTT<ConnType,numPol>::coo2C(connec[3]);
-          int N5 = OTT<ConnType,numPol>::coo2C(connec[4]);
-              
-          return INTERP_KERNEL::calculateVolumeForPyra(coords+SPACEDIM*N1,
-                                                       coords+SPACEDIM*N2,
-                                                       coords+SPACEDIM*N3,
-                                                       coords+SPACEDIM*N4,
-                                                       coords+SPACEDIM*N5);
-        }
-        break;
-            
-      case INTERP_KERNEL::NORM_PENTA6 :
-      case INTERP_KERNEL::NORM_PENTA15 :
-        {
-          int N1 = OTT<ConnType,numPol>::coo2C(connec[0]);
-          int N2 = OTT<ConnType,numPol>::coo2C(connec[1]);
-          int N3 = OTT<ConnType,numPol>::coo2C(connec[2]);
-          int N4 = OTT<ConnType,numPol>::coo2C(connec[3]);
-          int N5 = OTT<ConnType,numPol>::coo2C(connec[4]);
-          int N6 = OTT<ConnType,numPol>::coo2C(connec[5]);
-              
-          return INTERP_KERNEL::calculateVolumeForPenta(coords+SPACEDIM*N1,
-                                                        coords+SPACEDIM*N2,
-                                                        coords+SPACEDIM*N3,
-                                                        coords+SPACEDIM*N4,
-                                                        coords+SPACEDIM*N5,
-                                                        coords+SPACEDIM*N6);
-        }
-        break;
-            
-      case INTERP_KERNEL::NORM_HEXA8 :
-      case INTERP_KERNEL::NORM_HEXA20 :
-        {
-          int N1 = OTT<ConnType,numPol>::coo2C(connec[0]);
-          int N2 = OTT<ConnType,numPol>::coo2C(connec[1]);
-          int N3 = OTT<ConnType,numPol>::coo2C(connec[2]);
-          int N4 = OTT<ConnType,numPol>::coo2C(connec[3]);
-          int N5 = OTT<ConnType,numPol>::coo2C(connec[4]);
-          int N6 = OTT<ConnType,numPol>::coo2C(connec[5]);
-          int N7 = OTT<ConnType,numPol>::coo2C(connec[6]);
-          int N8 = OTT<ConnType,numPol>::coo2C(connec[7]);
-              
-          return INTERP_KERNEL::calculateVolumeForHexa(coords+SPACEDIM*N1,
-                                                       coords+SPACEDIM*N2,
-                                                       coords+SPACEDIM*N3,
-                                                       coords+SPACEDIM*N4,
-                                                       coords+SPACEDIM*N5,
-                                                       coords+SPACEDIM*N6,
-                                                       coords+SPACEDIM*N7,
-                                                       coords+SPACEDIM*N8);
-        }
-        break;
-            
-      case INTERP_KERNEL::NORM_POLYHED :
-        {
-          throw INTERP_KERNEL::Exception("Polyedra Not yet implemented !");
-        }
-        break;
-      default:
-        throw INTERP_KERNEL::Exception("Not recognized cell type to get Area/Volume on it !");
-      }
-  }
-
-  template<class ConnType, NumberingPolicy numPolConn>
-  double computeVolSurfOfCell2(NormalizedCellType type, const ConnType *connec, int lgth, const double *coords, int spaceDim)
-  {
-    if(spaceDim==3)
-      return computeVolSurfOfCell<ConnType,numPolConn,3>(type,connec,lgth,coords);
-    if(spaceDim==2)
-      return computeVolSurfOfCell<ConnType,numPolConn,2>(type,connec,lgth,coords);
-    throw INTERP_KERNEL::Exception("Invalid spaceDim specified : must be 2 or 3");
-  }
-}
-
-#endif
diff --git a/src/INTERP_KERNELTest/ExprEvalInterpTest.cxx b/src/INTERP_KERNELTest/ExprEvalInterpTest.cxx
deleted file mode 100644
index 947f8fa5c..000000000
--- a/src/INTERP_KERNELTest/ExprEvalInterpTest.cxx
+++ /dev/null
@@ -1,380 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "ExprEvalInterpTest.hxx"
-#include "InterpKernelExprParser.hxx"
-
-using namespace INTERP_TEST;
-
-void ExprEvalInterpTest::testBuildStringFromFortran()
-{
-  char toto1[]="123456  ";
-  char result[]="123456";
-  std::string titi;
-  titi=INTERP_KERNEL::ExprParser::buildStringFromFortran(toto1,8);
-  CPPUNIT_ASSERT_EQUAL(6,(int)titi.length());
-  CPPUNIT_ASSERT(titi==result);
-  //
-  char toto2[]=" 23456  ";
-  char result2[]=" 23456";
-  titi=INTERP_KERNEL::ExprParser::buildStringFromFortran(toto2,8);
-  CPPUNIT_ASSERT(titi==result2);
-  CPPUNIT_ASSERT_EQUAL(6,(int)titi.length());
-  //
-  char toto3[]="  3456  ";
-  char result3[]="  3456";
-  titi=INTERP_KERNEL::ExprParser::buildStringFromFortran(toto3,8);
-  CPPUNIT_ASSERT(titi==result3);
-  CPPUNIT_ASSERT_EQUAL(6,(int)titi.length());
-  //
-  char toto4[]="        ";
-  titi=INTERP_KERNEL::ExprParser::buildStringFromFortran(toto4,8);
-  CPPUNIT_ASSERT_EQUAL(0,(int)titi.length());
-  //
-  char toto5[]="  345677";
-  titi=INTERP_KERNEL::ExprParser::buildStringFromFortran(toto5,8);
-  CPPUNIT_ASSERT(titi==toto5);
-  CPPUNIT_ASSERT_EQUAL(8,(int)titi.length());
-}
-
-void ExprEvalInterpTest::testDeleteWhiteSpaces()
-{
-  char toto[]=" jkhjkh ooooppp l ";
-  char result[]="jkhjkhoooopppl";
-  std::string totoS(toto);
-  std::string totoR=INTERP_KERNEL::ExprParser::deleteWhiteSpaces(totoS);
-  CPPUNIT_ASSERT(totoR==result);
-  CPPUNIT_ASSERT_EQUAL(14,(int)totoR.length());
-  //
-  char toto2[]=" jkhjkh     ooooppp    l ";
-  totoS=toto2;
-  totoR=INTERP_KERNEL::ExprParser::deleteWhiteSpaces(totoS);
-  CPPUNIT_ASSERT(totoR==result);
-  CPPUNIT_ASSERT_EQUAL(14,(int)totoR.length());
-  //
-  char toto3[]=" jkhjkh     oooo pppl ";
-  totoS=toto3;
-  totoR=INTERP_KERNEL::ExprParser::deleteWhiteSpaces(totoS);
-  CPPUNIT_ASSERT(totoR==result);
-  CPPUNIT_ASSERT_EQUAL(14,(int)totoR.length());
-  //
-  char toto4[]=" jkhjkh     oooo pppl";
-  totoS=toto4;
-  totoR=INTERP_KERNEL::ExprParser::deleteWhiteSpaces(totoS);
-  CPPUNIT_ASSERT(totoR==result);
-  CPPUNIT_ASSERT_EQUAL(14,(int)totoR.length());
-  //
-  char toto5[]="jkhjkh     oooo pppl";
-  totoS=toto5;
-  totoR=INTERP_KERNEL::ExprParser::deleteWhiteSpaces(totoS);
-  CPPUNIT_ASSERT(totoR==result);
-  CPPUNIT_ASSERT_EQUAL(14,(int)totoR.length());
-  //
-  totoS=result;
-  totoR=INTERP_KERNEL::ExprParser::deleteWhiteSpaces(totoS);
-  CPPUNIT_ASSERT(totoR==result);
-  CPPUNIT_ASSERT_EQUAL(14,(int)totoR.length());
-  //
-  char toto6[]="j k h j k h o o o o p p p l";
-  totoS=toto6;
-  totoR=INTERP_KERNEL::ExprParser::deleteWhiteSpaces(totoS);
-  CPPUNIT_ASSERT(totoR==result);
-  CPPUNIT_ASSERT_EQUAL(14,(int)totoR.length());
-  //
-  char toto7[]="j  k  h j    k h   o  o  o  o  p  pp    l";
-  totoS=toto7;
-  totoR=INTERP_KERNEL::ExprParser::deleteWhiteSpaces(totoS);
-  CPPUNIT_ASSERT(totoR==result);
-  CPPUNIT_ASSERT_EQUAL(14,(int)totoR.length());
-  //
-  char toto8[]="           ";
-  totoS=toto8;
-  totoR=INTERP_KERNEL::ExprParser::deleteWhiteSpaces(totoS);
-  CPPUNIT_ASSERT(totoR.empty());
-  //
-  char toto9[]="";
-  totoS=toto9;
-  totoR=INTERP_KERNEL::ExprParser::deleteWhiteSpaces(totoS);
-  CPPUNIT_ASSERT(totoR.empty());
-  //
-  char toto10[]="j\n k \nh\nj \n\n  k\nh \n o \no\n o\n o \np\n\npp \n\n l";
-  totoS=toto10;
-  totoR=INTERP_KERNEL::ExprParser::deleteWhiteSpaces(totoS);
-  CPPUNIT_ASSERT(totoR==result);
-  CPPUNIT_ASSERT_EQUAL(14,(int)totoR.length());
-}
-
-void ExprEvalInterpTest::testInterpreter0()
-{
-  INTERP_KERNEL::ExprParser expr1("3*-2");
-  expr1.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(-6.,expr1.evaluate(),1e-15);
-  INTERP_KERNEL::ExprParser expr2("-2.3");
-  expr2.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(-2.3,expr2.evaluate(),1e-15);
-  INTERP_KERNEL::ExprParser expr3("--2.3");
-  expr3.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(2.3,expr3.evaluate(),1e-15);
-  INTERP_KERNEL::ExprParser expr4("-++2.3");
-  expr4.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(-2.3,expr4.evaluate(),1e-15);
-  INTERP_KERNEL::ExprParser expr5("+2.3");
-  expr5.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(2.3,expr5.evaluate(),1e-15);
-  INTERP_KERNEL::ExprParser expr6("3^-1");
-  expr6.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.33333333333333333,expr6.evaluate(),1e-15);
-}
-
-void ExprEvalInterpTest::testInterpreter1()
-{
-  INTERP_KERNEL::ExprParser expr1("3+2*5");
-  expr1.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(13.,expr1.evaluate(),1e-14);
-  INTERP_KERNEL::ExprParser expr2("3+2^3*5");
-  expr2.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(43.,expr2.evaluate(),1e-14);
-  INTERP_KERNEL::ExprParser expr3("3+2^(2*5)");
-  expr3.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1027.,expr3.evaluate(),1e-14);
-  INTERP_KERNEL::ExprParser expr4("(3.2+4.3)*(1.3+2.3*7.8)");
-  expr4.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(144.3,expr4.evaluate(),1e-10);
-  INTERP_KERNEL::ExprParser expr5("(3.2+4.3)*cos(1.3+2.3*7.8)");
-  expr5.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(6.9355510138337619,expr5.evaluate(),1e-14);
-  INTERP_KERNEL::ExprParser expr6("3+2-4-7+4.3");
-  expr6.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(-1.7,expr6.evaluate(),1e-14);
-  INTERP_KERNEL::ExprParser expr7("3.2*4.5/3.3/2.2");
-  expr7.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.9834710743801653,expr7.evaluate(),1e-14);
-  INTERP_KERNEL::ExprParser expr8("3.2*4.5/3.3/2.2");
-  expr8.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.9834710743801653,expr8.evaluate(),1e-14);
-  INTERP_KERNEL::ExprParser expr9("(((1.23456789)))");
-  expr9.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.23456789,expr9.evaluate(),1e-14);
-  INTERP_KERNEL::ExprParser expr10("3.2*((2*5.2+6.)+(1.2*1.2+3.))");
-  expr10.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(66.688,expr10.evaluate(),1e-13);
-  INTERP_KERNEL::ExprParser expr11("((3.2*(((2*5.2+6.)+(1.2*1.2+3.)))))");
-  expr11.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(66.688,expr11.evaluate(),1e-13);
-  INTERP_KERNEL::ExprParser expr12("((3.2*(cos((2*5.2+6.)+(1.2*1.2+3.)))))");
-  expr12.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(-1.3038041398761016,expr12.evaluate(),1e-14);
-  INTERP_KERNEL::ExprParser expr13("((3.2*(sin((2*5.2+6.)+(1.2*1.2+3.)))))");
-  expr13.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(2.9223440531261784,expr13.evaluate(),1e-14);
-  INTERP_KERNEL::ExprParser expr14("((3.2*(tan((2*5.2+6.)+(1.2*1.2+3.)))))");
-  expr14.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(-7.1724737512280257,expr14.evaluate(),1e-14);
-  INTERP_KERNEL::ExprParser expr15("((3.2*(sqrt((2*5.2+6.)+(1.2*1.2+3.)))))");
-  expr15.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(14.608271629457059,expr15.evaluate(),1e-13);
-  INTERP_KERNEL::ExprParser expr16("-((3.2*(sqrt((2*5.2+6.)+(1.2*1.2+3.)))))");
-  expr16.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(-14.608271629457059,expr16.evaluate(),1e-13);
-  INTERP_KERNEL::ExprParser expr17("(-(3.2*(sqrt((2*5.2+6.)+(1.2*1.2+3.)))))");
-  expr17.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(-14.608271629457059,expr17.evaluate(),1e-13);
-  INTERP_KERNEL::ExprParser expr18("((-3.2*(sqrt((2*5.2+6.)+(1.2*1.2+3.)))))");
-  expr18.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(-14.608271629457059,expr18.evaluate(),1e-13);
-  INTERP_KERNEL::ExprParser expr19("((3.2*(exp((6.+2*5.2)+(1.2*1.2+3.)))))");
-  expr19.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(3596226038.1784945,expr19.evaluate(),1e-6);
-  INTERP_KERNEL::ExprParser expr20("((3.2*(ln((2*5.2+6.)+(1.2*1.2+3.)))))");
-  expr20.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(9.7179974940325309,expr20.evaluate(),1e-14);
-  INTERP_KERNEL::ExprParser expr21("max(3.2,4.5)");
-  expr21.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(4.5,expr21.evaluate(),1e-14);
-  INTERP_KERNEL::ExprParser expr22("3.*max(((3.2*(ln((2*5.2+6.)+(1.2*1.2+3.))))),((3.2*(exp((6.+2*5.2)+(1.2*1.2+3.))))))");
-  expr22.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(10788678114.535484,expr22.evaluate(),1e-5);
-  INTERP_KERNEL::ExprParser expr23("min(3.2,4.5)");
-  expr23.parse();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(3.2,expr23.evaluate(),1e-14);
-}
-
-void ExprEvalInterpTest::testInterpreter2()
-{
-  INTERP_KERNEL::ExprParser expr1("3.5*x+x*x*x/(2+x)+2*5*y");
-  expr1.parse();
-  std::set<std::string> res,expected;
-  expr1.getSetOfVars(res);
-  CPPUNIT_ASSERT_EQUAL(2,(int)res.size());
-  expected.insert("x"); expected.insert("y");
-  CPPUNIT_ASSERT(std::equal(res.begin(),res.end(),expected.begin()));
-  double xyValue[2]={1.,3.};
-  double res1;
-  std::vector<std::string> vars; vars.push_back("x"); vars.push_back("y");
-  expr1.prepareExprEvaluation(vars);
-  expr1.evaluateExpr(1,&res1,xyValue);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(33.833333333333336,res1,1e-13);
-  xyValue[0]=-2.;
-  CPPUNIT_ASSERT_THROW(expr1.evaluateExpr(1,&res1,xyValue),INTERP_KERNEL::Exception);
-  double res2[2];
-  xyValue[0]=1.;
-  expr1.evaluateExpr(2,res2,xyValue);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(33.833333333333336,res2[0],1e-13);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(33.833333333333336,res2[1],1e-13);
-  INTERP_KERNEL::ExprParser expr2("3.5*tan(2.3*x)*IVec+(cos(1.2+y/x)*JVec)");
-  expr2.parse();
-  res.clear(); expected.clear();
-  expr2.getSetOfVars(res);
-  CPPUNIT_ASSERT_EQUAL(4,(int)res.size());
-  expected.insert("x"); expected.insert("y"); expected.insert("IVec"); expected.insert("JVec");
-  CPPUNIT_ASSERT(std::equal(res.begin(),res.end(),expected.begin()));
-  expr2.prepareExprEvaluation(vars);
-  expr2.evaluateExpr(2,res2,xyValue);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(-3.9172477460694637,res2[0],1e-14);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.49026082134069943,res2[1],1e-14);
-  INTERP_KERNEL::ExprParser expr3("3.5*u+u^2.4+2.");
-  expr3.parse();
-  expr3.prepareExprEvaluationVec();
-  expr3.evaluateExpr(2,res2,xyValue);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(6.5,res2[0],1e-14);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(26.466610165238237,res2[1],1e-14);
-  INTERP_KERNEL::ExprParser expr4("3.5*v+u^2.4+2.");
-  expr4.parse();
-  CPPUNIT_ASSERT_THROW(expr4.prepareExprEvaluationVec(),INTERP_KERNEL::Exception);
-}
-
-void ExprEvalInterpTest::testInterpreterUnit0()
-{
-  INTERP_KERNEL::ExprParser expr1("kg");
-  expr1.parse();
-  INTERP_KERNEL::DecompositionInUnitBase unit=expr1.evaluateUnit();
-  CPPUNIT_ASSERT(unit.isEqual(1,0,0,0,0,0.,1000.));
-  INTERP_KERNEL::ExprParser expr2("kgT");
-  expr2.parse();
-  CPPUNIT_ASSERT_THROW(expr2.evaluateUnit(),INTERP_KERNEL::Exception);
-  INTERP_KERNEL::ExprParser expr3("g");
-  expr3.parse();
-  unit=expr3.evaluateUnit();
-  CPPUNIT_ASSERT(unit.isEqual(1,0,0,0,0,0.,1.));
-  INTERP_KERNEL::ExprParser expr4("g*m");
-  expr4.parse();
-  unit=expr4.evaluateUnit();
-  CPPUNIT_ASSERT(unit.isEqual(1,1,0,0,0,0.,1.));
-  INTERP_KERNEL::ExprParser expr5("g*m/K");
-  expr5.parse();
-  unit=expr5.evaluateUnit();
-  CPPUNIT_ASSERT(unit.isEqual(1,1,0,0,-1,0.,1.));
-  INTERP_KERNEL::ExprParser expr6("g*m/K^2");
-  expr6.parse();
-  unit=expr6.evaluateUnit();
-  CPPUNIT_ASSERT(unit.isEqual(1,1,0,0,-2,0.,1.));
-  INTERP_KERNEL::ExprParser expr7("g/K^2*m");
-  expr7.parse();
-  unit=expr7.evaluateUnit();
-  CPPUNIT_ASSERT(unit.isEqual(1,1,0,0,-2,0.,1.));
-  INTERP_KERNEL::ExprParser expr8("g/(K^2*m)");
-  expr8.parse();
-  unit=expr8.evaluateUnit();
-  CPPUNIT_ASSERT(unit.isEqual(1,-1,0,0,-2,0.,1.));
-  INTERP_KERNEL::ExprParser expr9("km/h");
-  expr9.parse();
-  unit=expr9.evaluateUnit();
-  CPPUNIT_ASSERT(unit.isEqual(0,1,-1,0,0,0.,0.27777777777777779));
-  INTERP_KERNEL::ExprParser expr10("m/s");
-  expr10.parse();
-  unit=expr10.evaluateUnit();
-  CPPUNIT_ASSERT(unit.isEqual(0,1,-1,0,0,0.,1.));
-  INTERP_KERNEL::ExprParser expr11("m+s");
-  expr11.parse();
-  CPPUNIT_ASSERT_THROW(expr11.evaluateUnit(),INTERP_KERNEL::Exception);
-  INTERP_KERNEL::ExprParser expr12("m-m");
-  expr12.parse();
-  CPPUNIT_ASSERT_THROW(expr12.evaluateUnit(),INTERP_KERNEL::Exception);
-  const char expr13C[3]={-0x50,0x43,0x0};
-  INTERP_KERNEL::ExprParser expr13(expr13C);
-  expr13.parse();
-  unit=expr13.evaluateUnit();
-  CPPUNIT_ASSERT(unit.isEqual(0,0,0,0,1,273.15,1.));
-  const char expr14C[4]={-0x3E,-0x50,0x43,0x0};
-  INTERP_KERNEL::ExprParser expr14(expr14C);
-  expr14.parse();
-  unit=expr14.evaluateUnit();
-  CPPUNIT_ASSERT(unit.isEqual(0,0,0,0,1,273.15,1.));
-  INTERP_KERNEL::ExprParser expr15("kN/kg");
-  expr15.parse();
-  unit=expr15.evaluateUnit();
-  CPPUNIT_ASSERT(unit.isEqual(0,1,-2,0,0,0.,1000.));
-  INTERP_KERNEL::ExprParser expr16("cm");
-  expr16.parse();
-  unit=expr16.evaluateUnit();
-  CPPUNIT_ASSERT(unit.isEqual(0,1,0,0,0,0.,0.01));
-  INTERP_KERNEL::ExprParser expr17("m");
-  expr17.parse();
-  unit=expr17.evaluateUnit();
-  CPPUNIT_ASSERT(unit.isEqual(0,1,0,0,0,0.,1));
-  const char expr18C[3]={-0x08,0x43,0x0};
-  INTERP_KERNEL::ExprParser expr18(expr18C);
-  expr18.parse();
-  unit=expr18.evaluateUnit();
-  CPPUNIT_ASSERT(unit.isEqual(0,0,0,0,1,273.15,1.));
-  const char expr19C[6]={-0x50,0x43,0x2F,-0x50,0x43,0x0};
-  INTERP_KERNEL::ExprParser expr19(expr19C);
-  expr19.parse();
-  unit=expr19.evaluateUnit();
-  CPPUNIT_ASSERT(unit.isEqual(0,0,0,0,0,0.,1.));
-  const char expr20C[9]={-0x50,0x43,0x2A,-0x50,0x43,0x2F,-0x50,0x43,0x0};
-  INTERP_KERNEL::ExprParser expr20(expr20C);
-  expr20.parse();
-  unit=expr20.evaluateUnit();
-  CPPUNIT_ASSERT(unit.isEqual(0,0,0,0,1,0.,1.));
-}
-
-void ExprEvalInterpTest::testInterpreterUnit1()
-{
-  INTERP_KERNEL::Unit unit1("m/s");
-  INTERP_KERNEL::Unit unit2("km/h");
-  CPPUNIT_ASSERT(unit1.isCompatibleWith(unit2) && unit2.isCompatibleWith(unit1));
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(360,unit1.convert(unit2,100.),1e-10);
-  INTERP_KERNEL::Unit unit3("J/s");
-  INTERP_KERNEL::Unit unit4("kW");
-  CPPUNIT_ASSERT(unit3.isCompatibleWith(unit4) && unit4.isCompatibleWith(unit3));
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,unit3.convert(unit4,1000.),1e-10);
-  CPPUNIT_ASSERT(unit4.getCoarseRepr()=="kW");
-  INTERP_KERNEL::Unit unit5("kpT");
-  CPPUNIT_ASSERT(!unit5.isInterpretationOK());
-  CPPUNIT_ASSERT(unit5.getCoarseRepr()=="kpT");
-  INTERP_KERNEL::Unit unit6("m*kpT");
-  CPPUNIT_ASSERT(!unit6.isInterpretationOK());
-  INTERP_KERNEL::Unit unit7("m*s^-1");
-  CPPUNIT_ASSERT(unit7.isCompatibleWith(unit2) && unit2.isCompatibleWith(unit7));
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(360,unit7.convert(unit2,100.),1e-10);
-  const char unit8C[3]={-0x50,0x43,0x0};
-  INTERP_KERNEL::Unit unit8(unit8C);
-  INTERP_KERNEL::Unit unit9("K");
-  CPPUNIT_ASSERT(unit9.isCompatibleWith(unit8) && unit8.isCompatibleWith(unit9));
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(335.15,unit8.convert(unit9,62.),1e-10);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(-16.37,unit9.convert(unit8,256.78),1e-10);
-  INTERP_KERNEL::Unit unit10("m");
-  INTERP_KERNEL::Unit unit11("cm");
-  CPPUNIT_ASSERT(unit10.isCompatibleWith(unit11) && unit11.isCompatibleWith(unit10));
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(6200.,unit10.convert(unit11,62.),1e-8);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.62,unit11.convert(unit10,62.),1e-15);
-  INTERP_KERNEL::Unit unit12("m-m");
-  CPPUNIT_ASSERT(!unit12.isInterpretationOK());
-}
diff --git a/src/INTERP_KERNELTest/ExprEvalInterpTest.hxx b/src/INTERP_KERNELTest/ExprEvalInterpTest.hxx
deleted file mode 100644
index a135201da..000000000
--- a/src/INTERP_KERNELTest/ExprEvalInterpTest.hxx
+++ /dev/null
@@ -1,54 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef _EXPREVALINTERPTEST_HXX_
-#define _EXPREVALINTERPTEST_HXX_
-
-#include <cppunit/extensions/HelperMacros.h>
-
-#include "InterpKernelTestExport.hxx"
-
-namespace INTERP_TEST
-{
-  class INTERPKERNELTEST_EXPORT ExprEvalInterpTest : public CppUnit::TestFixture
-  {
-    CPPUNIT_TEST_SUITE( ExprEvalInterpTest );
-    CPPUNIT_TEST( testBuildStringFromFortran );
-    CPPUNIT_TEST( testDeleteWhiteSpaces );
-    CPPUNIT_TEST( testInterpreter0 );
-    CPPUNIT_TEST( testInterpreter1 );
-    CPPUNIT_TEST( testInterpreter2 );
-    CPPUNIT_TEST( testInterpreterUnit0 );
-    CPPUNIT_TEST( testInterpreterUnit1 );
-    CPPUNIT_TEST_SUITE_END();
-  public:
-    void setUp() { }
-    void tearDown() { }
-    void cleanUp() { }
-    void testBuildStringFromFortran();
-    void testDeleteWhiteSpaces();
-    void testInterpreter0();
-    void testInterpreter1();
-    void testInterpreter2();
-    void testInterpreterUnit0();
-    void testInterpreterUnit1();
-  };
-}
-
-#endif
diff --git a/src/INTERP_KERNELTest/InterpKernelTestExport.hxx b/src/INTERP_KERNELTest/InterpKernelTestExport.hxx
deleted file mode 100644
index 1c60231b2..000000000
--- a/src/INTERP_KERNELTest/InterpKernelTestExport.hxx
+++ /dev/null
@@ -1,33 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef _INTERPKERNELTESTEXPORT_HXX_
-#define _INTERPKERNELTESTEXPORT_HXX_
-
-#ifdef WNT
-#  if defined InterpKernelTest_EXPORTS
-#    define INTERPKERNELTEST_EXPORT __declspec( dllexport )
-#  else
-#    define INTERPKERNELTEST_EXPORT __declspec( dllimport )
-#  endif
-#else
-#  define INTERPKERNELTEST_EXPORT
-#endif
-
-#endif
diff --git a/src/INTERP_KERNEL/Interpolation1D.hxx b/src/INTERP_KERNELTest/RemapperTest.hxx
old mode 100755
new mode 100644
similarity index 57%
rename from src/INTERP_KERNEL/Interpolation1D.hxx
rename to src/INTERP_KERNELTest/RemapperTest.hxx
index d11b202b1..bd58b533b
--- a/src/INTERP_KERNEL/Interpolation1D.hxx
+++ b/src/INTERP_KERNELTest/RemapperTest.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,20 +16,45 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#ifndef __TU_REMAPPER_HXX__
+#define __TU_REMAPPER_HXX__
 
-#ifndef __INTERPOLATION1D_HXX__
-#define __INTERPOLATION1D_HXX__
+#include <cppunit/extensions/HelperMacros.h>
+#include "Remapper.hxx"
+#include "MEDMEM_Field.hxx"
 
-#include "InterpolationCurve.hxx"
-
-namespace INTERP_KERNEL
+namespace INTERP_TEST
 {
-  class Interpolation1D : public InterpolationCurve<Interpolation1D>
+
+  /**
+   * \brief Test suite testing some of the low level methods of TransformedTriangle.
+   *
+   */
+  class RemapperTest : public CppUnit::TestFixture
   {
+
+    CPPUNIT_TEST_SUITE( RemapperTest );
+    CPPUNIT_TEST( test_Remapper );
+    CPPUNIT_TEST_SUITE_END();
+
+   
   public:
-    Interpolation1D() { }
-    Interpolation1D(const InterpolationOptions& io):InterpolationCurve<Interpolation1D>(io) {}
+    void setUp();
+
+    void tearDown();
+
+    // tests
+    void test_Remapper();
+
+  private:
+    void absField(MEDMEM::FIELD<double>&);
   };
+
+
+
+
 }
 
+
+
 #endif
diff --git a/src/INTERP_KERNELTest/TestInterpKernelUtils.cxx b/src/INTERP_KERNELTest/TestInterpKernelUtils.cxx
deleted file mode 100644
index 1d98bdf27..000000000
--- a/src/INTERP_KERNELTest/TestInterpKernelUtils.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "TestInterpKernelUtils.hxx"
-
-#include <cstdlib>
-
-namespace INTERP_TEST
-{
-  std::string getResourceFile( const std::string& filename )
-  {
-    std::string resourceFile = "";
-    
-    if ( getenv("top_srcdir") ) {
-      // we are in 'make check' step
-      resourceFile = getenv("top_srcdir");
-      resourceFile += "/resources/";
-    }
-    else if ( getenv("MED_ROOT_DIR") ) {
-      // use MED_ROOT_DIR env.var
-      resourceFile = getenv("MED_ROOT_DIR");
-      resourceFile += "/share/salome/resources/med/";
-    }
-    resourceFile += filename;
-    return resourceFile;
-  }
-
-} // namespace INTERP_TEST
diff --git a/src/INTERP_KERNELTest/TestInterpKernelUtils.hxx b/src/INTERP_KERNELTest/TestInterpKernelUtils.hxx
deleted file mode 100644
index 1cedbd291..000000000
--- a/src/INTERP_KERNELTest/TestInterpKernelUtils.hxx
+++ /dev/null
@@ -1,34 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef _TESTINTERPKERNELUTILS_HXX_
-#define _TESTINTERPKERNELUTILS_HXX_
-
-#include "InterpKernelTestExport.hxx"
-
-#include <string>
-
-namespace INTERP_TEST
-{
-
-  INTERPKERNELTEST_EXPORT std::string getResourceFile( const std::string& );
-
-} // namespace INTERP_TEST
-
-#endif // _TESTINTERPKERNELUTILS_HXX_
diff --git a/src/MEDCoupling/MEDCoupling.hxx b/src/MEDCoupling/MEDCoupling.hxx
deleted file mode 100644
index 5f718343a..000000000
--- a/src/MEDCoupling/MEDCoupling.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef _MEDCOUPLING_HXX_
-#define _MEDCOUPLING_HXX_
-
-#ifdef WNT
-#  if defined medcoupling_EXPORTS
-#    define MEDCOUPLING_EXPORT __declspec( dllexport )
-#  else
-#    define MEDCOUPLING_EXPORT __declspec( dllimport )
-#  endif
-#else
-#  define MEDCOUPLING_EXPORT
-#endif
-
-#ifdef WNT
-#  if defined medcouplingremapper_EXPORTS
-#    define MEDCOUPLINGREMAPPER_EXPORT __declspec( dllexport )
-#  else
-#    define MEDCOUPLINGREMAPPER_EXPORT __declspec( dllimport )
-#  endif
-#else
-#  define MEDCOUPLINGREMAPPER_EXPORT
-#endif
-
-#ifdef WNT
-#pragma warning( disable : 4290 )
-#endif
-
-#endif
diff --git a/src/MEDCoupling/MEDCouplingCMesh.cxx b/src/MEDCoupling/MEDCouplingCMesh.cxx
deleted file mode 100644
index 8829b19de..000000000
--- a/src/MEDCoupling/MEDCouplingCMesh.cxx
+++ /dev/null
@@ -1,366 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "MEDCouplingCMesh.hxx"
-#include "MEDCouplingMemArray.hxx"
-#include "MEDCouplingFieldDouble.hxx"
-
-#include <functional>
-#include <algorithm>
-#include <numeric>
-
-using namespace ParaMEDMEM;
-
-MEDCouplingCMesh::MEDCouplingCMesh():_x_array(0),_y_array(0),_z_array(0)
-{
-}
-
-MEDCouplingCMesh::~MEDCouplingCMesh()
-{
-  if(_x_array)
-    _x_array->decrRef();
-  if(_y_array)
-    _y_array->decrRef();
-  if(_z_array)
-    _z_array->decrRef();
-}
-
-MEDCouplingCMesh *MEDCouplingCMesh::New()
-{
-  return new MEDCouplingCMesh;
-}
-
-void MEDCouplingCMesh::updateTime()
-{
-  if(_x_array)
-    updateTimeWith(*_x_array);
-  if(_y_array)
-    updateTimeWith(*_y_array);
-  if(_z_array)
-    updateTimeWith(*_z_array);
-}
-
-bool MEDCouplingCMesh::isEqual(const MEDCouplingMesh *other, double prec) const
-{
-  const MEDCouplingCMesh *otherC=dynamic_cast<const MEDCouplingCMesh *>(other);
-  if(!otherC)
-    return false;
-  return true;
-}
-
-void MEDCouplingCMesh::checkCoherency() const throw(INTERP_KERNEL::Exception)
-{
-  const char msg0[]="Invalid ";
-  const char msg1[]=" array ! Must contain more than 1 element.";
-  if(_x_array)
-    if(_x_array->getNbOfElems()<2)
-      {
-        std::ostringstream os; os << msg0 << 'X' << msg1;
-        throw INTERP_KERNEL::Exception(os.str().c_str());
-      }
-  if(_y_array)
-    if(_y_array->getNbOfElems()<2)
-      {
-        std::ostringstream os; os << msg0 << 'Y' << msg1;
-        throw INTERP_KERNEL::Exception(os.str().c_str());
-      }
-  if(_z_array)
-    if(_z_array->getNbOfElems()<2)
-      {
-        std::ostringstream os; os << msg0 << 'Z' << msg1;
-        throw INTERP_KERNEL::Exception(os.str().c_str());
-      }
-}
-
-bool MEDCouplingCMesh::isStructured() const
-{
-  return true;
-}
-
-int MEDCouplingCMesh::getNumberOfCells() const
-{
-  int ret=1;
-  if(_x_array)
-    ret*=_x_array->getNbOfElems()-1;
-  if(_y_array)
-    ret*=_y_array->getNbOfElems()-1;
-  if(_z_array)
-    ret*=_z_array->getNbOfElems()-1;
-  return ret;
-}
-
-int MEDCouplingCMesh::getNumberOfNodes() const
-{
-  int ret=1;
-  if(_x_array)
-    ret*=_x_array->getNbOfElems();
-  if(_y_array)
-    ret*=_y_array->getNbOfElems();
-  if(_z_array)
-    ret*=_z_array->getNbOfElems();
-  return ret;
-}
-
-void MEDCouplingCMesh::getSplitCellValues(int *res) const
-{
-  int spaceDim=getSpaceDimension();
-  for(int l=0;l<spaceDim;l++)
-    {
-      int val=1;
-      for(int p=l;p<spaceDim-1;p++)
-        val*=getCoordsAt(p)->getNbOfElems()-1;
-      res[spaceDim-l-1]=val;
-    }
-}
-
-void MEDCouplingCMesh::getSplitNodeValues(int *res) const
-{
-  int spaceDim=getSpaceDimension();
-  for(int l=0;l<spaceDim;l++)
-    {
-      int val=1;
-      for(int p=l;p<spaceDim-1;p++)
-        val*=getCoordsAt(p)->getNbOfElems();
-      res[spaceDim-l-1]=val;
-    }
-}
-
-int MEDCouplingCMesh::getCellIdFromPos(int i, int j, int k) const
-{
-  int tmp[3]={i,j,k};
-  int tmp2[3];
-  int spaceDim=getSpaceDimension();
-  getSplitCellValues(tmp2);
-  std::transform(tmp,tmp+spaceDim,tmp2,tmp,std::multiplies<int>());
-  return std::accumulate(tmp,tmp+spaceDim,0);
-}
-
-int MEDCouplingCMesh::getNodeIdFromPos(int i, int j, int k) const
-{
-  int tmp[3]={i,j,k};
-  int tmp2[3];
-  int spaceDim=getSpaceDimension();
-  getSplitNodeValues(tmp2);
-  std::transform(tmp,tmp+spaceDim,tmp2,tmp,std::multiplies<int>());
-  return std::accumulate(tmp,tmp+spaceDim,0);
-}
-
-void MEDCouplingCMesh::getPosFromId(int nodeId, int spaceDim, const int *split, int *res)
-{
-  int work=nodeId;
-  for(int i=spaceDim-1;i>=0;i--)
-    {
-      int pos=work/split[i];
-      work=work%split[i];
-      res[i]=pos;
-    }
-}
-
-int MEDCouplingCMesh::getSpaceDimension() const
-{
-  int ret=0;
-  if(_x_array)
-    ret++;
-  if(_y_array)
-    ret++;
-  if(_z_array)
-    ret++;
-  return ret;
-}
-
-int MEDCouplingCMesh::getMeshDimension() const
-{
-  return getSpaceDimension();
-}
-
-INTERP_KERNEL::NormalizedCellType MEDCouplingCMesh::getTypeOfCell(int cellId) const
-{
-  switch(getMeshDimension())
-    {
-    case 3:
-      return INTERP_KERNEL::NORM_HEXA8;
-    case 2:
-      return INTERP_KERNEL::NORM_QUAD4;
-    case 1:
-      return INTERP_KERNEL::NORM_SEG2;
-    default:
-      throw INTERP_KERNEL::Exception("Unexpected dimension for MEDCouplingCMesh::getTypeOfCell !");
-    }
-}
-
-void MEDCouplingCMesh::getNodeIdsOfCell(int cellId, std::vector<int>& conn) const
-{
-  //not implemented yet
-}
-
-void MEDCouplingCMesh::getCoordinatesOfNode(int nodeId, std::vector<double>& coo) const
-{
-  //not implemented yet
-}
-
-DataArrayDouble *MEDCouplingCMesh::getCoordsAt(int i) const throw(INTERP_KERNEL::Exception)
-{
-  switch(i)
-    {
-    case 0:
-      return _x_array;
-    case 1:
-      return _y_array;
-    case 2:
-      return _z_array;
-    default:
-      throw INTERP_KERNEL::Exception("Invalid rank specified must be 0 or 1 or 2.");
-    }
-}
-
-void MEDCouplingCMesh::setCoords(DataArrayDouble *coordsX, DataArrayDouble *coordsY, DataArrayDouble *coordsZ)
-{
-  if(_x_array)
-    _x_array->decrRef();
-  _x_array=coordsX;
-  if(_x_array)
-    _x_array->incrRef();
-  if(_y_array)
-    _y_array->decrRef();
-  _y_array=coordsY;
-  if(_y_array)
-    _y_array->incrRef();
-  if(_z_array)
-    _z_array->decrRef();
-  _z_array=coordsZ;
-  if(_z_array)
-    _z_array->incrRef();
-  declareAsNew();
-}
-
-void MEDCouplingCMesh::getBoundingBox(double *bbox) const
-{
-  //not implemented yet !
-}
-
-MEDCouplingFieldDouble *MEDCouplingCMesh::getMeasureField(bool isAbs) const
-{
-  //not implemented yet !
-  return 0;
-}
-
-MEDCouplingFieldDouble *MEDCouplingCMesh::getMeasureFieldOnNode(bool isAbs) const
-{
-  //not implemented yet !
-  return 0;
-}
-
-MEDCouplingFieldDouble *MEDCouplingCMesh::buildOrthogonalField() const
-{
-  if(getMeshDimension()!=2)
-    throw INTERP_KERNEL::Exception("Expected a cmesh with meshDim == 2 !");
-  MEDCouplingFieldDouble *ret=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
-  DataArrayDouble *array=DataArrayDouble::New();
-  int nbOfCells=getNumberOfCells();
-  array->alloc(nbOfCells,3);
-  double *vals=array->getPointer();
-  for(int i=0;i<nbOfCells;i++)
-    { vals[3*i]=1.; vals[3*i+1]=1.; vals[3*i+2]=1.; }
-  ret->setArray(array);
-  array->decrRef();
-  ret->setMesh(this);
-  return ret;
-}
-
-int MEDCouplingCMesh::getCellContainingPoint(const double *pos, double eps) const
-{
-  //not implemented yet !
-  return -1;
-}
-
-void MEDCouplingCMesh::rotate(const double *center, const double *vector, double angle)
-{
-  throw INTERP_KERNEL::Exception("No rotation available on CMesh : Traduce it to StructuredMesh to apply it !");
-}
-
-void MEDCouplingCMesh::translate(const double *vector)
-{
-  if(_x_array)
-    std::transform(_x_array->getConstPointer(),_x_array->getConstPointer()+_x_array->getNbOfElems(),
-                   _x_array->getPointer(),std::bind2nd(std::plus<double>(),vector[0]));
-  if(_y_array)
-    std::transform(_y_array->getConstPointer(),_y_array->getConstPointer()+_y_array->getNbOfElems(),
-                   _y_array->getPointer(),std::bind2nd(std::plus<double>(),vector[1]));
-  if(_z_array)
-    std::transform(_z_array->getConstPointer(),_z_array->getConstPointer()+_z_array->getNbOfElems(),
-                   _z_array->getPointer(),std::bind2nd(std::plus<double>(),vector[2]));
-}
-
-MEDCouplingMesh *MEDCouplingCMesh::mergeMyselfWith(const MEDCouplingMesh *other) const
-{
-  //not implemented yet !
-  return 0;
-}
-
-DataArrayDouble *MEDCouplingCMesh::getCoordinatesAndOwner() const
-{
-  DataArrayDouble *ret=DataArrayDouble::New();
-  int spaceDim=getSpaceDimension();
-  int nbNodes=getNumberOfNodes();
-  ret->alloc(nbNodes,spaceDim);
-  double *pt=ret->getPointer();
-  int tmp[3];
-  getSplitNodeValues(tmp);
-  DataArrayDouble *tabs[3]={getCoordsAt(0),getCoordsAt(1),getCoordsAt(2)};
-  const double *tabsPtr[3];
-  for(int j=0;j<spaceDim;j++)
-    tabsPtr[j]=tabs[j]->getConstPointer();
-  int tmp2[3];
-  for(int i=0;i<nbNodes;i++)
-    {
-      getPosFromId(i,spaceDim,tmp,tmp2);
-      for(int j=0;j<spaceDim;j++)
-        pt[i*spaceDim+j]=tabsPtr[j][tmp2[j]];
-    }
-  return ret;
-}
-
-DataArrayDouble *MEDCouplingCMesh::getBarycenterAndOwner() const
-{
-  DataArrayDouble *ret=DataArrayDouble::New();
-  int spaceDim=getSpaceDimension();
-  int nbCells=getNumberOfCells();
-  ret->alloc(nbCells,spaceDim);
-  double *pt=ret->getPointer();
-  int tmp[3];
-  getSplitCellValues(tmp);
-  DataArrayDouble *tabs[3]={getCoordsAt(0),getCoordsAt(1),getCoordsAt(2)};
-  std::vector<double> tabsPtr[3];
-  for(int j=0;j<spaceDim;j++)
-    {
-      int sz=tabs[j]->getNbOfElems()-1;
-      const double *srcPtr=tabs[j]->getConstPointer();
-      tabsPtr[j].insert(tabsPtr[j].end(),srcPtr,srcPtr+sz);
-      std::transform(tabsPtr[j].begin(),tabsPtr[j].end(),srcPtr+1,tabsPtr[j].begin(),std::plus<double>());
-      std::transform(tabsPtr[j].begin(),tabsPtr[j].end(),tabsPtr[j].begin(),std::bind2nd(std::multiplies<double>(),0.5));
-    }
-  int tmp2[3];
-  for(int i=0;i<nbCells;i++)
-    {
-      getPosFromId(i,spaceDim,tmp,tmp2);
-      for(int j=0;j<spaceDim;j++)
-        pt[i*spaceDim+j]=tabsPtr[j][tmp2[j]];
-    }
-  return ret;
-}
diff --git a/src/MEDCoupling/MEDCouplingCMesh.hxx b/src/MEDCoupling/MEDCouplingCMesh.hxx
deleted file mode 100644
index a8f0b5301..000000000
--- a/src/MEDCoupling/MEDCouplingCMesh.hxx
+++ /dev/null
@@ -1,77 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __PARAMEDMEM_MEDCOUPLINGCMESH_HXX__
-#define __PARAMEDMEM_MEDCOUPLINGCMESH_HXX__
-
-#include "MEDCoupling.hxx"
-#include "MEDCouplingMesh.hxx"
-
-namespace ParaMEDMEM
-{
-  class DataArrayDouble;
-
-  class MEDCOUPLING_EXPORT MEDCouplingCMesh : public MEDCouplingMesh
-  {
-  public:
-    static MEDCouplingCMesh *New();
-    void updateTime();
-    MEDCouplingMeshType getType() const { return CARTESIAN; }
-    bool isEqual(const MEDCouplingMesh *other, double prec) const;
-    void checkCoherency() const throw(INTERP_KERNEL::Exception);
-    bool isStructured() const;
-    int getNumberOfCells() const;
-    int getNumberOfNodes() const;
-    int getSpaceDimension() const;
-    int getMeshDimension() const;
-    int getCellIdFromPos(int i, int j, int k) const;
-    int getNodeIdFromPos(int i, int j, int k) const;
-    static void getPosFromId(int nodeId, int spaceDim, const int *split, int *res);
-    INTERP_KERNEL::NormalizedCellType getTypeOfCell(int cellId) const;
-    void getNodeIdsOfCell(int cellId, std::vector<int>& conn) const;
-    void getCoordinatesOfNode(int nodeId, std::vector<double>& coo) const;
-    DataArrayDouble *getCoordsAt(int i) const throw(INTERP_KERNEL::Exception);
-    void setCoords(DataArrayDouble *coordsX,
-                   DataArrayDouble *coordsY=0,
-                   DataArrayDouble *coordsZ=0);
-    // tools
-    void getBoundingBox(double *bbox) const;
-    MEDCouplingFieldDouble *getMeasureField(bool isAbs) const;
-    MEDCouplingFieldDouble *getMeasureFieldOnNode(bool isAbs) const;
-    MEDCouplingFieldDouble *buildOrthogonalField() const;
-    int getCellContainingPoint(const double *pos, double eps) const;
-    void rotate(const double *center, const double *vector, double angle);
-    void translate(const double *vector);
-    MEDCouplingMesh *mergeMyselfWith(const MEDCouplingMesh *other) const;
-    DataArrayDouble *getCoordinatesAndOwner() const;
-    DataArrayDouble *getBarycenterAndOwner() const;
-    //some useful methods
-    void getSplitCellValues(int *res) const;
-    void getSplitNodeValues(int *res) const;
-  private:
-    MEDCouplingCMesh();
-    ~MEDCouplingCMesh();
-  private:
-    DataArrayDouble *_x_array;
-    DataArrayDouble *_y_array;
-    DataArrayDouble *_z_array;
-  };
-}
-
-#endif
diff --git a/src/MEDCoupling/MEDCouplingExtrudedMesh.cxx b/src/MEDCoupling/MEDCouplingExtrudedMesh.cxx
deleted file mode 100644
index 3233ac549..000000000
--- a/src/MEDCoupling/MEDCouplingExtrudedMesh.cxx
+++ /dev/null
@@ -1,472 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "MEDCouplingExtrudedMesh.hxx"
-#include "MEDCouplingUMesh.hxx"
-#include "MEDCouplingMemArray.hxx"
-#include "MEDCouplingFieldDouble.hxx"
-#include "CellModel.hxx"
-
-#include "InterpolationUtils.hxx"
-
-#include <limits>
-#include <algorithm>
-#include <functional>
-#include <iterator>
-#include <cmath>
-#include <list>
-#include <set>
-
-using namespace ParaMEDMEM;
-
-/*!
- * Build an extruded mesh instance from 3D and 2D unstructured mesh lying on the \b same \b coords.
- * @param mesh3D 3D unstructured mesh.
- * @param mesh2D 2D unstructured mesh lying on the same coordinates than mesh3D. \b Warning mesh2D is \b not \b const
- * because the mesh is aggregated and potentially modified by rotate or translate method.
- * @param cell2DId Id of cell in mesh2D mesh where the computation of 1D mesh will be done.
- */
-MEDCouplingExtrudedMesh *MEDCouplingExtrudedMesh::New(const MEDCouplingUMesh *mesh3D, MEDCouplingUMesh *mesh2D, int cell2DId) throw(INTERP_KERNEL::Exception)
-{
-  return new MEDCouplingExtrudedMesh(mesh3D,mesh2D,cell2DId);
-}
-
-MEDCouplingMeshType MEDCouplingExtrudedMesh::getType() const
-{
-  return EXTRUDED;
-}
-
-MEDCouplingExtrudedMesh::MEDCouplingExtrudedMesh(const MEDCouplingUMesh *mesh3D, MEDCouplingUMesh *mesh2D, int cell2DId) throw(INTERP_KERNEL::Exception)
-try:_mesh2D(mesh2D),_mesh1D(MEDCouplingUMesh::New()),_mesh3D_ids(0),_cell_2D_id(cell2DId)
-{
-  if(_mesh2D!=0)
-    _mesh2D->incrRef();
-  computeExtrusion(mesh3D);
-}
-catch(INTERP_KERNEL::Exception&)
-  {
-  }
-
-bool MEDCouplingExtrudedMesh::isStructured() const
-{
-  return false;
-}
-
-int MEDCouplingExtrudedMesh::getNumberOfCells() const
-{
-  return _mesh2D->getNumberOfCells()*_mesh1D->getNumberOfCells();
-}
-
-int MEDCouplingExtrudedMesh::getNumberOfNodes() const
-{
-  return _mesh2D->getNumberOfNodes();
-}
-
-int MEDCouplingExtrudedMesh::getSpaceDimension() const
-{
-  return 3;
-}
-
-int MEDCouplingExtrudedMesh::getMeshDimension() const
-{
-  return 3;
-}
-
-INTERP_KERNEL::NormalizedCellType MEDCouplingExtrudedMesh::getTypeOfCell(int cellId) const
-{
-  int nbOfCells2D=_mesh2D->getNumberOfCells();
-  int locId=cellId%nbOfCells2D;
-  INTERP_KERNEL::NormalizedCellType tmp=_mesh2D->getTypeOfCell(locId);
-  return INTERP_KERNEL::CellModel::getCellModel(tmp).getExtrudedType();
-}
-
-void MEDCouplingExtrudedMesh::getNodeIdsOfCell(int cellId, std::vector<int>& conn) const
-{
-  int nbOfCells2D=_mesh2D->getNumberOfCells();
-  int nbOfNodes2D=_mesh2D->getNumberOfNodes();
-  int locId=cellId%nbOfCells2D;
-  int lev=cellId/nbOfCells2D;
-  std::vector<int> tmp,tmp2;
-  _mesh2D->getNodeIdsOfCell(locId,tmp);
-  tmp2=tmp;
-  std::transform(tmp.begin(),tmp.end(),tmp.begin(),std::bind2nd(std::plus<int>(),nbOfNodes2D*lev));
-  std::transform(tmp2.begin(),tmp2.end(),tmp2.begin(),std::bind2nd(std::plus<int>(),nbOfNodes2D*(lev+1)));
-  conn.insert(conn.end(),tmp.begin(),tmp.end());
-  conn.insert(conn.end(),tmp2.begin(),tmp2.end());
-}
-
-void MEDCouplingExtrudedMesh::getCoordinatesOfNode(int nodeId, std::vector<double>& coo) const
-{
-  int nbOfNodes2D=_mesh2D->getNumberOfNodes();
-  int locId=nodeId%nbOfNodes2D;
-  int lev=nodeId/nbOfNodes2D;
-  std::vector<double> tmp,tmp2;
-  _mesh2D->getCoordinatesOfNode(locId,tmp);
-  tmp2=tmp;
-  int spaceDim=_mesh1D->getSpaceDimension();
-  const double *z=_mesh1D->getCoords()->getConstPointer();
-  std::transform(tmp.begin(),tmp.end(),z+lev*spaceDim,tmp.begin(),std::plus<double>());
-  std::transform(tmp2.begin(),tmp2.end(),z+(lev+1)*spaceDim,tmp2.begin(),std::plus<double>());
-  coo.insert(coo.end(),tmp.begin(),tmp.end());
-  coo.insert(coo.end(),tmp2.begin(),tmp2.end());
-}
-
-void MEDCouplingExtrudedMesh::checkCoherency() const throw (INTERP_KERNEL::Exception)
-{
-}
-
-void MEDCouplingExtrudedMesh::getBoundingBox(double *bbox) const
-{
-  double bbox2D[6];
-  _mesh2D->getBoundingBox(bbox2D);
-  const double *nodes1D=_mesh1D->getCoords()->getConstPointer();
-  int nbOfNodes1D=_mesh1D->getNumberOfNodes();
-  double bbox1DMin[3],bbox1DMax[3],tmp[3];
-  std::fill(bbox1DMin,bbox1DMin+3,std::numeric_limits<double>::max());
-  std::fill(bbox1DMax,bbox1DMax+3,-(std::numeric_limits<double>::max()));
-  for(int i=0;i<nbOfNodes1D;i++)
-    {
-      std::transform(nodes1D+3*i,nodes1D+3*(i+1),bbox1DMin,bbox1DMin,static_cast<const double& (*)(const double&, const double&)>(std::min<double>));
-      std::transform(nodes1D+3*i,nodes1D+3*(i+1),bbox1DMax,bbox1DMax,static_cast<const double& (*)(const double&, const double&)>(std::max<double>));
-    }
-  std::transform(bbox1DMax,bbox1DMax+3,bbox1DMin,tmp,std::minus<double>());
-  int id=std::max_element(tmp,tmp+3)-tmp;
-  bbox[0]=bbox1DMin[0]; bbox[1]=bbox1DMax[0];
-  bbox[2]=bbox1DMin[1]; bbox[3]=bbox1DMax[1];
-  bbox[4]=bbox1DMin[2]; bbox[5]=bbox1DMax[2];
-  bbox[2*id+1]+=tmp[id];
-}
-
-void MEDCouplingExtrudedMesh::updateTime()
-{
-  if(_mesh2D)
-    {
-      updateTimeWith(*_mesh2D);
-    }
-  if(_mesh1D)
-    {
-      updateTimeWith(*_mesh1D);
-    }
-}
-
-MEDCouplingFieldDouble *MEDCouplingExtrudedMesh::getMeasureField(bool) const
-{
-  //not implemented yet
-  return 0;
-}
-
-MEDCouplingFieldDouble *MEDCouplingExtrudedMesh::getMeasureFieldOnNode(bool) const
-{
-  //not implemented yet
-  return 0;
-}
-
-MEDCouplingFieldDouble *MEDCouplingExtrudedMesh::buildOrthogonalField() const
-{
-  //not implemented yet
-  throw INTERP_KERNEL::Exception("MEDCouplingExtrudedMesh::buildOrthogonalField not implemented yet !");
-}
-
-int MEDCouplingExtrudedMesh::getCellContainingPoint(const double *pos, double eps) const
-{
-  //not implemented yet
-  return -1;
-}
-
-MEDCouplingExtrudedMesh::~MEDCouplingExtrudedMesh()
-{
-  if(_mesh2D)
-    _mesh2D->decrRef();
-  if(_mesh1D)
-    _mesh1D->decrRef();
-  if(_mesh3D_ids)
-    _mesh3D_ids->decrRef();
-}
-
-void MEDCouplingExtrudedMesh::computeExtrusion(const MEDCouplingUMesh *mesh3D) throw(INTERP_KERNEL::Exception)
-{
-  const char errMsg1[]="2D mesh is empty unable to compute extrusion !";
-  const char errMsg2[]="Coords between 2D and 3D meshes are not the same ! Try MEDCouplingPointSet::tryToShareSameCoords method";
-  const char errMsg3[]="No chance to find extrusion pattern in mesh3D,mesh2D couple because nbCells3D%nbCells2D!=0 !";
-  if(_mesh2D==0 || mesh3D==0)
-    throw INTERP_KERNEL::Exception(errMsg1);
-  if(_mesh2D->getCoords()!=mesh3D->getCoords())
-    throw INTERP_KERNEL::Exception(errMsg2);
-  if(mesh3D->getNumberOfCells()%_mesh2D->getNumberOfCells()!=0)
-    throw INTERP_KERNEL::Exception(errMsg3);
-  if(!_mesh3D_ids)
-    _mesh3D_ids=DataArrayInt::New();
-  if(!_mesh1D)
-    _mesh1D=MEDCouplingUMesh::New();
-  computeExtrusionAlg(mesh3D);
-}
-
-void MEDCouplingExtrudedMesh::build1DExtrusion(int idIn3DDesc, int newId, int nbOf1DLev, MEDCouplingUMesh *subMesh,
-                                               const int *desc3D, const int *descIndx3D,
-                                               const int *revDesc3D, const int *revDescIndx3D,
-                                               bool computeMesh1D) throw(INTERP_KERNEL::Exception)
-{
-  int nbOf2DCells=_mesh2D->getNumberOfCells();
-  int start=revDescIndx3D[idIn3DDesc];
-  int end=revDescIndx3D[idIn3DDesc+1];
-  if(end-start!=1)
-    {
-      std::ostringstream ost; ost << "Invalid bases 2D mesh specified : 2D cell # " <<  idIn3DDesc;
-      ost << " shared by more than 1 3D cell !!!";
-      throw INTERP_KERNEL::Exception(ost.str().c_str());
-    }
-  int current3DCell=revDesc3D[start];
-  int current2DCell=idIn3DDesc;
-  int *mesh3DIDs=_mesh3D_ids->getPointer();
-  mesh3DIDs[newId]=current3DCell;
-  const int *conn2D=subMesh->getNodalConnectivity()->getConstPointer();
-  const int *conn2DIndx=subMesh->getNodalConnectivityIndex()->getConstPointer();
-  for(int i=1;i<nbOf1DLev;i++)
-    {
-      std::vector<int> conn(conn2D+conn2DIndx[current2DCell]+1,conn2D+conn2DIndx[current2DCell+1]);
-      std::sort(conn.begin(),conn.end());
-      if(computeMesh1D)
-        computeBaryCenterOfFace(conn,i-1);
-      current2DCell=findOppositeFaceOf(current2DCell,current3DCell,conn,
-                                       desc3D,descIndx3D,conn2D,conn2DIndx);
-      start=revDescIndx3D[current2DCell];
-      end=revDescIndx3D[current2DCell+1];
-      if(end-start!=2)
-        {
-          std::ostringstream ost; ost << "Expecting to have 2 3D cells attached to 2D cell " << current2DCell << "!";
-          ost << " : Impossible or call tryToShareSameCoords method !";
-          throw INTERP_KERNEL::Exception(ost.str().c_str());
-        }
-      if(revDesc3D[start]!=current3DCell)
-        current3DCell=revDesc3D[start];
-      else
-        current3DCell=revDesc3D[start+1];
-      mesh3DIDs[i*nbOf2DCells+newId]=current3DCell;
-    }
-  if(computeMesh1D)
-    {
-      std::vector<int> conn(conn2D+conn2DIndx[current2DCell]+1,conn2D+conn2DIndx[current2DCell+1]);
-      std::sort(conn.begin(),conn.end());
-      computeBaryCenterOfFace(conn,nbOf1DLev-1);
-      current2DCell=findOppositeFaceOf(current2DCell,current3DCell,conn,
-                                       desc3D,descIndx3D,conn2D,conn2DIndx);
-      conn.clear();
-      conn.insert(conn.end(),conn2D+conn2DIndx[current2DCell]+1,conn2D+conn2DIndx[current2DCell+1]);
-      std::sort(conn.begin(),conn.end());
-      computeBaryCenterOfFace(conn,nbOf1DLev);
-    }
-}
-
-int MEDCouplingExtrudedMesh::findOppositeFaceOf(int current2DCell, int current3DCell, const std::vector<int>& connSorted,
-                                                const int *desc3D, const int *descIndx3D,
-                                                const int *conn2D, const int *conn2DIndx) throw(INTERP_KERNEL::Exception)
-{
-  int start=descIndx3D[current3DCell];
-  int end=descIndx3D[current3DCell+1];
-  bool found=false;
-  for(const int *candidate2D=desc3D+start;candidate2D!=desc3D+end && !found;candidate2D++)
-    {
-      if(*candidate2D!=current2DCell)
-        {
-          std::vector<int> conn2(conn2D+conn2DIndx[*candidate2D]+1,conn2D+conn2DIndx[*candidate2D+1]);
-          std::sort(conn2.begin(),conn2.end());
-          std::list<int> intersect;
-          std::set_intersection(connSorted.begin(),connSorted.end(),conn2.begin(),conn2.end(),
-                                std::insert_iterator< std::list<int> >(intersect,intersect.begin()));
-          if(intersect.empty())
-            return *candidate2D;
-        }
-    }
-  std::ostringstream ost; ost << "Impossible to find an opposite 2D face of face # " <<  current2DCell;
-  ost << " in 3D cell # " << current3DCell << " : Impossible or call tryToShareSameCoords method !";
-  throw INTERP_KERNEL::Exception(ost.str().c_str());
-}
-
-void MEDCouplingExtrudedMesh::computeBaryCenterOfFace(const std::vector<int>& nodalConnec, int lev1DId)
-{
-  double *zoneToUpdate=_mesh1D->getCoords()->getPointer()+lev1DId*3;
-  std::fill(zoneToUpdate,zoneToUpdate+3,0.);
-  const double *coords=_mesh2D->getCoords()->getConstPointer();
-  for(std::vector<int>::const_iterator iter=nodalConnec.begin();iter!=nodalConnec.end();iter++)
-    std::transform(zoneToUpdate,zoneToUpdate+3,coords+3*(*iter),zoneToUpdate,std::plus<double>());
-  std::transform(zoneToUpdate,zoneToUpdate+3,zoneToUpdate,std::bind2nd(std::multiplies<double>(),(double)(1./nodalConnec.size())));
-}
-
-int MEDCouplingExtrudedMesh::findCorrespCellByNodalConn(const std::vector<int>& nodalConnec, const int *revNodalPtr, const int *revNodalIndxPtr) throw(INTERP_KERNEL::Exception)
-{
-  std::vector<int>::const_iterator iter=nodalConnec.begin();
-  std::set<int> s1(revNodalPtr+revNodalIndxPtr[*iter],revNodalPtr+revNodalIndxPtr[*iter+1]);
-  iter++;
-  for(;iter!=nodalConnec.end();iter++)
-    {
-      std::set<int> s2(revNodalPtr+revNodalIndxPtr[*iter],revNodalPtr+revNodalIndxPtr[*iter+1]);
-      std::set<int> s3;
-      std::set_intersection(s1.begin(),s1.end(),s2.begin(),s2.end(),std::insert_iterator< std::set<int> >(s3,s3.end()));
-      s1=s3;
-    }
-  if(s1.size()==1)
-    return *(s1.begin());
-  std::ostringstream ostr;
-  ostr << "Cell with nodal connec : ";
-  std::copy(nodalConnec.begin(),nodalConnec.end(),std::ostream_iterator<int>(ostr," "));
-  ostr << " is not part of mesh";
-  throw INTERP_KERNEL::Exception(ostr.str().c_str());
-}
-
-/*!
- * This method is callable on 1Dmeshes (meshDim==1 && spaceDim==3) returned by MEDCouplingExtrudedMesh::getMesh1D typically.
- * These 1Dmeshes (meshDim==1 && spaceDim==3) have a special semantic because these meshes do not specify a static location but a translation along a path.
- * This method checks that 'm1' and 'm2' are compatible, if not an exception is thrown. In case these meshes ('m1' and 'm2') are compatible 2 corresponding meshes
- * are created ('m1r' and 'm2r') that can be used for interpolation.
- * @param m1 input mesh with meshDim==1 and spaceDim==3
- * @param m2 input mesh with meshDim==1 and spaceDim==3
- * @param eps tolerance acceptable to determine compatibility
- * @param m1r output mesh with ref count equal to 1 with meshDim==1 and spaceDim==1
- * @param m2r output mesh with ref count equal to 1 with meshDim==1 and spaceDim==1
- * @param v is the output normalized vector of the common direction of 'm1' and 'm2'  
- * @throw in case that m1 and m2 are not compatible each other.
- */
-void MEDCouplingExtrudedMesh::project1DMeshes(const MEDCouplingUMesh *m1, const MEDCouplingUMesh *m2, double eps,
-                                              MEDCouplingUMesh *&m1r, MEDCouplingUMesh *&m2r, double *v) throw(INTERP_KERNEL::Exception)
-{
-  if(m1->getSpaceDimension()!=3 || m1->getSpaceDimension()!=3)
-    throw INTERP_KERNEL::Exception("Input meshes are expected to have a spaceDim==3 for projec1D !");
-  m1r=m1->clone(true);
-  m2r=m2->clone(true);
-  m1r->changeSpaceDimension(1);
-  m2r->changeSpaceDimension(1);
-  std::vector<int> c;
-  std::vector<double> ref,ref2;
-  m1->getNodeIdsOfCell(0,c);
-  m1->getCoordinatesOfNode(c[0],ref);
-  m1->getCoordinatesOfNode(c[1],ref2);
-  std::transform(ref2.begin(),ref2.end(),ref.begin(),v,std::minus<double>());
-  double n=INTERP_KERNEL::norm<3>(v);
-  std::transform(v,v+3,v,std::bind2nd(std::multiplies<double>(),1/n));
-  m1->project1D(&ref[0],v,eps,m1r->getCoords()->getPointer());
-  m2->project1D(&ref[0],v,eps,m2r->getCoords()->getPointer());
-  
-}
-
-void MEDCouplingExtrudedMesh::rotate(const double *center, const double *vector, double angle)
-{
-  _mesh2D->rotate(center,vector,angle);
-  _mesh1D->rotate(center,vector,angle);
-}
-
-void MEDCouplingExtrudedMesh::translate(const double *vector)
-{
-  _mesh2D->translate(vector);
-  _mesh1D->translate(vector);
-}
-
-MEDCouplingMesh *MEDCouplingExtrudedMesh::mergeMyselfWith(const MEDCouplingMesh *other) const
-{
-  // not implemented yet !
-  return 0;
-}
-
-DataArrayDouble *MEDCouplingExtrudedMesh::getCoordinatesAndOwner() const
-{
-  DataArrayDouble *arr2D=_mesh2D->getCoords();
-  DataArrayDouble *arr1D=_mesh1D->getCoords();
-  DataArrayDouble *ret=DataArrayDouble::New();
-  ret->alloc(getNumberOfNodes(),3);
-  int nbOf1DLev=_mesh1D->getNumberOfNodes();
-  int nbOf2DNodes=_mesh2D->getNumberOfNodes();
-  const double *ptSrc=arr2D->getConstPointer();
-  double *pt=ret->getPointer();
-  std::copy(ptSrc,ptSrc+3*nbOf2DNodes,pt);
-  for(int i=1;i<nbOf1DLev;i++)
-    {
-      std::copy(ptSrc,ptSrc+3*nbOf2DNodes,pt+3*i*nbOf2DNodes);
-      double vec[3];
-      std::copy(arr1D->getConstPointer()+3*i,arr1D->getConstPointer()+3*(i+1),vec);
-      std::transform(arr1D->getConstPointer()+3*(i-1),arr1D->getConstPointer()+3*i,vec,vec,std::minus<double>());
-      for(int j=0;j<nbOf2DNodes;j++)
-        std::transform(vec,vec+3,pt+3*(i*nbOf2DNodes+j),pt+3*(i*nbOf2DNodes+j),std::plus<double>());
-    }
-  return ret;
-}
-
-DataArrayDouble *MEDCouplingExtrudedMesh::getBarycenterAndOwner() const
-{
-  //not yet implemented
-  return 0;
-}
-
-void MEDCouplingExtrudedMesh::computeExtrusionAlg(const MEDCouplingUMesh *mesh3D) throw(INTERP_KERNEL::Exception)
-{
-  _mesh3D_ids->alloc(mesh3D->getNumberOfCells(),1);
-  int nbOf1DLev=mesh3D->getNumberOfCells()/_mesh2D->getNumberOfCells();
-  _mesh1D->setMeshDimension(1);
-  _mesh1D->allocateCells(nbOf1DLev);
-  int tmpConn[2];
-  for(int i=0;i<nbOf1DLev;i++)
-    {
-      tmpConn[0]=i;
-      tmpConn[1]=i+1;
-      _mesh1D->insertNextCell(INTERP_KERNEL::NORM_SEG2,2,tmpConn);
-    }
-  _mesh1D->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(nbOf1DLev+1,3);
-  _mesh1D->setCoords(myCoords);
-  myCoords->decrRef();
-  DataArrayInt *desc,*descIndx,*revDesc,*revDescIndx;
-  desc=DataArrayInt::New(); descIndx=DataArrayInt::New(); revDesc=DataArrayInt::New(); revDescIndx=DataArrayInt::New();
-  MEDCouplingUMesh *subMesh=mesh3D->buildDescendingConnectivity(desc,descIndx,revDesc,revDescIndx);
-  DataArrayInt *revNodal2D,*revNodalIndx2D;
-  revNodal2D=DataArrayInt::New(); revNodalIndx2D=DataArrayInt::New();
-  subMesh->getReverseNodalConnectivity(revNodal2D,revNodalIndx2D);
-  const int *nodal2D=_mesh2D->getNodalConnectivity()->getConstPointer();
-  const int *nodal2DIndx=_mesh2D->getNodalConnectivityIndex()->getConstPointer();
-  const int *revNodal2DPtr=revNodal2D->getConstPointer();
-  const int *revNodalIndx2DPtr=revNodalIndx2D->getConstPointer();
-  const int *descP=desc->getConstPointer();
-  const int *descIndxP=descIndx->getConstPointer();
-  const int *revDescP=revDesc->getConstPointer();
-  const int *revDescIndxP=revDescIndx->getConstPointer();
-  //
-  int nbOf2DCells=_mesh2D->getNumberOfCells();
-  for(int i=0;i<nbOf2DCells;i++)
-    {
-      int idInSubMesh;
-       std::vector<int> nodalConnec(nodal2D+nodal2DIndx[i]+1,nodal2D+nodal2DIndx[i+1]);
-       try
-        {
-          idInSubMesh=findCorrespCellByNodalConn(nodalConnec,revNodal2DPtr,revNodalIndx2DPtr);
-        }
-       catch(INTERP_KERNEL::Exception& e)
-         {
-           std::ostringstream ostr; ostr << "mesh2D cell # " << i << " is not part of any cell of 3D mesh !\n";
-           ostr << e.what();
-           throw INTERP_KERNEL::Exception(ostr.str().c_str());
-         }
-       build1DExtrusion(idInSubMesh,i,nbOf1DLev,subMesh,descP,descIndxP,revDescP,revDescIndxP,i==_cell_2D_id);
-    }
-  //
-  revNodal2D->decrRef();
-  revNodalIndx2D->decrRef();
-  subMesh->decrRef();
-  desc->decrRef();
-  descIndx->decrRef();
-  revDesc->decrRef();
-  revDescIndx->decrRef();
-}
diff --git a/src/MEDCoupling/MEDCouplingExtrudedMesh.hxx b/src/MEDCoupling/MEDCouplingExtrudedMesh.hxx
deleted file mode 100644
index 60f46c047..000000000
--- a/src/MEDCoupling/MEDCouplingExtrudedMesh.hxx
+++ /dev/null
@@ -1,88 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __PARAMEDMEM_MEDCOUPLINGEXTRUDEDMESH_HXX__
-#define __PARAMEDMEM_MEDCOUPLINGEXTRUDEDMESH_HXX__
-
-#include "MEDCoupling.hxx"
-#include "MEDCouplingMesh.hxx"
-
-#include <vector>
-
-namespace ParaMEDMEM
-{
-  class DataArrayInt;
-  class DataArrayDouble;
-  class MEDCouplingUMesh;
-  class MEDCouplingFieldDouble;
-
-  class MEDCOUPLING_EXPORT MEDCouplingExtrudedMesh : public MEDCouplingMesh
-  {
-  public:
-    static MEDCouplingExtrudedMesh *New(const MEDCouplingUMesh *mesh3D, MEDCouplingUMesh *mesh2D, int cell2DId) throw(INTERP_KERNEL::Exception);
-    MEDCouplingMeshType getType() const;
-    bool isStructured() const;
-    int getNumberOfCells() const;
-    int getNumberOfNodes() const;
-    int getSpaceDimension() const;
-    int getMeshDimension() const;
-    INTERP_KERNEL::NormalizedCellType getTypeOfCell(int cellId) const;
-    void getNodeIdsOfCell(int cellId, std::vector<int>& conn) const;
-    void getCoordinatesOfNode(int nodeId, std::vector<double>& coo) const;
-    void checkCoherency() const throw (INTERP_KERNEL::Exception);
-    void getBoundingBox(double *bbox) const;
-    void updateTime();
-    MEDCouplingUMesh *getMesh2D() const { return _mesh2D; }
-    MEDCouplingUMesh *getMesh1D() const { return _mesh1D; }
-    DataArrayInt *getMesh3DIds() const { return _mesh3D_ids; }
-    MEDCouplingFieldDouble *getMeasureField(bool) const;
-    MEDCouplingFieldDouble *getMeasureFieldOnNode(bool) const;
-    MEDCouplingFieldDouble *buildOrthogonalField() const;
-    int getCellContainingPoint(const double *pos, double eps) const;
-    static int findCorrespCellByNodalConn(const std::vector<int>& nodalConnec,
-                                          const int *revNodalPtr, const int *revNodalIndxPtr) throw(INTERP_KERNEL::Exception);
-    static void project1DMeshes(const MEDCouplingUMesh *m1, const MEDCouplingUMesh *m2, double eps,
-                                MEDCouplingUMesh *&m1r, MEDCouplingUMesh *&m2r, double *v) throw(INTERP_KERNEL::Exception);
-    void rotate(const double *center, const double *vector, double angle);
-    void translate(const double *vector);
-    MEDCouplingMesh *mergeMyselfWith(const MEDCouplingMesh *other) const;
-    DataArrayDouble *getCoordinatesAndOwner() const;
-    DataArrayDouble *getBarycenterAndOwner() const;
-  private:
-    MEDCouplingExtrudedMesh(const MEDCouplingUMesh *mesh3D, MEDCouplingUMesh *mesh2D, int cell2DId) throw(INTERP_KERNEL::Exception);
-    void computeExtrusion(const MEDCouplingUMesh *mesh3D) throw(INTERP_KERNEL::Exception);
-    void computeExtrusionAlg(const MEDCouplingUMesh *mesh3D) throw(INTERP_KERNEL::Exception);
-    void build1DExtrusion(int idIn3DDesc, int newId, int nbOf1DLev, MEDCouplingUMesh *subMesh,
-                          const int *desc3D, const int *descIndx3D,
-                          const int *revDesc3D, const int *revDescIndx3D,
-                          bool computeMesh1D) throw(INTERP_KERNEL::Exception);
-    int findOppositeFaceOf(int current2DCell, int current3DCell, const std::vector<int>& connSorted,
-                           const int *desc3D, const int *descIndx3D,
-                           const int *conn2D, const int *conn2DIndx) throw(INTERP_KERNEL::Exception);
-    void computeBaryCenterOfFace(const std::vector<int>& nodalConnec, int lev1DId);
-    ~MEDCouplingExtrudedMesh();
-  private:
-    MEDCouplingUMesh *_mesh2D;
-    MEDCouplingUMesh *_mesh1D;
-    DataArrayInt *_mesh3D_ids;
-    int _cell_2D_id;
-  };
-}
-
-#endif
diff --git a/src/MEDCoupling/MEDCouplingFieldDiscretization.cxx b/src/MEDCoupling/MEDCouplingFieldDiscretization.cxx
deleted file mode 100644
index 7e7c7b298..000000000
--- a/src/MEDCoupling/MEDCouplingFieldDiscretization.cxx
+++ /dev/null
@@ -1,315 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "MEDCouplingFieldDiscretization.hxx"
-#include "MEDCouplingPointSet.hxx"
-#include "MEDCouplingCMesh.hxx"
-#include "MEDCouplingFieldDouble.hxx"
-
-#include "InterpolationUtils.hxx"
-
-#include <limits>
-#include <algorithm>
-#include  <functional>
-
-using namespace ParaMEDMEM;
-
-const double MEDCouplingFieldDiscretization::DFLT_PRECISION=1.e-12;
-
-const char MEDCouplingFieldDiscretizationP0::REPR[]="P0";
-
-const TypeOfField MEDCouplingFieldDiscretizationP0::TYPE=ON_CELLS;
-
-const char MEDCouplingFieldDiscretizationP1::REPR[]="P1";
-
-const TypeOfField MEDCouplingFieldDiscretizationP1::TYPE=ON_NODES;
-
-MEDCouplingFieldDiscretization::MEDCouplingFieldDiscretization():_precision(DFLT_PRECISION)
-{
-}
-
-MEDCouplingFieldDiscretization *MEDCouplingFieldDiscretization::New(TypeOfField type)
-{
-  switch(type)
-    {
-    case MEDCouplingFieldDiscretizationP0::TYPE:
-      return new MEDCouplingFieldDiscretizationP0;
-    case MEDCouplingFieldDiscretizationP1::TYPE:
-      return new MEDCouplingFieldDiscretizationP1;
-    default:
-      throw INTERP_KERNEL::Exception("Choosen discretization is not implemented yet.");
-    }
-}
-
-TypeOfField MEDCouplingFieldDiscretization::getTypeOfFieldFromStringRepr(const char *repr) throw(INTERP_KERNEL::Exception)
-{
-  std::string reprCpp(repr);
-  if(reprCpp==MEDCouplingFieldDiscretizationP0::REPR)
-    return MEDCouplingFieldDiscretizationP0::TYPE;
-  if(reprCpp==MEDCouplingFieldDiscretizationP1::REPR)
-    return MEDCouplingFieldDiscretizationP1::TYPE;
-  throw INTERP_KERNEL::Exception("Representation does not match with any field discretization !");
-}
-
-TypeOfField MEDCouplingFieldDiscretizationP0::getEnum() const
-{
-  return TYPE;
-}
-
-MEDCouplingFieldDiscretization *MEDCouplingFieldDiscretizationP0::clone() const
-{
-  return new MEDCouplingFieldDiscretizationP0;
-}
-
-const char *MEDCouplingFieldDiscretizationP0::getStringRepr() const
-{
-  return REPR;
-}
-
-bool MEDCouplingFieldDiscretizationP0::isEqual(const MEDCouplingFieldDiscretization *other) const
-{
-  const MEDCouplingFieldDiscretizationP0 *otherC=dynamic_cast<const MEDCouplingFieldDiscretizationP0 *>(other);
-  return otherC!=0;
-}
-
-int MEDCouplingFieldDiscretizationP0::getNumberOfTuples(const MEDCouplingMesh *mesh) const
-{
-  return mesh->getNumberOfCells();
-}
-
-DataArrayDouble *MEDCouplingFieldDiscretizationP0::getLocalizationOfDiscValues(const MEDCouplingMesh *mesh) const
-{
-  return mesh->getBarycenterAndOwner();
-}
-
-void MEDCouplingFieldDiscretizationP0::checkCompatibilityWithNature(NatureOfField nat) const throw(INTERP_KERNEL::Exception)
-{
-}
-
-void MEDCouplingFieldDiscretizationP0::checkCoherencyBetween(const MEDCouplingMesh *mesh, const DataArrayDouble *da) const throw(INTERP_KERNEL::Exception)
-{
-  if(mesh->getNumberOfCells()!=da->getNumberOfTuples())
-    {
-      std::ostringstream message;
-      message << "Field on cells invalid because there are " << mesh->getNumberOfCells();
-      message << " cells in mesh and " << da->getNumberOfTuples() << " tuples in field !";
-      throw INTERP_KERNEL::Exception(message.str().c_str());
-    }
-}
-
-MEDCouplingFieldDouble *MEDCouplingFieldDiscretizationP0::getWeightingField(const MEDCouplingMesh *mesh, bool isAbs) const
-{
-  return mesh->getMeasureField(isAbs);
-}
-
-void MEDCouplingFieldDiscretizationP0::getValueOn(const DataArrayDouble *arr, const MEDCouplingMesh *mesh, const double *loc, double *res) const
-{
-  int id=mesh->getCellContainingPoint(loc,_precision);
-  if(id==-1)
-    throw INTERP_KERNEL::Exception("Specified point is detected outside of mesh : unable to apply P0::getValueOn !");
-  arr->getTuple(id,res);
-}
-
-void MEDCouplingFieldDiscretizationP0::getValueOnPos(const DataArrayDouble *arr, const MEDCouplingMesh *mesh, int i, int j, int k, double *res) const
-{
-  const MEDCouplingCMesh *meshC=dynamic_cast<const MEDCouplingCMesh *>(mesh);
-  if(!meshC)
-    throw INTERP_KERNEL::Exception("P0::getValueOnPos is only accessible for structured meshes !");
-  int id=meshC->getCellIdFromPos(i,j,k);
-  arr->getTuple(id,res);
-}
-
-/*!
- * Nothing to do. It's not a bug.
- */
-void MEDCouplingFieldDiscretizationP0::renumberValuesOnNodes(const DataArrayInt *old2New, DataArrayDouble *arr) const
-{
-}
-
-/*!
- * This method returns a submesh of 'mesh' instance constituting cell ids contained in array defined as an interval [start;end).
- * @ param di is an array returned that specifies entity ids (here cells ids) in mesh 'mesh' of entity in returned submesh.
- * Example : The first cell id of returned mesh has the (*di)[0] id in 'mesh'
- */
-MEDCouplingMesh *MEDCouplingFieldDiscretizationP0::buildSubMeshData(const int *start, const int *end, const MEDCouplingMesh *mesh, DataArrayInt *&di) const
-{
-  MEDCouplingPointSet* ret=((const MEDCouplingPointSet *) mesh)->buildPartOfMySelf(start,end,false);
-  di=DataArrayInt::New();
-  di->alloc(end-start,1);
-  int *pt=di->getPointer();
-  std::copy(start,end,pt);
-  return ret;
-}
-
-TypeOfField MEDCouplingFieldDiscretizationP1::getEnum() const
-{
-  return TYPE;
-}
-
-MEDCouplingFieldDiscretization *MEDCouplingFieldDiscretizationP1::clone() const
-{
-  return new MEDCouplingFieldDiscretizationP1;
-}
-
-const char *MEDCouplingFieldDiscretizationP1::getStringRepr() const
-{
-  return REPR;
-}
-
-bool MEDCouplingFieldDiscretizationP1::isEqual(const MEDCouplingFieldDiscretization *other) const
-{
-  const MEDCouplingFieldDiscretizationP1 *otherC=dynamic_cast<const MEDCouplingFieldDiscretizationP1 *>(other);
-  return otherC!=0;
-}
-
-int MEDCouplingFieldDiscretizationP1::getNumberOfTuples(const MEDCouplingMesh *mesh) const
-{
-  return mesh->getNumberOfNodes();
-}
-
-DataArrayDouble *MEDCouplingFieldDiscretizationP1::getLocalizationOfDiscValues(const MEDCouplingMesh *mesh) const
-{
-  return mesh->getCoordinatesAndOwner();
-}
-
-void MEDCouplingFieldDiscretizationP1::checkCompatibilityWithNature(NatureOfField nat) const throw(INTERP_KERNEL::Exception)
-{
-  if(nat!=ConservativeVolumic)
-    throw INTERP_KERNEL::Exception("Invalid nature for P1 field !");
-}
-
-void MEDCouplingFieldDiscretizationP1::checkCoherencyBetween(const MEDCouplingMesh *mesh, const DataArrayDouble *da) const throw(INTERP_KERNEL::Exception)
-{
-  if(mesh->getNumberOfNodes()!=da->getNumberOfTuples())
-    {
-      std::ostringstream message;
-      message << "Field on nodes invalid because there are " << mesh->getNumberOfNodes();
-      message << " cells in mesh and " << da->getNumberOfTuples() << " tuples in field !";
-      throw INTERP_KERNEL::Exception(message.str().c_str());
-    }
-}
-
-MEDCouplingFieldDouble *MEDCouplingFieldDiscretizationP1::getWeightingField(const MEDCouplingMesh *mesh, bool isAbs) const
-{
-  return mesh->getMeasureFieldOnNode(isAbs);
-}
-
-void MEDCouplingFieldDiscretizationP1::getValueOn(const DataArrayDouble *arr, const MEDCouplingMesh *mesh, const double *loc, double *res) const
-{
-  int id=mesh->getCellContainingPoint(loc,_precision);
-  if(id==-1)
-    throw INTERP_KERNEL::Exception("Specified point is detected outside of mesh : unable to apply P1::getValueOn !");
-  INTERP_KERNEL::NormalizedCellType type=mesh->getTypeOfCell(id);
-  if(type!=INTERP_KERNEL::NORM_SEG2 && type!=INTERP_KERNEL::NORM_TRI3 && type!=INTERP_KERNEL::NORM_TETRA4)
-    throw INTERP_KERNEL::Exception("P1 getValueOn is not specified for not simplex cells !");
-  std::vector<int> conn;
-  std::vector<double> coo;
-  mesh->getNodeIdsOfCell(id,conn);
-  for(std::vector<int>::const_iterator iter=conn.begin();iter!=conn.end();iter++)
-    mesh->getCoordinatesOfNode(*iter,coo);
-  int spaceDim=mesh->getSpaceDimension();
-  int nbOfNodes=conn.size();
-  std::vector<const double *> vec(nbOfNodes);
-  for(int i=0;i<nbOfNodes;i++)
-    vec[i]=&coo[i*spaceDim];
-  double *tmp=new double[nbOfNodes];
-  INTERP_KERNEL::barycentric_coords(vec,loc,tmp);
-  int sz=arr->getNumberOfComponents();
-  double *tmp2=new double[sz];
-  std::fill(res,res+sz,0.);
-  for(int i=0;i<nbOfNodes;i++)
-    {
-      arr->getTuple(conn[i],tmp2);
-      std::transform(tmp2,tmp2+sz,tmp2,std::bind2nd(std::multiplies<double>(),tmp[i]));
-      std::transform(res,res+sz,tmp2,res,std::plus<double>());
-    }
-  delete [] tmp;
-  delete [] tmp2;
-}
-
-void MEDCouplingFieldDiscretizationP1::getValueOnPos(const DataArrayDouble *arr, const MEDCouplingMesh *mesh, int i, int j, int k, double *res) const
-{
-  const MEDCouplingCMesh *meshC=dynamic_cast<const MEDCouplingCMesh *>(mesh);
-  if(!meshC)
-    throw INTERP_KERNEL::Exception("P1::getValueOnPos is only accessible for structured meshes !");
-  int id=meshC->getNodeIdFromPos(i,j,k);
-  arr->getTuple(id,res);
-}
-
-void MEDCouplingFieldDiscretizationP1::renumberValuesOnNodes(const DataArrayInt *old2New, DataArrayDouble *arr) const
-{
-  int oldNbOfElems=old2New->getNbOfElems();
-  const int *old2NewPtr=old2New->getConstPointer();
-  int nbOfComp=arr->getNumberOfComponents();
-  int newNbOfTuples=(*std::max_element(old2NewPtr,old2NewPtr+oldNbOfElems))+1;
-  DataArrayDouble *arrCpy=arr->deepCopy();
-  const double *ptSrc=arrCpy->getConstPointer();
-  arr->reAlloc(newNbOfTuples);
-  double *ptToFill=arr->getPointer();
-  std::fill(ptToFill,ptToFill+nbOfComp*newNbOfTuples,std::numeric_limits<double>::max());
-  for(int i=0;i<oldNbOfElems;i++)
-    {
-      int newNb=old2NewPtr[i];
-      if(std::find_if(ptToFill+newNb*nbOfComp,ptToFill+(newNb+1)*nbOfComp,std::bind2nd(std::not_equal_to<double>(),std::numeric_limits<double>::max()))
-         ==ptToFill+(newNb+1)*nbOfComp)
-        std::copy(ptSrc+i*nbOfComp,ptSrc+(i+1)*nbOfComp,ptToFill+newNb*nbOfComp);
-      else
-        {
-          if(!std::equal(ptSrc+i*nbOfComp,ptSrc+(i+1)*nbOfComp,ptToFill+newNb*nbOfComp))
-            {
-              arrCpy->decrRef();
-              std::ostringstream oss;
-              oss << "Node " << i << " and " << std::find(old2NewPtr,old2NewPtr+i,newNb)-old2NewPtr
-                  << " have been merged and nodal field on them are different !";
-              throw INTERP_KERNEL::Exception(oss.str().c_str());
-            }
-        }
-    }
-  arrCpy->decrRef();
-}
-
-/*!
- * This method invert array 'di' that is a conversion map from Old to New node numbering to New to Old node numbering.
- */
-DataArrayInt *MEDCouplingFieldDiscretizationP1::invertArrayO2N2N2O(const MEDCouplingMesh *mesh, const DataArrayInt *di)
-{
-  DataArrayInt *ret=DataArrayInt::New();
-  ret->alloc(mesh->getNumberOfNodes(),1);
-  int nbOfOldNodes=di->getNumberOfTuples();
-  const int *old2New=di->getConstPointer();
-  int *pt=ret->getPointer();
-  for(int i=0;i!=nbOfOldNodes;i++)
-    if(old2New[i]!=-1)
-      pt[old2New[i]]=i;
-  return ret;
-}
-
-/*!
- * This method returns a submesh of 'mesh' instance constituting cell ids contained in array defined as an interval [start;end).
-* @ param di is an array returned that specifies entity ids (here nodes ids) in mesh 'mesh' of entity in returned submesh.
- * Example : The first node id of returned mesh has the (*di)[0] id in 'mesh'
- */
-MEDCouplingMesh *MEDCouplingFieldDiscretizationP1::buildSubMeshData(const int *start, const int *end, const MEDCouplingMesh *mesh, DataArrayInt *&di) const
-{
-  MEDCouplingPointSet* ret=((const MEDCouplingPointSet *) mesh)->buildPartOfMySelf(start,end,true);
-  DataArrayInt *diInv=ret->zipCoordsTraducer();
-  di=invertArrayO2N2N2O(ret,diInv);
-  diInv->decrRef();
-  return ret;
-}
diff --git a/src/MEDCoupling/MEDCouplingFieldDiscretization.hxx b/src/MEDCoupling/MEDCouplingFieldDiscretization.hxx
deleted file mode 100644
index 25d52f542..000000000
--- a/src/MEDCoupling/MEDCouplingFieldDiscretization.hxx
+++ /dev/null
@@ -1,106 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __MEDCOUPLINGFIELDDISCRETIZATION_HXX__
-#define __MEDCOUPLINGFIELDDISCRETIZATION_HXX__
-
-#include "MEDCoupling.hxx"
-#include "MEDCouplingRefCountObject.hxx"
-#include "InterpKernelException.hxx"
-#include "MEDCouplingNatureOfField.hxx"
-
-namespace ParaMEDMEM
-{
-  class DataArrayInt;
-  class MEDCouplingMesh;
-  class DataArrayDouble;
-  class MEDCouplingFieldDouble;
-
-  class MEDCOUPLING_EXPORT MEDCouplingFieldDiscretization
-  {
-  public:
-    static MEDCouplingFieldDiscretization *New(TypeOfField type);
-    double getPrecision() const { return _precision; }
-    void setPrecision(double val) { _precision=val; }
-    static TypeOfField getTypeOfFieldFromStringRepr(const char *repr) throw(INTERP_KERNEL::Exception);
-    virtual TypeOfField getEnum() const = 0;
-    virtual bool isEqual(const MEDCouplingFieldDiscretization *other) const = 0;
-    virtual MEDCouplingFieldDiscretization *clone() const = 0;
-    virtual const char *getStringRepr() const = 0;
-    virtual int getNumberOfTuples(const MEDCouplingMesh *mesh) const = 0;
-    virtual DataArrayDouble *getLocalizationOfDiscValues(const MEDCouplingMesh *mesh) const = 0;
-    virtual void checkCompatibilityWithNature(NatureOfField nat) const throw(INTERP_KERNEL::Exception) = 0;
-    virtual void checkCoherencyBetween(const MEDCouplingMesh *mesh, const DataArrayDouble *da) const throw(INTERP_KERNEL::Exception) = 0;
-    virtual MEDCouplingFieldDouble *getWeightingField(const MEDCouplingMesh *mesh, bool isAbs) const = 0;
-    virtual void getValueOn(const DataArrayDouble *arr, const MEDCouplingMesh *mesh, const double *loc, double *res) const = 0;
-    virtual void getValueOnPos(const DataArrayDouble *arr, const MEDCouplingMesh *mesh, int i, int j, int k, double *res) const = 0;
-    virtual MEDCouplingMesh *buildSubMeshData(const int *start, const int *end, const MEDCouplingMesh *mesh, DataArrayInt *&di) const = 0;
-    virtual void renumberValuesOnNodes(const DataArrayInt *old2New, DataArrayDouble *arr) const = 0;
-  protected:
-    MEDCouplingFieldDiscretization();
-  protected:
-    double _precision;
-    static const double DFLT_PRECISION;
-  };
-
-  class MEDCOUPLING_EXPORT MEDCouplingFieldDiscretizationP0 : public MEDCouplingFieldDiscretization
-  {
-  public:
-    TypeOfField getEnum() const;
-    MEDCouplingFieldDiscretization *clone() const;
-    const char *getStringRepr() const;
-    bool isEqual(const MEDCouplingFieldDiscretization *other) const;
-    int getNumberOfTuples(const MEDCouplingMesh *mesh) const;
-    DataArrayDouble *getLocalizationOfDiscValues(const MEDCouplingMesh *mesh) const;
-    void checkCompatibilityWithNature(NatureOfField nat) const throw(INTERP_KERNEL::Exception);
-    void checkCoherencyBetween(const MEDCouplingMesh *mesh, const DataArrayDouble *da) const throw(INTERP_KERNEL::Exception);
-    MEDCouplingFieldDouble *getWeightingField(const MEDCouplingMesh *mesh, bool isAbs) const;
-    void getValueOn(const DataArrayDouble *arr, const MEDCouplingMesh *mesh, const double *loc, double *res) const;
-    void getValueOnPos(const DataArrayDouble *arr, const MEDCouplingMesh *mesh, int i, int j, int k, double *res) const;
-    void renumberValuesOnNodes(const DataArrayInt *old2New, DataArrayDouble *arr) const;
-    MEDCouplingMesh *buildSubMeshData(const int *start, const int *end, const MEDCouplingMesh *mesh, DataArrayInt *&di) const;
-  public:
-    static const char REPR[];
-    static const TypeOfField TYPE;
-  };
-
-  class MEDCOUPLING_EXPORT MEDCouplingFieldDiscretizationP1 : public MEDCouplingFieldDiscretization
-  {
-  public:
-    TypeOfField getEnum() const;
-    MEDCouplingFieldDiscretization *clone() const;
-    const char *getStringRepr() const;
-    bool isEqual(const MEDCouplingFieldDiscretization *other) const;
-    int getNumberOfTuples(const MEDCouplingMesh *mesh) const;
-    DataArrayDouble *getLocalizationOfDiscValues(const MEDCouplingMesh *mesh) const;
-    void checkCompatibilityWithNature(NatureOfField nat) const throw(INTERP_KERNEL::Exception);
-    void checkCoherencyBetween(const MEDCouplingMesh *mesh, const DataArrayDouble *da) const throw(INTERP_KERNEL::Exception);
-    MEDCouplingFieldDouble *getWeightingField(const MEDCouplingMesh *mesh, bool isAbs) const;
-    void getValueOn(const DataArrayDouble *arr, const MEDCouplingMesh *mesh, const double *loc, double *res) const;
-    void getValueOnPos(const DataArrayDouble *arr, const MEDCouplingMesh *mesh, int i, int j, int k, double *res) const;
-    MEDCouplingMesh *buildSubMeshData(const int *start, const int *end, const MEDCouplingMesh *mesh, DataArrayInt *&di) const;
-    void renumberValuesOnNodes(const DataArrayInt *old2New, DataArrayDouble *arr) const;
-    static DataArrayInt *invertArrayO2N2N2O(const MEDCouplingMesh *mesh, const DataArrayInt *di);
-  public:
-    static const char REPR[];
-    static const TypeOfField TYPE;
-  };
-}
-
-#endif
diff --git a/src/MEDCoupling/MEDCouplingMemArray.cxx b/src/MEDCoupling/MEDCouplingMemArray.cxx
deleted file mode 100644
index 3456e329b..000000000
--- a/src/MEDCoupling/MEDCouplingMemArray.cxx
+++ /dev/null
@@ -1,389 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "MEDCouplingMemArray.txx"
-
-#include <functional>
-
-using namespace ParaMEDMEM;
-
-void DataArray::setName(const char *name)
-{
-  _name=name;
-}
-
-void DataArray::copyStringInfoFrom(const DataArray& other) throw(INTERP_KERNEL::Exception)
-{
-  if(_info_on_compo.size()!=other._info_on_compo.size())
-    throw INTERP_KERNEL::Exception("Size of arrays mismatches on copyStringInfoFrom !");
-  _name=other._name;
-  _info_on_compo=other._info_on_compo;
-}
-
-bool DataArray::areInfoEquals(const DataArray& other) const
-{
-  if(_nb_of_tuples!=other._nb_of_tuples)
-    return false;
-  if(_name!=other._name)
-    return false;
-  return _info_on_compo==other._info_on_compo;
-}
-
-DataArrayDouble *DataArrayDouble::New()
-{
-  return new DataArrayDouble;
-}
-
-DataArrayDouble *DataArrayDouble::deepCopy() const
-{
-  return new DataArrayDouble(*this);
-}
-
-DataArrayDouble *DataArrayDouble::performCpy(bool deepCpy) const
-{
-  if(deepCpy)
-    return deepCopy();
-  else
-    {
-      incrRef();
-      return const_cast<DataArrayDouble *>(this);
-    }
-}
-
-void DataArrayDouble::alloc(int nbOfTuple, int nbOfCompo)
-{
-  _nb_of_tuples=nbOfTuple;
-  _info_on_compo.resize(nbOfCompo);
-  _mem.alloc(nbOfCompo*_nb_of_tuples);
-  declareAsNew();
-}
-
-bool DataArrayDouble::isEqual(const DataArrayDouble& other, double prec) const
-{
-  if(!areInfoEquals(other))
-    return false;
-  return _mem.isEqual(other._mem,prec);
-}
-
-void DataArrayDouble::reAlloc(int nbOfTuples)
-{
-  _mem.reAlloc(_info_on_compo.size()*nbOfTuples);
-  _nb_of_tuples=nbOfTuples;
-  declareAsNew();
-}
-
-void DataArrayDouble::setArrayIn(DataArrayDouble *newArray, DataArrayDouble* &arrayToSet)
-{
-  if(newArray!=arrayToSet)
-    {
-      if(arrayToSet)
-        arrayToSet->decrRef();
-      arrayToSet=newArray;
-      if(arrayToSet)
-        arrayToSet->incrRef();
-    }
-}
-
-void DataArrayDouble::useArray(const double *array, bool ownership,  DeallocType type, int nbOfTuple, int nbOfCompo)
-{
-  _nb_of_tuples=nbOfTuple;
-  _info_on_compo.resize(nbOfCompo);
-  _mem.useArray(array,ownership,type,nbOfTuple*nbOfCompo);
-  declareAsNew();
-}
-
-void DataArrayDouble::checkNoNullValues() const throw(INTERP_KERNEL::Exception)
-{
-  const double *tmp=getConstPointer();
-  int nbOfElems=getNbOfElems();
-  const double *where=std::find(tmp,tmp+nbOfElems,0.);
-  if(where!=tmp+nbOfElems)
-    throw INTERP_KERNEL::Exception("A value 0.0 have been detected !");
-}
-
-DataArrayDouble *DataArrayDouble::aggregate(const DataArrayDouble *a1, const DataArrayDouble *a2)
-{
-  int nbOfComp=a1->getNumberOfComponents();
-  if(nbOfComp!=a2->getNumberOfComponents())
-    throw INTERP_KERNEL::Exception("Nb of components mismatch for array aggregation !");
-  int nbOfTuple1=a1->getNumberOfTuples();
-  int nbOfTuple2=a2->getNumberOfTuples();
-  DataArrayDouble *ret=DataArrayDouble::New();
-  ret->alloc(nbOfTuple1+nbOfTuple2,nbOfComp);
-  double *pt=std::copy(a1->getConstPointer(),a1->getConstPointer()+nbOfTuple1*nbOfComp,ret->getPointer());
-  std::copy(a2->getConstPointer(),a2->getConstPointer()+nbOfTuple2*nbOfComp,pt);
-  ret->copyStringInfoFrom(*a1);
-  return ret;
-}
-
-DataArrayDouble *DataArrayDouble::add(const DataArrayDouble *a1, const DataArrayDouble *a2)
-{
-  int nbOfComp=a1->getNumberOfComponents();
-  if(nbOfComp!=a2->getNumberOfComponents())
-    throw INTERP_KERNEL::Exception("Nb of components mismatch for array add !");
-  int nbOfTuple=a1->getNumberOfTuples();
-  if(nbOfTuple!=a2->getNumberOfTuples())
-    throw INTERP_KERNEL::Exception("Nb of tuples mismatch for array add !");
-  DataArrayDouble *ret=DataArrayDouble::New();
-  ret->alloc(nbOfTuple,nbOfComp);
-  std::transform(a1->getConstPointer(),a1->getConstPointer()+nbOfTuple*nbOfComp,a2->getConstPointer(),ret->getPointer(),std::plus<double>());
-  ret->copyStringInfoFrom(*a1);
-  return ret;
-}
-
-void DataArrayDouble::addEqual(const DataArrayDouble *other)
-{
-  int nbOfComp=getNumberOfComponents();
-  if(nbOfComp!=other->getNumberOfComponents())
-    throw INTERP_KERNEL::Exception("Nb of components mismatch for array add !");
-  int nbOfTuple=getNumberOfTuples();
-  if(nbOfTuple!=other->getNumberOfTuples())
-    throw INTERP_KERNEL::Exception("Nb of tuples mismatch for array add !");
-  std::transform(getConstPointer(),getConstPointer()+nbOfTuple*nbOfComp,other->getConstPointer(),getPointer(),std::plus<double>());
-  declareAsNew();
-}
-
-DataArrayDouble *DataArrayDouble::substract(const DataArrayDouble *a1, const DataArrayDouble *a2)
-{
-  int nbOfComp=a1->getNumberOfComponents();
-  if(nbOfComp!=a2->getNumberOfComponents())
-    throw INTERP_KERNEL::Exception("Nb of components mismatch for array substract !");
-  int nbOfTuple=a1->getNumberOfTuples();
-  if(nbOfTuple!=a2->getNumberOfTuples())
-    throw INTERP_KERNEL::Exception("Nb of tuples mismatch for array substract !");
-  DataArrayDouble *ret=DataArrayDouble::New();
-  ret->alloc(nbOfTuple,nbOfComp);
-  std::transform(a1->getConstPointer(),a1->getConstPointer()+nbOfTuple*nbOfComp,a2->getConstPointer(),ret->getPointer(),std::minus<double>());
-  ret->copyStringInfoFrom(*a1);
-  return ret;
-}
-
-void DataArrayDouble::substractEqual(const DataArrayDouble *other)
-{
-  int nbOfComp=getNumberOfComponents();
-  if(nbOfComp!=other->getNumberOfComponents())
-    throw INTERP_KERNEL::Exception("Nb of components mismatch for array substract !");
-  int nbOfTuple=getNumberOfTuples();
-  if(nbOfTuple!=other->getNumberOfTuples())
-    throw INTERP_KERNEL::Exception("Nb of tuples mismatch for array substract !");
-  std::transform(getConstPointer(),getConstPointer()+nbOfTuple*nbOfComp,other->getConstPointer(),getPointer(),std::minus<double>());
-  declareAsNew();
-}
-
-DataArrayDouble *DataArrayDouble::multiply(const DataArrayDouble *a1, const DataArrayDouble *a2)
-{
-  int nbOfTuple=a1->getNumberOfTuples();
-  int nbOfTuple2=a2->getNumberOfTuples();
-  int nbOfComp=a1->getNumberOfComponents();
-  int nbOfComp2=a2->getNumberOfComponents();
-  if(nbOfTuple!=nbOfTuple2)
-    throw INTERP_KERNEL::Exception("Nb of tuples mismatch for array multiply !");
-  DataArrayDouble *ret=0;
-  if(nbOfComp==nbOfComp2)
-    {
-      ret=DataArrayDouble::New();
-      ret->alloc(nbOfTuple,nbOfComp);
-      std::transform(a1->getConstPointer(),a1->getConstPointer()+nbOfTuple*nbOfComp,a2->getConstPointer(),ret->getPointer(),std::multiplies<double>());
-      ret->copyStringInfoFrom(*a1);
-    }
-  else
-    {
-      int nbOfCompMin,nbOfCompMax;
-      const DataArrayDouble *aMin, *aMax;
-      if(nbOfComp>nbOfComp2)
-        {
-          nbOfCompMin=nbOfComp2; nbOfCompMax=nbOfComp;
-          aMin=a2; aMax=a1;
-        }
-      else
-        {
-          nbOfCompMin=nbOfComp; nbOfCompMax=nbOfComp2;
-          aMin=a1; aMax=a2;
-        }
-      if(nbOfCompMin==1)
-        {
-          ret=DataArrayDouble::New();
-          ret->alloc(nbOfTuple,nbOfCompMax);
-          const double *aMinPtr=aMin->getConstPointer();
-          const double *aMaxPtr=aMax->getConstPointer();
-          double *res=ret->getPointer();
-          for(int i=0;i<nbOfTuple;i++)
-            res=std::transform(aMaxPtr+i*nbOfCompMax,aMaxPtr+(i+1)*nbOfCompMax,res,std::bind2nd(std::multiplies<double>(),aMinPtr[i]));
-          ret->copyStringInfoFrom(*aMax);
-        }
-      else
-        throw INTERP_KERNEL::Exception("Nb of components mismatch for array multiply !");
-    }
-  return ret;
-}
-
-void DataArrayDouble::multiplyEqual(const DataArrayDouble *other)
-{
-  int nbOfTuple=getNumberOfTuples();
-  int nbOfTuple2=other->getNumberOfTuples();
-  int nbOfComp=getNumberOfComponents();
-  int nbOfComp2=other->getNumberOfComponents();
-  if(nbOfTuple!=nbOfTuple2)
-    throw INTERP_KERNEL::Exception("Nb of tuples mismatch for array multiplyEqual !");
-  DataArrayDouble *ret=0;
-  if(nbOfComp==nbOfComp2)
-    {
-      ret=DataArrayDouble::New();
-      ret->alloc(nbOfTuple,nbOfComp);
-      std::transform(getConstPointer(),getConstPointer()+nbOfTuple*nbOfComp,other->getConstPointer(),getPointer(),std::multiplies<double>());
-    }
-  else
-    {
-      if(nbOfComp2==1)
-        {
-          const double *ptr=other->getConstPointer();
-          double *myPtr=getPointer();
-          for(int i=0;i<nbOfTuple;i++)
-            myPtr=std::transform(myPtr,myPtr+nbOfComp,myPtr,std::bind2nd(std::multiplies<double>(),ptr[i]));
-        }
-      else
-        throw INTERP_KERNEL::Exception("Nb of components mismatch for array multiplyEqual !");
-    }
-  declareAsNew();
-}
-
-DataArrayDouble *DataArrayDouble::divide(const DataArrayDouble *a1, const DataArrayDouble *a2)
-{
-  int nbOfComp=a1->getNumberOfComponents();
-  if(nbOfComp!=a2->getNumberOfComponents())
-    throw INTERP_KERNEL::Exception("Nb of components mismatch for array divide !");
-  int nbOfTuple=a1->getNumberOfTuples();
-  if(nbOfTuple!=a2->getNumberOfTuples())
-    throw INTERP_KERNEL::Exception("Nb of tuples mismatch for array divide !");
-  DataArrayDouble *ret=DataArrayDouble::New();
-  ret->alloc(nbOfTuple,nbOfComp);
-  std::transform(a1->getConstPointer(),a1->getConstPointer()+nbOfTuple*nbOfComp,a2->getConstPointer(),ret->getPointer(),std::divides<double>());
-  ret->copyStringInfoFrom(*a1);
-  return ret;
-}
-
-void DataArrayDouble::divideEqual(const DataArrayDouble *other)
-{
-  int nbOfComp=getNumberOfComponents();
-  if(nbOfComp!=other->getNumberOfComponents())
-    throw INTERP_KERNEL::Exception("Nb of components mismatch for array divideEqual !");
-  int nbOfTuple=getNumberOfTuples();
-  if(nbOfTuple!=other->getNumberOfTuples())
-    throw INTERP_KERNEL::Exception("Nb of tuples mismatch for array divideEqual !");
-  std::transform(getConstPointer(),getConstPointer()+nbOfTuple*nbOfComp,other->getConstPointer(),getPointer(),std::divides<double>());
-  declareAsNew();
-}
-
-DataArrayInt *DataArrayInt::New()
-{
-  return new DataArrayInt;
-}
-
-DataArrayInt *DataArrayInt::deepCopy() const
-{
-  return new DataArrayInt(*this);
-}
-
-DataArrayInt *DataArrayInt::performCpy(bool deepCpy) const
-{
-  if(deepCpy)
-    return deepCopy();
-  else
-    {
-      incrRef();
-      return const_cast<DataArrayInt *>(this);
-    }
-}
-
-void DataArrayInt::alloc(int nbOfTuple, int nbOfCompo)
-{
-  _nb_of_tuples=nbOfTuple;
-  _info_on_compo.resize(nbOfCompo);
-  _mem.alloc(nbOfCompo*_nb_of_tuples);
-  declareAsNew();
-}
-
-bool DataArrayInt::isEqual(const DataArrayInt& other) const
-{
-  if(!areInfoEquals(other))
-    return false;
-  return _mem.isEqual(other._mem,0);
-}
-
-void DataArrayInt::useArray(const int *array, bool ownership,  DeallocType type, int nbOfTuple, int nbOfCompo)
-{
-  _nb_of_tuples=nbOfTuple;
-  _info_on_compo.resize(nbOfCompo);
-  _mem.useArray(array,ownership,type,nbOfTuple*nbOfCompo);
-  declareAsNew();
-}
-
-void DataArrayInt::reAlloc(int nbOfTuples)
-{
-  _mem.reAlloc(_info_on_compo.size()*nbOfTuples);
-  _nb_of_tuples=nbOfTuples;
-  declareAsNew();
-}
-
-void DataArrayInt::setArrayIn(DataArrayInt *newArray, DataArrayInt* &arrayToSet)
-{
-  if(newArray!=arrayToSet)
-    {
-      if(arrayToSet)
-        arrayToSet->decrRef();
-      arrayToSet=newArray;
-      if(arrayToSet)
-        arrayToSet->incrRef();
-    }
-}
-
-DataArrayInt *DataArrayInt::aggregate(const DataArrayInt *a1, const DataArrayInt *a2, int offsetA2)
-{
-  int nbOfComp=a1->getNumberOfComponents();
-  if(nbOfComp!=a2->getNumberOfComponents())
-    throw INTERP_KERNEL::Exception("Nb of components mismatch for array aggregation !");
-  int nbOfTuple1=a1->getNumberOfTuples();
-  int nbOfTuple2=a2->getNumberOfTuples();
-  DataArrayInt *ret=DataArrayInt::New();
-  ret->alloc(nbOfTuple1+nbOfTuple2-offsetA2,nbOfComp);
-  int *pt=std::copy(a1->getConstPointer(),a1->getConstPointer()+nbOfTuple1*nbOfComp,ret->getPointer());
-  std::copy(a2->getConstPointer()+offsetA2*nbOfComp,a2->getConstPointer()+nbOfTuple2*nbOfComp,pt);
-  ret->copyStringInfoFrom(*a1);
-  return ret;
-}
-
-int *DataArrayInt::checkAndPreparePermutation(const int *start, const int *end)
-{
-  int sz=std::distance(start,end);
-  int *ret=new int[sz];
-  int *work=new int[sz];
-  std::copy(start,end,work);
-  std::sort(work,work+sz);
-  if(std::unique(work,work+sz)!=work+sz)
-    {
-      delete [] work;
-      delete [] ret;
-      throw INTERP_KERNEL::Exception("Some elements are equals in the specified array !");
-    }
-  int *iter2=ret;
-  for(const int *iter=start;iter!=end;iter++,iter2++)
-    *iter2=std::distance(work,std::find(work,work+sz,*iter));
-  delete [] work;
-  return ret;
-}
diff --git a/src/MEDCoupling/MEDCouplingMemArray.hxx b/src/MEDCoupling/MEDCouplingMemArray.hxx
deleted file mode 100644
index 74d165bb9..000000000
--- a/src/MEDCoupling/MEDCouplingMemArray.hxx
+++ /dev/null
@@ -1,170 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __PARAMEDMEM_MEDCOUPLINGMEMARRAY_HXX__
-#define __PARAMEDMEM_MEDCOUPLINGMEMARRAY_HXX__
-
-#include "MEDCoupling.hxx"
-#include "MEDCouplingTimeLabel.hxx"
-#include "MEDCouplingRefCountObject.hxx"
-#include "InterpKernelException.hxx"
-
-#include <string>
-#include <vector>
-
-namespace ParaMEDMEM
-{
-  template<class T>
-  class MEDCouplingPointer
-  {
-  public:
-    MEDCouplingPointer():_internal(0),_external(0) { }
-    void null() { _internal=0; _external=0; }
-    bool isNull() const { return _internal==0 && _external==0; }
-    void setInternal(T *pointer);
-    void setExternal(const T *pointer);
-    const T *getConstPointer() const { if(_internal) return _internal; else return _external; }
-    const T *getConstPointerLoc(int offset) const { if(_internal) return _internal+offset; else return _external+offset; }
-    T *getPointer() const { if(_internal) return _internal; if(_external) throw INTERP_KERNEL::Exception("Trying to write on an external pointer."); else return 0; }
-  private:
-    T *_internal;
-    const T *_external;
-  };
-
-  template<class T>
-  class MemArray
-  {
-  public:
-    MemArray():_nb_of_elem(-1),_ownership(false),_dealloc(CPP_DEALLOC) { }
-    MemArray(const MemArray<T>& other);
-    const T *getConstPointerLoc(int offset) const { return _pointer.getConstPointerLoc(offset); }
-    const T *getConstPointer() const { return _pointer.getConstPointer(); }
-    T *getPointer() const { return _pointer.getPointer(); }
-    MemArray<T> &operator=(const MemArray<T>& other);
-    T operator[](int id) const { return _pointer.getConstPointer()[id]; }
-    T& operator[](int id) { return _pointer.getPointer()[id]; }
-    bool isEqual(const MemArray<T>& other, T prec) const;
-    void alloc(int nbOfElements);
-    void reAlloc(int newNbOfElements);
-    void useArray(const T *array, bool ownership, DeallocType type, int nbOfElem);
-    void writeOnPlace(int id, T element0, const T *others, int sizeOfOthers);
-    ~MemArray() { destroy(); }
-  private:
-    void destroy();
-    static void destroyPointer(T *pt, DeallocType type);
-  private:
-    int _nb_of_elem;
-    bool _ownership;
-    MEDCouplingPointer<T> _pointer;
-    //T *_pointer;
-    DeallocType _dealloc;
-  };
-
-  class DataArray : public RefCountObject, public TimeLabel
-  {
-  public:
-    MEDCOUPLING_EXPORT void setName(const char *name);
-    MEDCOUPLING_EXPORT void copyStringInfoFrom(const DataArray& other) throw(INTERP_KERNEL::Exception);
-    MEDCOUPLING_EXPORT bool areInfoEquals(const DataArray& other) const;
-    MEDCOUPLING_EXPORT std::string getName() const { return _name; }
-    MEDCOUPLING_EXPORT std::string getInfoOnComponent(int i) const { return _info_on_compo[i]; }
-    MEDCOUPLING_EXPORT void setInfoOnComponent(int i, const char *info) { _info_on_compo[i]=info; }
-    MEDCOUPLING_EXPORT int getNumberOfComponents() const { return _info_on_compo.size(); }
-    MEDCOUPLING_EXPORT int getNumberOfTuples() const { return _nb_of_tuples; }
-    MEDCOUPLING_EXPORT int getNbOfElems() const { return _info_on_compo.size()*_nb_of_tuples; }
-  protected:
-    DataArray():_nb_of_tuples(-1) { }
-  protected:
-    int _nb_of_tuples;
-    std::string _name;
-    std::vector<std::string> _info_on_compo;
-  };
-}
-
-#include "MEDCouplingMemArray.txx"
-
-namespace ParaMEDMEM
-{
-  class DataArrayDouble : public DataArray
-  {
-  public:
-    MEDCOUPLING_EXPORT static DataArrayDouble *New();
-    MEDCOUPLING_EXPORT DataArrayDouble *deepCopy() const;
-    MEDCOUPLING_EXPORT DataArrayDouble *performCpy(bool deepCpy) const;
-    MEDCOUPLING_EXPORT void alloc(int nbOfTuple, int nbOfCompo);
-    MEDCOUPLING_EXPORT bool isEqual(const DataArrayDouble& other, double prec) const;
-    //!alloc or useArray should have been called before.
-    MEDCOUPLING_EXPORT void reAlloc(int nbOfTuples);
-    MEDCOUPLING_EXPORT void getTuple(int tupleId, double *res) const { std::copy(_mem.getConstPointerLoc(tupleId*_info_on_compo.size()),_mem.getConstPointerLoc((tupleId+1)*_info_on_compo.size()),res); }
-    MEDCOUPLING_EXPORT double getIJ(int tupleId, int compoId) const { return _mem[tupleId*_info_on_compo.size()+compoId]; }
-    MEDCOUPLING_EXPORT void setIJ(int tupleId, int compoId, double newVal) { _mem[tupleId*_info_on_compo.size()+compoId]=newVal; }
-    MEDCOUPLING_EXPORT double *getPointer() const { return _mem.getPointer(); }
-    MEDCOUPLING_EXPORT static void setArrayIn(DataArrayDouble *newArray, DataArrayDouble* &arrayToSet);
-    MEDCOUPLING_EXPORT const double *getConstPointer() const { return _mem.getConstPointer(); }
-    MEDCOUPLING_EXPORT void useArray(const double *array, bool ownership, DeallocType type, int nbOfTuple, int nbOfCompo);
-    MEDCOUPLING_EXPORT void writeOnPlace(int id, double element0, const double *others, int sizeOfOthers) { _mem.writeOnPlace(id,element0,others,sizeOfOthers); }
-    MEDCOUPLING_EXPORT void checkNoNullValues() const throw(INTERP_KERNEL::Exception);
-    MEDCOUPLING_EXPORT static DataArrayDouble *aggregate(const DataArrayDouble *a1, const DataArrayDouble *a2);
-    MEDCOUPLING_EXPORT static DataArrayDouble *add(const DataArrayDouble *a1, const DataArrayDouble *a2);
-    MEDCOUPLING_EXPORT void addEqual(const DataArrayDouble *other);
-    MEDCOUPLING_EXPORT static DataArrayDouble *substract(const DataArrayDouble *a1, const DataArrayDouble *a2);
-    MEDCOUPLING_EXPORT void substractEqual(const DataArrayDouble *other);
-    MEDCOUPLING_EXPORT static DataArrayDouble *multiply(const DataArrayDouble *a1, const DataArrayDouble *a2);
-    MEDCOUPLING_EXPORT void multiplyEqual(const DataArrayDouble *other);
-    MEDCOUPLING_EXPORT static DataArrayDouble *divide(const DataArrayDouble *a1, const DataArrayDouble *a2);
-    MEDCOUPLING_EXPORT void divideEqual(const DataArrayDouble *other);
-    //! nothing to do here because this class does not aggregate any TimeLabel instance.
-    MEDCOUPLING_EXPORT void updateTime() { }
-  private:
-    DataArrayDouble() { }
-  private:
-    MemArray<double> _mem;
-  };
-
-  class DataArrayInt : public DataArray
-  {
-  public:
-    MEDCOUPLING_EXPORT static DataArrayInt *New();
-    MEDCOUPLING_EXPORT DataArrayInt *deepCopy() const;
-    MEDCOUPLING_EXPORT DataArrayInt *performCpy(bool deepCpy) const;
-    MEDCOUPLING_EXPORT void alloc(int nbOfTuple, int nbOfCompo);
-    MEDCOUPLING_EXPORT bool isEqual(const DataArrayInt& other) const;
-    //!alloc or useArray should have been called before.
-    MEDCOUPLING_EXPORT void reAlloc(int nbOfTuples);
-    MEDCOUPLING_EXPORT void getTuple(int tupleId, int *res) const { std::copy(_mem.getConstPointerLoc(tupleId*_info_on_compo.size()),_mem.getConstPointerLoc((tupleId+1)*_info_on_compo.size()),res); }
-    MEDCOUPLING_EXPORT int getIJ(int tupleId, int compoId) const { return _mem[tupleId*_info_on_compo.size()+compoId]; }
-    MEDCOUPLING_EXPORT void setIJ(int tupleId, int compoId, int newVal) { _mem[tupleId*_info_on_compo.size()+compoId]=newVal; }
-    MEDCOUPLING_EXPORT int *getPointer() const { return _mem.getPointer(); }
-    MEDCOUPLING_EXPORT static void setArrayIn(DataArrayInt *newArray, DataArrayInt* &arrayToSet);
-    MEDCOUPLING_EXPORT const int *getConstPointer() const { return _mem.getConstPointer(); }
-    MEDCOUPLING_EXPORT static DataArrayInt *aggregate(const DataArrayInt *a1, const DataArrayInt *a2, int offsetA2);
-    MEDCOUPLING_EXPORT void useArray(const int *array, bool ownership, DeallocType type, int nbOfTuple, int nbOfCompo);
-    MEDCOUPLING_EXPORT void writeOnPlace(int id, int element0, const int *others, int sizeOfOthers) { _mem.writeOnPlace(id,element0,others,sizeOfOthers); }
-    //! nothing to do here because this class does not aggregate any TimeLabel instance.
-    MEDCOUPLING_EXPORT void updateTime() { }
-  public:
-    MEDCOUPLING_EXPORT static int *checkAndPreparePermutation(const int *start, const int *end);
-  private:
-    DataArrayInt() { }
-  private:
-    MemArray<int> _mem;
-  };
-}
-
-#endif
diff --git a/src/MEDCoupling/MEDCouplingMesh.cxx b/src/MEDCoupling/MEDCouplingMesh.cxx
deleted file mode 100644
index a552ea588..000000000
--- a/src/MEDCoupling/MEDCouplingMesh.cxx
+++ /dev/null
@@ -1,149 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "MEDCouplingMesh.hxx"
-#include "MEDCouplingMemArray.hxx"
-#include "MEDCouplingFieldDouble.hxx"
-#include "MEDCouplingFieldDiscretization.hxx"
-
-#include "InterpKernelExprParser.hxx"
-
-#include <sstream>
-#include <iterator>
-
-using namespace ParaMEDMEM;
-
-bool MEDCouplingMesh::areCompatible(const MEDCouplingMesh *other) const
-{
-  if(getMeshDimension()!=other->getMeshDimension())
-    return false;
-  if(getSpaceDimension()!=other->getSpaceDimension())
-    return false;
-  return true;
-}
-
-/*!
- * This method builds a field lying on 'this' with 'nbOfComp' components.
- * 'func' is a pointer that points to a function that takes 2 arrays in parameter and returns a boolean.
- * The first array is a in-param of size this->getSpaceDimension and the second an out param of size 'nbOfComp'.
- * The return field will have type specified by 't'. 't' is also used to determine where values of field will be
- * evaluate.
- * @param t type of field returned and specifies where the evaluation of func will be done.
- * @param nbOfComp number of components of returned field.
- * @param func pointer to a function that should return false if the evaluation failed. (division by 0. for example)
- * @return field with counter = 1.
- */
-MEDCouplingFieldDouble *MEDCouplingMesh::fillFromAnalytic(TypeOfField t, int nbOfComp, FunctionToEvaluate func) const
-{
-  MEDCouplingFieldDouble *ret=MEDCouplingFieldDouble::New(t);
-  ret->setMesh(this);
-  DataArrayDouble *loc=ret->getDiscretization()->getLocalizationOfDiscValues(this);
-  DataArrayDouble *array=DataArrayDouble::New();
-  int nbOfTuple=loc->getNumberOfTuples();
-  int nbCompIn=loc->getNumberOfComponents();
-  const double *locPtr=loc->getConstPointer();
-  array->alloc(nbOfTuple,nbOfComp);
-  double *ptToFill=array->getPointer();
-  for(int i=0;i<nbOfTuple;i++)
-    {
-      if(!func(locPtr+nbCompIn*i,ptToFill))
-        {
-          std::ostringstream oss; oss << "For tuple # " << i << " localized on (";
-          std::copy(locPtr+nbCompIn*i,locPtr+nbCompIn*(i+1),std::ostream_iterator<double>(oss,", "));
-          oss << ") : Evaluation of function failed !";
-          loc->decrRef();
-          array->decrRef();
-          ret->decrRef();
-          throw INTERP_KERNEL::Exception(oss.str().c_str());
-        }
-      ptToFill+=nbOfComp;
-    }
-  loc->decrRef();
-  ret->setArray(array);
-  array->decrRef();
-  return ret;
-}
-
-/*!
- * This method builds a field lying on 'this' with 'nbOfComp' components.
- * 'func' is a string that is the expression to evaluate.
- * The return field will have type specified by 't'. 't' is also used to determine where values of field will be
- * evaluate.
- * @param t type of field returned and specifies where the evaluation of func will be done.
- * @param nbOfComp number of components of returned field.
- * @param func expression.
- * @return field with counter = 1.
- */
-MEDCouplingFieldDouble *MEDCouplingMesh::fillFromAnalytic(TypeOfField t, int nbOfComp, const char *func) const
-{
-  INTERP_KERNEL::ExprParser expr(func);
-  expr.parse();
-  std::set<std::string> vars;
-  expr.getTrueSetOfVars(vars);
-  if((int)vars.size()>getSpaceDimension())
-    {
-      std::ostringstream oss; oss << "The mesh has a spaceDim==" << getSpaceDimension() << " and there are ";
-      oss << vars.size() << " variables : ";
-      std::copy(vars.begin(),vars.end(),std::ostream_iterator<std::string>(oss," "));
-      throw INTERP_KERNEL::Exception(oss.str().c_str());
-    }
-  std::vector<std::string> varsV(vars.begin(),vars.end());
-  expr.prepareExprEvaluation(varsV);
-  //
-  MEDCouplingFieldDouble *ret=MEDCouplingFieldDouble::New(t);
-  ret->setMesh(this);
-  DataArrayDouble *loc=ret->getDiscretization()->getLocalizationOfDiscValues(this);
-  DataArrayDouble *array=DataArrayDouble::New();
-  int nbOfTuple=loc->getNumberOfTuples();
-  int nbCompIn=loc->getNumberOfComponents();
-  const double *locPtr=loc->getConstPointer();
-  array->alloc(nbOfTuple,nbOfComp);
-  double *ptToFill=array->getPointer();
-  for(int i=0;i<nbOfTuple;i++)
-    {
-      try
-        {
-          expr.evaluateExpr(nbOfComp,ptToFill,locPtr+nbCompIn*i);
-        }
-      catch(INTERP_KERNEL::Exception& e)
-        {
-          std::ostringstream oss; oss << "For tuple # " << i << " localized on (";
-          std::copy(locPtr+nbCompIn*i,locPtr+nbCompIn*(i+1),std::ostream_iterator<double>(oss,", "));
-          oss << ") : Evaluation of function failed ! " << e.what();
-          loc->decrRef();
-          array->decrRef();
-          ret->decrRef();
-          throw INTERP_KERNEL::Exception(oss.str().c_str());
-        }
-      ptToFill+=nbOfComp;
-    }
-  loc->decrRef();
-  ret->setArray(array);
-  array->decrRef();
-  return ret;
-}
-
-/*!
- * retruns a newly created mesh with counter=1 
- * that is the union of mesh1 and mesh2 if possible. The cells of mesh2 will appear after cells of 'mesh1'. Idem for nodes.
- */
-MEDCouplingMesh *MEDCouplingMesh::mergeMeshes(const MEDCouplingMesh *mesh1, const MEDCouplingMesh *mesh2)
-{
-  return mesh1->mergeMyselfWith(mesh2);
-}
diff --git a/src/MEDCoupling/MEDCouplingNatureOfField.hxx b/src/MEDCoupling/MEDCouplingNatureOfField.hxx
deleted file mode 100644
index bdc1c78dd..000000000
--- a/src/MEDCoupling/MEDCouplingNatureOfField.hxx
+++ /dev/null
@@ -1,35 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __MEDCOUPLINGNATUREOFFIELD_HXX__
-#define __MEDCOUPLINGNATUREOFFIELD_HXX__
-
-namespace ParaMEDMEM
-{
-  typedef enum
-    {
-      NoNature               = 17,
-      ConservativeVolumic    = 26,
-      Integral               = 32,
-      IntegralGlobConstraint = 35,
-      RevIntegral            = 37
-    } NatureOfField;
-}
-
-#endif
diff --git a/src/MEDCoupling/MEDCouplingNormalizedCartesianMesh.hxx b/src/MEDCoupling/MEDCouplingNormalizedCartesianMesh.hxx
deleted file mode 100644
index ebb12e01a..000000000
--- a/src/MEDCoupling/MEDCouplingNormalizedCartesianMesh.hxx
+++ /dev/null
@@ -1,52 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __MEDCouplingNormalizedCartesianMesh_HXX__
-#define __MEDCouplingNormalizedCartesianMesh_HXX__
-
-#include "NormalizedUnstructuredMesh.hxx"
-
-namespace ParaMEDMEM
-{
-  class MEDCouplingCMesh;
-}
-
-template<int SPACEDIM>
-class MEDCouplingNormalizedCartesianMesh : public INTERP_KERNEL::GenericMesh
-{
-public:
-  static const int MY_SPACEDIM=SPACEDIM;
-  static const int MY_MESHDIM=SPACEDIM;
-  typedef int MyConnType;
-  static const INTERP_KERNEL::NumberingPolicy My_numPol=INTERP_KERNEL::ALL_C_MODE;
-public:
-  MEDCouplingNormalizedCartesianMesh(ParaMEDMEM::MEDCouplingCMesh *mesh);
-  //void getBoundingBox(double *boundingBox) const;
-  //INTERP_KERNEL::NormalizedCellType getTypeOfElement(int eltId) const;
-  //unsigned char getNumberOfNodesOfElement(int eltId) const;
-  //unsigned long getNumberOfNodes() const;
-  unsigned long getNumberOfElements() const;
-  unsigned long nbCellsAlongAxis(int axis) const;
-  const double * getCoordsAlongAxis(int axis) const;
-  ~MEDCouplingNormalizedCartesianMesh();
-private:
-  ParaMEDMEM::MEDCouplingCMesh *_mesh;
-};
-
-#endif
diff --git a/src/MEDCoupling/MEDCouplingNormalizedCartesianMesh.txx b/src/MEDCoupling/MEDCouplingNormalizedCartesianMesh.txx
deleted file mode 100644
index 468eea71a..000000000
--- a/src/MEDCoupling/MEDCouplingNormalizedCartesianMesh.txx
+++ /dev/null
@@ -1,57 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-// File      : MEDCouplingNormalizedCartesianMesh.txx
-// Created   : Mon Aug 17 12:00:38 2009
-// Author    : Edward AGAPOV (eap)
-//
-
-#include "MEDCouplingNormalizedCartesianMesh.hxx"
-#include "MEDCouplingCMesh.hxx"
-
-template<int SPACEDIM>
-MEDCouplingNormalizedCartesianMesh<SPACEDIM>::MEDCouplingNormalizedCartesianMesh(ParaMEDMEM::MEDCouplingCMesh *mesh):_mesh(mesh)
-{
-  if(_mesh)
-    _mesh->incrRef();
-}
-
-template<int SPACEDIM>
-MEDCouplingNormalizedCartesianMesh<SPACEDIM>::~MEDCouplingNormalizedCartesianMesh()
-{
-  if(_mesh)
-    _mesh->decrRef();
-}
-
-template<int SPACEDIM>
-unsigned long MEDCouplingNormalizedCartesianMesh<SPACEDIM>::getNumberOfElements() const
-{
-  return _mesh->getNumberOfCells();
-}
-
-template<int SPACEDIM>
-unsigned long MEDCouplingNormalizedCartesianMesh<SPACEDIM>::nbCellsAlongAxis(int axis) const
-{
-  return _mesh->getCoordsAt(axis)->getNumberOfTuples() - 1;
-}
-
-template<int SPACEDIM>
-const double * MEDCouplingNormalizedCartesianMesh<SPACEDIM>::getCoordsAlongAxis(int axis) const
-{
-  return _mesh->getCoordsAt(axis)->getConstPointer();
-}
diff --git a/src/MEDCoupling/MEDCouplingPointSet.cxx b/src/MEDCoupling/MEDCouplingPointSet.cxx
deleted file mode 100644
index 0c0ce1887..000000000
--- a/src/MEDCoupling/MEDCouplingPointSet.cxx
+++ /dev/null
@@ -1,715 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "MEDCouplingPointSet.hxx"
-#include "MEDCouplingUMesh.hxx"
-#include "MEDCouplingUMeshDesc.hxx"
-#include "MEDCouplingMemArray.hxx"
-#include "MEDCouplingPointSet.txx"
-#include "PlanarIntersector.txx"
-#include "InterpKernelGeo2DQuadraticPolygon.hxx"
-#include "InterpKernelGeo2DNode.hxx"
-#include "DirectedBoundingBox.hxx"
-
-#include <cmath>
-#include <limits>
-#include <numeric>
-
-using namespace ParaMEDMEM;
-
-MEDCouplingPointSet::MEDCouplingPointSet():_coords(0)
-{
-}
-
-MEDCouplingPointSet::MEDCouplingPointSet(const MEDCouplingPointSet& other, bool deepCpy):MEDCouplingMesh(other),_coords(0)
-{
-  if(other._coords)
-    _coords=other._coords->performCpy(deepCpy);
-}
-
-MEDCouplingPointSet::~MEDCouplingPointSet()
-{
-  if(_coords)
-    _coords->decrRef();
-}
-
-int MEDCouplingPointSet::getNumberOfNodes() const
-{
-  if(_coords)
-    return _coords->getNumberOfTuples();
-  else
-    throw INTERP_KERNEL::Exception("Unable to get number of nodes because no coordinates specified !");
-}
-
-int MEDCouplingPointSet::getSpaceDimension() const
-{
-  if(_coords)
-    return _coords->getNumberOfComponents();
-  else
-    throw INTERP_KERNEL::Exception("Unable to get space dimension because no coordinates specified !");
-}
-
-void MEDCouplingPointSet::updateTime()
-{
-  if(_coords)
-    {
-      updateTimeWith(*_coords);
-    }
-}
-
-bool MEDCouplingPointSet::isStructured() const
-{
-  return false;
-}
-
-void MEDCouplingPointSet::setCoords(DataArrayDouble *coords)
-{
-  if( coords != _coords )
-    {
-      if (_coords)
-        _coords->decrRef();
-      _coords=coords;
-      if(_coords)
-        _coords->incrRef();
-      declareAsNew();
-    }
-}
-
-DataArrayDouble *MEDCouplingPointSet::getCoordinatesAndOwner() const
-{
-  if(_coords)
-    _coords->incrRef();
-  return _coords;
-}
-
-bool MEDCouplingPointSet::isEqual(const MEDCouplingMesh *other, double prec) const
-{
-  const MEDCouplingPointSet *otherC=dynamic_cast<const MEDCouplingPointSet *>(other);
-  if(!otherC)
-    return false;
-  if(!MEDCouplingMesh::isEqual(other,prec))
-    return false;
-  if(!areCoordsEqual(*otherC,prec))
-    return false;
-  return true;
-}
-
-bool MEDCouplingPointSet::areCoordsEqual(const MEDCouplingPointSet& other, double prec) const
-{
-  if(_coords==0 && other._coords==0)
-    return true;
-  if(_coords==0 || other._coords==0)
-    return false;
-  if(_coords==other._coords)
-    return true;
-  return _coords->isEqual(*other._coords,prec);
-}
-
-/*!
- * This methods searches for each node n1 nodes in _coords that are less far than 'prec' from n1. if any these nodes are stored in params
- * comm and commIndex.
- * @param comm out parameter (not inout)
- * @param commIndex out parameter (not inout)
- */
-void MEDCouplingPointSet::findCommonNodes(DataArrayInt *&comm, DataArrayInt *&commIndex, double prec) const
-{
-  comm=DataArrayInt::New();
-  commIndex=DataArrayInt::New();
-  //
-  int nbNodesOld=getNumberOfNodes();
-  int spaceDim=getSpaceDimension();
-  std::vector<double> bbox(2*nbNodesOld*spaceDim);
-  const double *coordsPtr=_coords->getConstPointer();
-  for(int i=0;i<nbNodesOld;i++)
-    {
-      for(int j=0;j<spaceDim;j++)
-        {
-          bbox[2*spaceDim*i+2*j]=coordsPtr[spaceDim*i+j];
-          bbox[2*spaceDim*i+2*j+1]=coordsPtr[spaceDim*i+j];
-        }
-    }
-  //
-  std::vector<int> c,cI(1);
-  switch(spaceDim)
-    {
-    case 3:
-      findCommonNodesAlg<3>(bbox,nbNodesOld,prec,c,cI);
-      break;
-    case 2:
-      findCommonNodesAlg<2>(bbox,nbNodesOld,prec,c,cI);
-      break;
-    case 1:
-      findCommonNodesAlg<1>(bbox,nbNodesOld,prec,c,cI);
-      break;
-    default:
-      throw INTERP_KERNEL::Exception("Unexpected spacedim of coords. Must be 1,2 or 3.");
-    }
-  commIndex->alloc(cI.size(),1);
-  std::copy(cI.begin(),cI.end(),commIndex->getPointer());
-  comm->alloc(cI.back(),1);
-  std::copy(c.begin(),c.end(),comm->getPointer());
-}
-
-/*!
- * @param comm in param in the same format than one returned by findCommonNodes method.
- * @param commI in param in the same format than one returned by findCommonNodes method.
- * @return the old to new correspondance array.
- */
-DataArrayInt *MEDCouplingPointSet::buildNewNumberingFromCommNodesFrmt(const DataArrayInt *comm, const DataArrayInt *commIndex,
-                                                                      int& newNbOfNodes) const
-{
-  DataArrayInt *ret=DataArrayInt::New();
-  int nbNodesOld=getNumberOfNodes();
-  ret->alloc(nbNodesOld,1);
-  std::fill(ret->getPointer(),ret->getPointer()+nbNodesOld,-1);
-  int *retPtr=ret->getPointer();
-  std::vector<int> commRemain(comm->getConstPointer(),comm->getConstPointer()+comm->getNumberOfTuples());
-  std::vector<int> commIRemain(commIndex->getConstPointer(),commIndex->getConstPointer()+commIndex->getNumberOfTuples());
-  int newNb=0;
-  for(int iNode=0;iNode<nbNodesOld;iNode++)
-    {
-      if(retPtr[iNode]!=-1)
-        continue;
-      if(commRemain.empty())
-        {
-          retPtr[iNode]=newNb++;
-          continue;
-        }
-      if(commRemain[0]!=iNode)
-        retPtr[iNode]=newNb;
-      else
-        {
-          for(std::vector<int>::const_iterator iNode2=commRemain.begin();
-              iNode2!=commRemain.begin()+commIRemain[1];iNode2++)
-            retPtr[*iNode2]=newNb;
-          int delta=commIRemain[1];
-          commRemain.erase(commRemain.begin(),commRemain.begin()+commIRemain[1]);
-          commIRemain.erase(commIRemain.begin());
-          std::transform(commIRemain.begin(),commIRemain.end(),commIRemain.begin(),std::bind2nd(std::minus<int>(),delta));
-        }
-      newNb++;
-    }
-  newNbOfNodes=newNb;
-  return ret;
-}
-
-/*
- * This method renumber 'this' using 'newNodeNumbers' array of size this->getNumberOfNodes.
- * newNbOfNodes specifies the *std::max_element(newNodeNumbers,newNodeNumbers+this->getNumberOfNodes())
- * This value is asked because often known by the caller of this method.
- * @param newNodeNumbers array specifying the new numbering.
- * @param newNbOfNodes the new number of nodes.
- */
-void MEDCouplingPointSet::renumberNodes(const int *newNodeNumbers, int newNbOfNodes)
-{
-  DataArrayDouble *newCoords=DataArrayDouble::New();
-  int spaceDim=getSpaceDimension();
-  newCoords->alloc(newNbOfNodes,spaceDim);
-  newCoords->copyStringInfoFrom(*_coords);
-  int oldNbOfNodes=getNumberOfNodes();
-  double *ptToFill=newCoords->getPointer();
-  const double *oldCoordsPtr=_coords->getConstPointer();
-  for(int i=0;i<oldNbOfNodes;i++)
-    std::copy(oldCoordsPtr+i*spaceDim,oldCoordsPtr+(i+1)*spaceDim,ptToFill+newNodeNumbers[i]*spaceDim);
-  setCoords(newCoords);
-  newCoords->decrRef();
-}
-
-/*!
- * This method fills bbox params like that : bbox[0]=XMin, bbox[1]=XMax, bbox[2]=YMin...
- * The returned bounding box is arranged along trihedron.
- * @param bbox out array of size 2*this->getSpaceDimension().
- */
-void MEDCouplingPointSet::getBoundingBox(double *bbox) const
-{
-  int dim=getSpaceDimension();
-  for (int idim=0; idim<dim; idim++)
-    {
-      bbox[idim*2]=std::numeric_limits<double>::max();
-      bbox[idim*2+1]=-std::numeric_limits<double>::max();
-    } 
-  const double *coords=_coords->getConstPointer();
-  int nbnodes=getNumberOfNodes();
-  for (int i=0; i<nbnodes; i++)
-    {
-      for (int idim=0; idim<dim;idim++)
-        {
-          if ( bbox[idim*2] > coords[i*dim+idim] )
-            {
-              bbox[idim*2] = coords[i*dim+idim] ;
-            }
-          if ( bbox[idim*2+1] < coords[i*dim+idim] )
-            {
-              bbox[idim*2+1] = coords[i*dim+idim] ;
-            }
-        }
-    }
-}
-
-/*!
- * This method removes useless nodes in coords.
- */
-void MEDCouplingPointSet::zipCoords()
-{
-  checkFullyDefined();
-  DataArrayInt *traducer=zipCoordsTraducer();
-  traducer->decrRef();
-}
-
-/*!
- * Non const method that operates a rotation of 'this'.
- * If spaceDim==2 'vector' parameter is ignored (and could be 0) and the rotation is done around 'center' with angle specified by 'angle'.
- * If spaceDim==3 the rotation axe is defined by ('center','vector') and the angle is 'angle'.
- * @param center an array of size getSpaceDimension().
- * @param vector in array of size getSpaceDimension().
- * @param angle angle of rotation in radian.
- */
-void MEDCouplingPointSet::rotate(const double *center, const double *vector, double angle)
-{
-  int spaceDim=getSpaceDimension();
-  if(spaceDim==3)
-    rotate3D(center,vector,angle);
-  else if(spaceDim==2)
-    rotate2D(center,angle);
-  else
-    throw INTERP_KERNEL::Exception("MEDCouplingPointSet::rotate : invalid space dim for rotation must be 2 or 3");
-  _coords->declareAsNew();
-  updateTime();
-}
-
-/*!
- * Non const method that operates a translation of 'this'.
- * @param vector in array of size getSpaceDimension().
- */
-void MEDCouplingPointSet::translate(const double *vector)
-{
-  double *coords=_coords->getPointer();
-  int nbNodes=getNumberOfNodes();
-  int dim=getSpaceDimension();
-  for(int i=0; i<nbNodes; i++)
-    for(int idim=0; idim<dim;idim++)
-      coords[i*dim+idim]+=vector[idim];
-  _coords->declareAsNew();
-  updateTime();
-}
-
-/*!
- * Non const method that operates a scale on 'this' with 'point' as reference point of scale and with factor 'factor'.
- * @param point in array of size getSpaceDimension().
- * @param factor factor of the scaling
- */
-void MEDCouplingPointSet::scale(const double *point, double factor)
-{
-  double *coords=_coords->getPointer();
-  int nbNodes=getNumberOfNodes();
-  int dim=getSpaceDimension();
-  double *tmp=new double[dim];
-  for(int i=0;i<nbNodes;i++)
-    {
-      std::transform(coords+i*dim,coords+(i+1)*dim,point,coords+i*dim,std::minus<double>());
-      std::transform(coords+i*dim,coords+(i+1)*dim,coords+i*dim,std::bind2nd(std::multiplies<double>(),factor));
-      std::transform(coords+i*dim,coords+(i+1)*dim,point,coords+i*dim,std::plus<double>());
-    }
-  delete [] tmp;
-  _coords->declareAsNew();
-  updateTime();
-}
-
-/*!
- * This method is only available for already defined coordinates.
- * If not an INTERP_KERNEL::Exception is thrown. The 'newSpaceDim' input must be greater or equal to 1.
- * This method simply convert this to newSpaceDim space :
- * - by putting a 0. for each \f$ i^{th} \f$ components of each coord of nodes so that i>=getSpaceDim(), if 'newSpaceDim'>getSpaceDimsion()
- * - by ignoring each \f$ i^{th} \f$ components of each coord of nodes so that i >= 'newSpaceDim', 'newSpaceDim'<getSpaceDimension()
- * If newSpaceDim==getSpaceDim() nothing is done by this method.
- */
-void MEDCouplingPointSet::changeSpaceDimension(int newSpaceDim) throw(INTERP_KERNEL::Exception)
-{
-  if(getCoords()==0)
-    throw INTERP_KERNEL::Exception("changeSpaceDimension must be called on an MEDCouplingPointSet instance with coordinates set !");
-  if(newSpaceDim<1)
-    throw INTERP_KERNEL::Exception("changeSpaceDimension must be called a newSpaceDim >=1 !");
-  int oldSpaceDim=getSpaceDimension();
-  if(newSpaceDim==oldSpaceDim)
-    return ;
-  DataArrayDouble *newCoords=DataArrayDouble::New();
-  newCoords->alloc(getCoords()->getNumberOfTuples(),newSpaceDim);
-  const double *oldc=getCoords()->getConstPointer();
-  double *nc=newCoords->getPointer();
-  int nbOfNodes=getNumberOfNodes();
-  int dim=std::min(oldSpaceDim,newSpaceDim);
-  for(int i=0;i<nbOfNodes;i++)
-    {
-      int j=0;
-      for(;j<dim;j++)
-        nc[newSpaceDim*i+j]=oldc[i*oldSpaceDim+j];
-      for(;j<newSpaceDim;j++)
-        nc[newSpaceDim*i+j]=0.;
-    }
-  newCoords->setName(getCoords()->getName().c_str());
-  for(int i=0;i<dim;i++)
-    newCoords->setInfoOnComponent(i,getCoords()->getInfoOnComponent(i).c_str());
-  setCoords(newCoords);
-  newCoords->decrRef();
-}
-
-/*!
- * This method try to substitute this->_coords with other._coords if arrays match.
- * This method potentially modifies 'this' if it succeeds, otherway an exception is thrown.
- */
-void MEDCouplingPointSet::tryToShareSameCoords(const MEDCouplingPointSet& other, double epsilon) throw(INTERP_KERNEL::Exception)
-{
-  if(_coords==other._coords)
-    return ;
-  if(!_coords)
-    throw INTERP_KERNEL::Exception("Current instance has no coords whereas other has !");
-  if(!other._coords)
-    throw INTERP_KERNEL::Exception("Other instance has no coords whereas current has !");
-  if(!_coords->isEqual(*other._coords,epsilon))
-    throw INTERP_KERNEL::Exception("Coords are not the same !");
-  setCoords(other._coords);
-}
-
-/*!
- * This method is expecting to be called for meshes so that getSpaceDimension() returns 3.
- * This method returns in 'nodes' output all the nodes that are at a distance lower than epsilon from plane
- * defined by the point 'pt' and the vector 'vec'.
- * @param pt points to an array of size 3 and represents a point that owns to plane.
- * @param vec points to an array of size 3 and represents the normal vector of the plane. The norm of the vector is not compulsory equal to 1. But norm must be greater than 10*abs(eps)
- * @param eps is the maximal distance around the plane where node in this->_coords will be picked.
- * @param nodes is the output of the method. The vector is not compulsory empty before call. The nodes that fulfills the condition will be added at the end of the nodes.
- */
-void MEDCouplingPointSet::findNodesOnPlane(const double *pt, const double *vec, double eps, std::vector<int>& nodes) const throw(INTERP_KERNEL::Exception)
-{
-  if(getSpaceDimension()!=3)
-    throw INTERP_KERNEL::Exception("Invalid spacedim to be applied on this ! Must be equal to 3 !");
-  int nbOfNodes=getNumberOfNodes();
-  double a=vec[0],b=vec[1],c=vec[2],d=-pt[0]*vec[0]-pt[1]*vec[1]-pt[2]*vec[2];
-  double deno=sqrt(a*a+b*b+c*c);
-  const double *work=_coords->getConstPointer();
-  for(int i=0;i<nbOfNodes;i++)
-    {
-      if(std::abs(a*work[0]+b*work[1]+c*work[2]+d)/deno<eps)
-        nodes.push_back(i);
-      work+=3;
-    }
-}
-
-/*!
- * merge _coords arrays of m1 and m2 and returns the union. The returned instance is newly created with ref count == 1.
- */
-DataArrayDouble *MEDCouplingPointSet::mergeNodesArray(const MEDCouplingPointSet *m1, const MEDCouplingPointSet *m2)
-{
-  int spaceDim=m1->getSpaceDimension();
-  if(spaceDim!=m2->getSpaceDimension())
-    throw INTERP_KERNEL::Exception("Mismatch in SpaceDim during call of mergeNodesArray !");
-  return DataArrayDouble::aggregate(m1->getCoords(),m2->getCoords());
-}
-
-/*!
- * Factory to build new instance of instanciable subclasses of MEDCouplingPointSet.
- * This method is used during unserialization process.
- */
-MEDCouplingPointSet *MEDCouplingPointSet::buildInstanceFromMeshType(MEDCouplingMeshType type)
-{
-  switch(type)
-    {
-    case UNSTRUCTURED:
-      return MEDCouplingUMesh::New();
-    case UNSTRUCTURED_DESC:
-      return MEDCouplingUMeshDesc::New();
-    default:
-      throw INTERP_KERNEL::Exception("Invalid type of mesh specified");
-    }
-}
-
-/*!
- * First step of serialization process. Used by ParaMEDMEM and MEDCouplingCorba to transfert data between process.
- */
-void MEDCouplingPointSet::getTinySerializationInformation(std::vector<int>& tinyInfo, std::vector<std::string>& littleStrings) const
-{
-  if(_coords)
-    {
-      int spaceDim=getSpaceDimension();
-      littleStrings.resize(spaceDim+1);
-      littleStrings[0]=getName();
-      for(int i=0;i<spaceDim;i++)
-        littleStrings[i+1]=getCoords()->getInfoOnComponent(i);
-      tinyInfo.clear();
-      tinyInfo.push_back(getType());
-      tinyInfo.push_back(spaceDim);
-      tinyInfo.push_back(getNumberOfNodes());
-    }
-  else
-    {
-      littleStrings.resize(1);
-      littleStrings[0]=getName();
-      tinyInfo.clear();
-      tinyInfo.push_back(getType());
-      tinyInfo.push_back(-1);
-      tinyInfo.push_back(-1);
-    }
-}
-
-/*!
- * Third and final step of serialization process.
- */
-void MEDCouplingPointSet::serialize(DataArrayInt *&a1, DataArrayDouble *&a2) const
-{
-  if(_coords)
-    {
-      a2=getCoords();
-      a2->incrRef();
-    }
-  else
-    a2=0;
-}
-
-/*!
- * Second step of serialization process.
- * @param tinyInfo must be equal to the result given by getTinySerializationInformation method.
- */
-void MEDCouplingPointSet::resizeForUnserialization(const std::vector<int>& tinyInfo, DataArrayInt *a1, DataArrayDouble *a2, std::vector<std::string>& littleStrings)
-{
-  if(tinyInfo[2]>=0 && tinyInfo[1]>=1)
-    {
-      a2->alloc(tinyInfo[2],tinyInfo[1]);
-      littleStrings.resize(tinyInfo[1]+1);
-    }
-  else
-    {
-      littleStrings.resize(1);
-    }
-}
-
-/*!
- * Second and final unserialization process.
- * @param tinyInfo must be equal to the result given by getTinySerializationInformation method.
- */
-void MEDCouplingPointSet::unserialization(const std::vector<int>& tinyInfo, DataArrayInt *a1, DataArrayDouble *a2, const std::vector<std::string>& littleStrings)
-{
-  if(tinyInfo[2]>=0 && tinyInfo[1]>=1)
-    {
-      setCoords(a2);
-      setName(littleStrings[0].c_str());
-      for(int i=0;i<tinyInfo[1];i++)
-        getCoords()->setInfoOnComponent(i,littleStrings[i+1].c_str());
-    }
-  else
-    setName(littleStrings[0].c_str());
-}
-
-/*!
- * Intersect Bounding Box given 2 Bounding Boxes.
- */
-bool MEDCouplingPointSet::intersectsBoundingBox(const double* bb1, const double* bb2, int dim, double eps)
-{
-  double* bbtemp = new double[2*dim];
-  double deltamax=0.0;
-
-  for (int i=0; i< dim; i++)
-    {
-      double delta = bb1[2*i+1]-bb1[2*i];
-      if ( delta > deltamax )
-        {
-          deltamax = delta ;
-        }
-    }
-  for (int i=0; i<dim; i++)
-    {
-      bbtemp[i*2]=bb1[i*2]-deltamax*eps;
-      bbtemp[i*2+1]=bb1[i*2+1]+deltamax*eps;
-    }
-  
-  for (int idim=0; idim < dim; idim++)
-    {
-      bool intersects = (bbtemp[idim*2]<bb2[idim*2+1])
-        && (bb2[idim*2]<bbtemp[idim*2+1]) ;
-      if (!intersects)
-        {
-          delete [] bbtemp;
-          return false; 
-        }
-    }
-  delete [] bbtemp;
-  return true;
-}
-
-/*!
- * Intersect 2 given Bounding Boxes.
- */
-bool MEDCouplingPointSet::intersectsBoundingBox(const INTERP_KERNEL::DirectedBoundingBox& bb1, const double* bb2, int dim, double eps)
-{
-  double* bbtemp = new double[2*dim];
-  double deltamax=0.0;
-
-  for (int i=0; i< dim; i++)
-    {
-      double delta = bb2[2*i+1]-bb2[2*i];
-      if ( delta > deltamax )
-        {
-          deltamax = delta ;
-        }
-    }
-  for (int i=0; i<dim; i++)
-    {
-      bbtemp[i*2]=bb2[i*2]-deltamax*eps;
-      bbtemp[i*2+1]=bb2[i*2+1]+deltamax*eps;
-    }
-  
-  bool intersects = !bb1.isDisjointWith( bbtemp );
-  delete [] bbtemp;
-  return intersects;
-}
-
-/*!
- * 'This' is expected to be of spaceDim==3. Idem for 'center' and 'vect'
- */
-void MEDCouplingPointSet::rotate3D(const double *center, const double *vect, double angle)
-{
-  double *coords=_coords->getPointer();
-  int nbNodes=getNumberOfNodes();
-  rotate3DAlg(center,vect,angle,nbNodes,coords);
-}
-
-/*!
- * Low static method that operates 3D rotation of 'nbNodes' 3D nodes whose coordinates are arranged in 'coords'
- * around an axe ('center','vect') and with angle 'angle'.
- */
-void MEDCouplingPointSet::rotate3DAlg(const double *center, const double *vect, double angle, int nbNodes, double *coords)
-{
-  double sina=sin(angle);
-  double cosa=cos(angle);
-  double vectorNorm[3];
-  double matrix[9];
-  double matrixTmp[9];
-  double norm=sqrt(vect[0]*vect[0]+vect[1]*vect[1]+vect[2]*vect[2]);
-  std::transform(vect,vect+3,vectorNorm,std::bind2nd(std::multiplies<double>(),1/norm));
-  //rotation matrix computation
-  matrix[0]=cosa; matrix[1]=0.; matrix[2]=0.; matrix[3]=0.; matrix[4]=cosa; matrix[5]=0.; matrix[6]=0.; matrix[7]=0.; matrix[8]=cosa;
-  matrixTmp[0]=vectorNorm[0]*vectorNorm[0]; matrixTmp[1]=vectorNorm[0]*vectorNorm[1]; matrixTmp[2]=vectorNorm[0]*vectorNorm[2];
-  matrixTmp[3]=vectorNorm[1]*vectorNorm[0]; matrixTmp[4]=vectorNorm[1]*vectorNorm[1]; matrixTmp[5]=vectorNorm[1]*vectorNorm[2];
-  matrixTmp[6]=vectorNorm[2]*vectorNorm[0]; matrixTmp[7]=vectorNorm[2]*vectorNorm[1]; matrixTmp[8]=vectorNorm[2]*vectorNorm[2];
-  std::transform(matrixTmp,matrixTmp+9,matrixTmp,std::bind2nd(std::multiplies<double>(),1-cosa));
-  std::transform(matrix,matrix+9,matrixTmp,matrix,std::plus<double>());
-  matrixTmp[0]=0.; matrixTmp[1]=-vectorNorm[2]; matrixTmp[2]=vectorNorm[1];
-  matrixTmp[3]=vectorNorm[2]; matrixTmp[4]=0.; matrixTmp[5]=-vectorNorm[0];
-  matrixTmp[6]=-vectorNorm[1]; matrixTmp[7]=vectorNorm[0]; matrixTmp[8]=0.;
-  std::transform(matrixTmp,matrixTmp+9,matrixTmp,std::bind2nd(std::multiplies<double>(),sina));
-  std::transform(matrix,matrix+9,matrixTmp,matrix,std::plus<double>());
-  //rotation matrix computed.
-  double tmp[3];
-  for(int i=0; i<nbNodes; i++)
-    {
-      std::transform(coords+i*3,coords+(i+1)*3,center,tmp,std::minus<double>());
-      coords[i*3]=matrix[0]*tmp[0]+matrix[1]*tmp[1]+matrix[2]*tmp[2]+center[0];
-      coords[i*3+1]=matrix[3]*tmp[0]+matrix[4]*tmp[1]+matrix[5]*tmp[2]+center[1];
-      coords[i*3+2]=matrix[6]*tmp[0]+matrix[7]*tmp[1]+matrix[8]*tmp[2]+center[2];
-    }
-}
-
-/*!
- * 'This' is expected to be of spaceDim==2. Idem for 'center' and 'vect'
- */
-void MEDCouplingPointSet::rotate2D(const double *center, double angle)
-{
-  double *coords=_coords->getPointer();
-  int nbNodes=getNumberOfNodes();
-  rotate2DAlg(center,angle,nbNodes,coords);
-}
-
-/*!
- * Low static method that operates 3D rotation of 'nbNodes' 3D nodes whose coordinates are arranged in 'coords'
- * around the center point 'center' and with angle 'angle'.
- */
-void MEDCouplingPointSet::rotate2DAlg(const double *center, double angle, int nbNodes, double *coords)
-{
-  double cosa=cos(angle);
-  double sina=sin(angle);
-  double matrix[4];
-  matrix[0]=cosa; matrix[1]=-sina; matrix[2]=sina; matrix[3]=cosa;
-  double tmp[2];
-  for(int i=0; i<nbNodes; i++)
-    {
-      std::transform(coords+i*2,coords+(i+1)*2,center,tmp,std::minus<double>());
-      coords[i*2]=matrix[0]*tmp[0]+matrix[1]*tmp[1]+center[0];
-      coords[i*2+1]=matrix[2]*tmp[0]+matrix[3]*tmp[1]+center[1];
-    }
-}
-
-class DummyClsMCPS
-{
-public:
-  static const int MY_SPACEDIM=3;
-  static const int MY_MESHDIM=2;
-  typedef int MyConnType;
-  static const INTERP_KERNEL::NumberingPolicy My_numPol=INTERP_KERNEL::ALL_C_MODE;
-};
-
-/*!
- * res should be an empty vector before calling this method.
- * This method returns all the node coordinates included in _coords which ids are in [startConn;endConn) and put it into 'res' vector.
- * If spaceDim==3 a projection will be done for each nodes on the middle plane containing these all nodes in [startConn;endConn).
- * And after each projected nodes are moved to Oxy plane in order to consider these nodes as 2D nodes.
- */
-void MEDCouplingPointSet::project2DCellOnXY(const int *startConn, const int *endConn, std::vector<double>& res) const
-{
-  const double *coords=_coords->getConstPointer();
-  int spaceDim=getSpaceDimension();
-  for(const int *it=startConn;it!=endConn;it++)
-    res.insert(res.end(),coords+spaceDim*(*it),coords+spaceDim*(*it+1));
-  if(spaceDim==2)
-    return ;
-  if(spaceDim==3)
-    {
-      std::vector<double> cpy(res);
-      int nbNodes=endConn-startConn;
-      INTERP_KERNEL::PlanarIntersector<DummyClsMCPS,int>::projection(&res[0],&cpy[0],nbNodes,nbNodes,1.e-12,0.,0.,true);
-      res.resize(2*nbNodes);
-      for(int i=0;i<nbNodes;i++)
-        {
-          res[2*i]=cpy[3*i];
-          res[2*i+1]=cpy[3*i+1];
-        }
-      return ;
-    }
-  throw INTERP_KERNEL::Exception("Invalid spacedim for project2DCellOnXY !");
-}
-
-/*!
- * low level method that checks that the 2D cell is not a butterfly cell.
- */
-bool MEDCouplingPointSet::isButterfly2DCell(const std::vector<double>& res, bool isQuad)
-{
-  int nbOfNodes=res.size()/2;
-  std::vector<INTERP_KERNEL::Node *> nodes(nbOfNodes);
-  for(int i=0;i<nbOfNodes;i++)
-    {
-      INTERP_KERNEL::Node *tmp=new INTERP_KERNEL::Node(res[2*i],res[2*i+1]);
-      nodes[i]=tmp;
-    }
-  INTERP_KERNEL::QuadraticPolygon *pol=0;
-  if(isQuad)
-    pol=INTERP_KERNEL::QuadraticPolygon::buildArcCirclePolygon(nodes);
-  else
-    pol=INTERP_KERNEL::QuadraticPolygon::buildLinearPolygon(nodes);
-  bool ret=pol->isButterfly();
-  delete pol;
-  return ret;
-}
diff --git a/src/MEDCoupling/MEDCouplingPointSet.hxx b/src/MEDCoupling/MEDCouplingPointSet.hxx
deleted file mode 100644
index 601777efc..000000000
--- a/src/MEDCoupling/MEDCouplingPointSet.hxx
+++ /dev/null
@@ -1,102 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __PARAMEDMEM_MEDCOUPLINGPOINTSET_HXX__
-#define __PARAMEDMEM_MEDCOUPLINGPOINTSET_HXX__
-
-#include "MEDCoupling.hxx"
-#include "MEDCouplingMesh.hxx"
-
-#include <vector>
-
-namespace INTERP_KERNEL
-{
-  class DirectedBoundingBox;
-}
-
-namespace ParaMEDMEM
-{
-  class DataArrayInt;
-  class DataArrayDouble;
-
-  class MEDCOUPLING_EXPORT MEDCouplingPointSet : public MEDCouplingMesh
-  {
-  protected:
-    MEDCouplingPointSet();
-    MEDCouplingPointSet(const MEDCouplingPointSet& other, bool deepCpy);
-    ~MEDCouplingPointSet();
-  public:
-    void updateTime();
-    bool isStructured() const;
-    int getNumberOfNodes() const;
-    int getSpaceDimension() const;
-    void setCoords(DataArrayDouble *coords);
-    DataArrayDouble *getCoords() const { return _coords; }
-    DataArrayDouble *getCoordinatesAndOwner() const;
-    bool isEqual(const MEDCouplingMesh *other, double prec) const;
-    bool areCoordsEqual(const MEDCouplingPointSet& other, double prec) const;
-    virtual DataArrayInt *mergeNodes(double precision, bool& areNodesMerged) = 0;
-    void findCommonNodes(DataArrayInt *&comm, DataArrayInt *&commIndex, double prec) const;
-    DataArrayInt *buildNewNumberingFromCommNodesFrmt(const DataArrayInt *comm, const DataArrayInt *commIndex,
-                                                     int& newNbOfNodes) const;
-    void getBoundingBox(double *bbox) const;
-    void zipCoords();
-    void rotate(const double *center, const double *vector, double angle);
-    void translate(const double *vector);
-    void scale(const double *point, double factor);
-    void changeSpaceDimension(int newSpaceDim) throw(INTERP_KERNEL::Exception);
-    void tryToShareSameCoords(const MEDCouplingPointSet& other, double epsilon) throw(INTERP_KERNEL::Exception);
-    void findNodesOnPlane(const double *pt, const double *vec, double eps, std::vector<int>& nodes) const throw(INTERP_KERNEL::Exception);
-    static DataArrayDouble *mergeNodesArray(const MEDCouplingPointSet *m1, const MEDCouplingPointSet *m2);
-    static MEDCouplingPointSet *buildInstanceFromMeshType(MEDCouplingMeshType type);
-    static void rotate2DAlg(const double *center, double angle, int nbNodes, double *coords);
-    static void rotate3DAlg(const double *center, const double *vect, double angle, int nbNodes, double *coords);
-    virtual MEDCouplingPointSet *buildPartOfMySelf(const int *start, const int *end, bool keepCoords) const = 0;
-    virtual MEDCouplingPointSet *buildPartOfMySelfNode(const int *start, const int *end, bool fullyIn) const = 0;
-    virtual MEDCouplingPointSet *buildFacePartOfMySelfNode(const int *start, const int *end, bool fullyIn) const = 0;
-    virtual void findBoundaryNodes(std::vector<int>& nodes) const = 0;
-    virtual MEDCouplingPointSet *buildBoundaryMesh(bool keepCoords) const = 0;
-    virtual void renumberNodes(const int *newNodeNumbers, int newNbOfNodes);
-    //! size of returned tinyInfo must be always the same.
-    virtual void getTinySerializationInformation(std::vector<int>& tinyInfo, std::vector<std::string>& littleStrings) const;
-    virtual bool isEmptyMesh(const std::vector<int>& tinyInfo) const = 0;
-    virtual void resizeForUnserialization(const std::vector<int>& tinyInfo, DataArrayInt *a1, DataArrayDouble *a2, std::vector<std::string>& littleStrings);
-    virtual void serialize(DataArrayInt *&a1, DataArrayDouble *&a2) const;
-    virtual void unserialization(const std::vector<int>& tinyInfo, DataArrayInt *a1, DataArrayDouble *a2,
-                                 const std::vector<std::string>& littleStrings);
-    virtual void giveElemsInBoundingBox(const double *bbox, double eps, std::vector<int>& elems) = 0;
-    virtual void giveElemsInBoundingBox(const INTERP_KERNEL::DirectedBoundingBox& bbox, double eps, std::vector<int>& elems) = 0;
-    virtual DataArrayInt *zipCoordsTraducer() = 0;
-  protected:
-    virtual void checkFullyDefined() const throw(INTERP_KERNEL::Exception) = 0;
-    static bool intersectsBoundingBox(const double* bb1, const double* bb2, int dim, double eps);
-    static bool intersectsBoundingBox(const INTERP_KERNEL::DirectedBoundingBox& bb1, const double* bb2, int dim, double eps);
-    void rotate2D(const double *center, double angle);
-    void rotate3D(const double *center, const double *vect, double angle);
-    void project2DCellOnXY(const int *startConn, const int *endConn, std::vector<double>& res) const;
-    static bool isButterfly2DCell(const std::vector<double>& res, bool isQuad);
-    template<int SPACEDIM>
-    void findCommonNodesAlg(std::vector<double>& bbox,
-                            int nbNodes, double prec, std::vector<int>& c, std::vector<int>& cI) const;
-  protected:
-    DataArrayDouble *_coords;
-  };
-}
-
-#endif
diff --git a/src/MEDCoupling/MEDCouplingPointSet.txx b/src/MEDCoupling/MEDCouplingPointSet.txx
deleted file mode 100644
index 300aab235..000000000
--- a/src/MEDCoupling/MEDCouplingPointSet.txx
+++ /dev/null
@@ -1,68 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-#ifndef __PARAMEDMEM_MEDCOUPLINGPOINTSET_TXX__
-#define __PARAMEDMEM_MEDCOUPLINGPOINTSET_TXX__
-
-#include "MEDCouplingPointSet.txx"
-#include "InterpolationUtils.hxx"
-#include "BBTree.txx"
-
-#include <vector>
-
-namespace ParaMEDMEM
-{
-  template<int SPACEDIM>
-  void MEDCouplingPointSet::findCommonNodesAlg(std::vector<double>& bbox,
-                                               int nbNodes, double prec,
-                                               std::vector<int>& c, std::vector<int>& cI) const
-  {
-    const double *coordsPtr=_coords->getConstPointer();
-    BBTree<SPACEDIM,int> myTree(&bbox[0],0,0,nbNodes,-prec);
-    double bb[2*SPACEDIM];
-    double prec2=prec*prec;
-    for(int i=0;i<nbNodes;i++)
-      {
-        if(std::find(c.begin(),c.end(),i)!=c.end())
-          continue;
-        for(int j=0;j<SPACEDIM;j++)
-          {
-            bb[2*j]=coordsPtr[SPACEDIM*i+j];
-            bb[2*j+1]=coordsPtr[SPACEDIM*i+j];
-          }
-        std::vector<int> intersectingElems;
-        myTree.getIntersectingElems(bb,intersectingElems);
-        if(intersectingElems.size()>1)
-          {
-            std::vector<int> commonNodes;
-            for(std::vector<int>::const_iterator it=intersectingElems.begin();it!=intersectingElems.end();it++)
-              if(*it!=i)
-                if(INTERP_KERNEL::distance2<SPACEDIM>(coordsPtr+SPACEDIM*i,coordsPtr+SPACEDIM*(*it))<prec2)
-                  commonNodes.push_back(*it);
-            if(!commonNodes.empty())
-              {
-                cI.push_back(cI.back()+commonNodes.size()+1);
-                c.push_back(i);
-                c.insert(c.end(),commonNodes.begin(),commonNodes.end());
-              }
-          }
-      }
-  }
-}
-
-#endif
diff --git a/src/MEDCoupling/MEDCouplingRemapper.cxx b/src/MEDCoupling/MEDCouplingRemapper.cxx
deleted file mode 100644
index ca57b48a6..000000000
--- a/src/MEDCoupling/MEDCouplingRemapper.cxx
+++ /dev/null
@@ -1,567 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "MEDCouplingRemapper.hxx"
-#include "MEDCouplingMemArray.hxx"
-#include "MEDCouplingFieldDouble.hxx"
-#include "MEDCouplingFieldDiscretization.hxx"
-#include "MEDCouplingExtrudedMesh.hxx"
-#include "MEDCouplingNormalizedUnstructuredMesh.txx"
-
-#include "Interpolation1D.txx"
-#include "Interpolation2DCurve.txx"
-#include "Interpolation2D.txx"
-#include "Interpolation3D.txx"
-#include "Interpolation3DSurf.txx"
-
-using namespace ParaMEDMEM;
-
-MEDCouplingRemapper::MEDCouplingRemapper():_src_mesh(0),_target_mesh(0),_nature_of_deno(NoNature),_time_deno_update(0)
-{
-}
-
-MEDCouplingRemapper::~MEDCouplingRemapper()
-{
-  releaseData(false);
-}
-
-int MEDCouplingRemapper::prepare(const MEDCouplingMesh *srcMesh, const MEDCouplingMesh *targetMesh, const char *method)
-{
-  releaseData(true);
-  _src_mesh=(MEDCouplingMesh *)srcMesh; _target_mesh=(MEDCouplingMesh *)targetMesh;
-  _src_mesh->incrRef(); _target_mesh->incrRef();
-  int meshInterpType=((int)_src_mesh->getType()*16)+(int)_target_mesh->getType();
-  switch(meshInterpType)
-    {
-    case 85://Unstructured-Unstructured
-      return prepareUU(method);
-    case 136://Extruded-Extruded
-      return prepareEE(method);
-    default:
-      throw INTERP_KERNEL::Exception("Not managed type of meshes !");
-    }
-}
-
-void MEDCouplingRemapper::transfer(const MEDCouplingFieldDouble *srcField, MEDCouplingFieldDouble *targetField, double dftValue)
-{
-  if(_src_method!=srcField->getDiscretization()->getStringRepr())
-    throw INTERP_KERNEL::Exception("Incoherency with prepare call for source field");
-  if(_target_method!=targetField->getDiscretization()->getStringRepr())
-    throw INTERP_KERNEL::Exception("Incoherency with prepare call for target field");
-  if(srcField->getNature()!=targetField->getNature())
-    throw INTERP_KERNEL::Exception("Natures of fields mismatch !");
-  DataArrayDouble *array=targetField->getArray();
-  int srcNbOfCompo=srcField->getNumberOfComponents();
-  if(array)
-    {
-      if(srcNbOfCompo!=targetField->getNumberOfComponents())
-        throw INTERP_KERNEL::Exception("Number of components mismatch !");
-    }
-  else
-    {
-      array=DataArrayDouble::New();
-      array->alloc(targetField->getNumberOfTuples(),srcNbOfCompo);
-      targetField->setArray(array);
-      array->decrRef();
-    }
-  computeDeno(srcField->getNature(),srcField,targetField);
-  double *resPointer=array->getPointer();
-  const double *inputPointer=srcField->getArray()->getConstPointer();
-  computeProduct(inputPointer,srcNbOfCompo,dftValue,resPointer);
-}
-
-void MEDCouplingRemapper::reverseTransfer(MEDCouplingFieldDouble *srcField, const MEDCouplingFieldDouble *targetField, double dftValue)
-{
-  if(_src_method!=srcField->getDiscretization()->getStringRepr())
-    throw INTERP_KERNEL::Exception("Incoherency with prepare call for source field");
-  if(_target_method!=targetField->getDiscretization()->getStringRepr())
-    throw INTERP_KERNEL::Exception("Incoherency with prepare call for target field");
-  if(srcField->getNature()!=targetField->getNature())
-    throw INTERP_KERNEL::Exception("Natures of fields mismatch !");
-  DataArrayDouble *array=srcField->getArray();
-  int trgNbOfCompo=targetField->getNumberOfComponents();
-  if(array)
-    {
-      if(trgNbOfCompo!=srcField->getNumberOfComponents())
-        throw INTERP_KERNEL::Exception("Number of components mismatch !");
-    }
-  else
-    {
-      array=DataArrayDouble::New();
-      array->alloc(srcField->getNumberOfTuples(),trgNbOfCompo);
-      srcField->setArray(array);
-      array->decrRef();
-    }
-  computeDeno(srcField->getNature(),srcField,targetField);
-  double *resPointer=array->getPointer();
-  const double *inputPointer=targetField->getArray()->getConstPointer();
-  computeReverseProduct(inputPointer,trgNbOfCompo,dftValue,resPointer);
-}
-
-MEDCouplingFieldDouble *MEDCouplingRemapper::transferField(const MEDCouplingFieldDouble *srcField, double dftValue)
-{
-  if(_src_method!=srcField->getDiscretization()->getStringRepr())
-    throw INTERP_KERNEL::Exception("Incoherency with prepare call for source field");
-  MEDCouplingFieldDouble *ret=MEDCouplingFieldDouble::New(MEDCouplingFieldDiscretization::getTypeOfFieldFromStringRepr(_target_method.c_str()));
-  ret->setNature(srcField->getNature());
-  ret->setMesh(_target_mesh);
-  transfer(srcField,ret,dftValue);
-  return ret;
-}
-
-MEDCouplingFieldDouble *MEDCouplingRemapper::reverseTransferField(const MEDCouplingFieldDouble *targetField, double dftValue)
-{
-  if(_target_method!=targetField->getDiscretization()->getStringRepr())
-    throw INTERP_KERNEL::Exception("Incoherency with prepare call for target field");
-  MEDCouplingFieldDouble *ret=MEDCouplingFieldDouble::New(MEDCouplingFieldDiscretization::getTypeOfFieldFromStringRepr(_target_method.c_str()));
-  ret->setNature(targetField->getNature());
-  ret->setMesh(_src_mesh);
-  reverseTransfer(ret,targetField,dftValue);
-  return ret;
-}
-
-bool MEDCouplingRemapper::setOptionInt(const std::string& key, int value)
-{
-  return INTERP_KERNEL::InterpolationOptions::setOptionInt(key,value);
-}
-
-bool MEDCouplingRemapper::setOptionDouble(const std::string& key, double value)
-{
-  return INTERP_KERNEL::InterpolationOptions::setOptionDouble(key,value);
-}
-
-bool MEDCouplingRemapper::setOptionString(const std::string& key, std::string& value)
-{
-  return INTERP_KERNEL::InterpolationOptions::setOptionString(key,value);
-}
-
-int MEDCouplingRemapper::prepareUU(const char *method)
-{
-  MEDCouplingUMesh *src_mesh=(MEDCouplingUMesh *)_src_mesh;
-  MEDCouplingUMesh *target_mesh=(MEDCouplingUMesh *)_target_mesh;
-  INTERP_KERNEL::Interpolation<INTERP_KERNEL::Interpolation3D>::checkAndSplitInterpolationMethod(method,_src_method,_target_method);
-  const int srcMeshDim=src_mesh->getMeshDimension();
-  int srcSpaceDim=-1;
-  if(srcMeshDim!=-1)
-    srcSpaceDim=src_mesh->getSpaceDimension();
-  const int trgMeshDim=target_mesh->getMeshDimension();
-  int trgSpaceDim=-1;
-  if(trgMeshDim!=-1)
-    trgSpaceDim=target_mesh->getSpaceDimension();
-  if(trgSpaceDim!=srcSpaceDim)
-    if(trgSpaceDim!=-1 && srcSpaceDim!=-1)
-      throw INTERP_KERNEL::Exception("Incoherent space dimension detected between target and source.");
-  int nbCols;
-  if(srcMeshDim==2 && trgMeshDim==2 && srcSpaceDim==2)
-    {
-      MEDCouplingNormalizedUnstructuredMesh<2,2> source_mesh_wrapper(src_mesh);
-      MEDCouplingNormalizedUnstructuredMesh<2,2> target_mesh_wrapper(target_mesh);
-      INTERP_KERNEL::Interpolation2D interpolation(*this);
-      nbCols=interpolation.interpolateMeshes(source_mesh_wrapper,target_mesh_wrapper,_matrix,method);
-    }
-  else if(srcMeshDim==3 && trgMeshDim==3 && srcSpaceDim==3)
-    {
-      MEDCouplingNormalizedUnstructuredMesh<3,3> source_mesh_wrapper(src_mesh);
-      MEDCouplingNormalizedUnstructuredMesh<3,3> target_mesh_wrapper(target_mesh);
-      INTERP_KERNEL::Interpolation3D interpolation(*this);
-      nbCols=interpolation.interpolateMeshes(source_mesh_wrapper,target_mesh_wrapper,_matrix,method);
-    }
-  else if(srcMeshDim==2 && trgMeshDim==2 && srcSpaceDim==3)
-    {
-      MEDCouplingNormalizedUnstructuredMesh<3,2> source_mesh_wrapper(src_mesh);
-      MEDCouplingNormalizedUnstructuredMesh<3,2> target_mesh_wrapper(target_mesh);
-      INTERP_KERNEL::Interpolation3DSurf interpolation(*this);
-      nbCols=interpolation.interpolateMeshes(source_mesh_wrapper,target_mesh_wrapper,_matrix,method);
-    }
-  else if(srcMeshDim==3 && trgMeshDim==1 && srcSpaceDim==3)
-    {
-      if(getIntersectionType()!=INTERP_KERNEL::PointLocator)
-        throw INTERP_KERNEL::Exception("Invalid interpolation requested between 3D and 1D ! Select PointLocator as intersection type !");
-      MEDCouplingNormalizedUnstructuredMesh<3,3> source_mesh_wrapper(src_mesh);
-      MEDCouplingNormalizedUnstructuredMesh<3,3> target_mesh_wrapper(target_mesh);
-      INTERP_KERNEL::Interpolation3D interpolation(*this);
-      nbCols=interpolation.interpolateMeshes(source_mesh_wrapper,target_mesh_wrapper,_matrix,method);
-    }
-  else if(srcMeshDim==1 && trgMeshDim==3 && srcSpaceDim==3)
-    {
-      if(getIntersectionType()!=INTERP_KERNEL::PointLocator)
-        throw INTERP_KERNEL::Exception("Invalid interpolation requested between 3D and 1D ! Select PointLocator as intersection type !");
-      MEDCouplingNormalizedUnstructuredMesh<3,3> source_mesh_wrapper(src_mesh);
-      MEDCouplingNormalizedUnstructuredMesh<3,3> target_mesh_wrapper(target_mesh);
-      INTERP_KERNEL::Interpolation3D interpolation(*this);
-      std::vector<std::map<int,double> > matrixTmp;
-      nbCols=interpolation.interpolateMeshes(target_mesh_wrapper,source_mesh_wrapper,matrixTmp,method);
-      reverseMatrix(matrixTmp,nbCols,_matrix);
-      nbCols=matrixTmp.size();
-    }
-  else if(srcMeshDim==2 && trgMeshDim==1 && srcSpaceDim==2)
-    {
-      if(getIntersectionType()!=INTERP_KERNEL::PointLocator)
-        throw INTERP_KERNEL::Exception("Invalid interpolation requested between 2D and 1D ! Select PointLocator as intersection type !");
-      MEDCouplingNormalizedUnstructuredMesh<2,2> source_mesh_wrapper(src_mesh);
-      MEDCouplingNormalizedUnstructuredMesh<2,2> target_mesh_wrapper(target_mesh);
-      INTERP_KERNEL::Interpolation2D interpolation(*this);
-      nbCols=interpolation.interpolateMeshes(source_mesh_wrapper,target_mesh_wrapper,_matrix,method);
-    }
-  else if(srcMeshDim==1 && trgMeshDim==2 && srcSpaceDim==2)
-    {
-      if(getIntersectionType()!=INTERP_KERNEL::PointLocator)
-        throw INTERP_KERNEL::Exception("Invalid interpolation requested between 1D and 2D ! Select PointLocator as intersection type !");
-      MEDCouplingNormalizedUnstructuredMesh<2,2> source_mesh_wrapper(src_mesh);
-      MEDCouplingNormalizedUnstructuredMesh<2,2> target_mesh_wrapper(target_mesh);
-      INTERP_KERNEL::Interpolation2D interpolation(*this);
-      std::vector<std::map<int,double> > matrixTmp;
-      nbCols=interpolation.interpolateMeshes(target_mesh_wrapper,source_mesh_wrapper,matrixTmp,method);
-      reverseMatrix(matrixTmp,nbCols,_matrix);
-      nbCols=matrixTmp.size();
-    }
-  else if(trgMeshDim==-1)
-    {
-      if(srcMeshDim==2 && srcSpaceDim==2)
-        {
-          MEDCouplingNormalizedUnstructuredMesh<2,2> source_mesh_wrapper(src_mesh);
-          INTERP_KERNEL::Interpolation2D interpolation(*this);
-          nbCols=interpolation.toIntegralUniform(source_mesh_wrapper,_matrix,_src_method.c_str());
-        }
-      else if(srcMeshDim==3 && srcSpaceDim==3)
-        {
-          MEDCouplingNormalizedUnstructuredMesh<3,3> source_mesh_wrapper(src_mesh);
-          INTERP_KERNEL::Interpolation3D interpolation(*this);
-          nbCols=interpolation.toIntegralUniform(source_mesh_wrapper,_matrix,_src_method.c_str());
-        }
-      else if(srcMeshDim==2 && srcSpaceDim==3)
-        {
-          MEDCouplingNormalizedUnstructuredMesh<3,2> source_mesh_wrapper(src_mesh);
-          INTERP_KERNEL::Interpolation3DSurf interpolation(*this);
-          nbCols=interpolation.toIntegralUniform(source_mesh_wrapper,_matrix,_src_method.c_str());
-        }
-      else
-        throw INTERP_KERNEL::Exception("No interpolation available for the given mesh and space dimension of source mesh to -1D targetMesh");
-    }
-  else if(srcMeshDim==-1)
-    {
-      if(trgMeshDim==2 && trgSpaceDim==2)
-        {
-          MEDCouplingNormalizedUnstructuredMesh<2,2> source_mesh_wrapper(target_mesh);
-          INTERP_KERNEL::Interpolation2D interpolation(*this);
-          nbCols=interpolation.fromIntegralUniform(source_mesh_wrapper,_matrix,_target_method.c_str());
-        }
-      else if(trgMeshDim==3 && trgSpaceDim==3)
-        {
-          MEDCouplingNormalizedUnstructuredMesh<3,3> source_mesh_wrapper(target_mesh);
-          INTERP_KERNEL::Interpolation3D interpolation(*this);
-          nbCols=interpolation.fromIntegralUniform(source_mesh_wrapper,_matrix,_target_method.c_str());
-        }
-      else if(trgMeshDim==2 && trgSpaceDim==3)
-        {
-          MEDCouplingNormalizedUnstructuredMesh<3,2> source_mesh_wrapper(target_mesh);
-          INTERP_KERNEL::Interpolation3DSurf interpolation(*this);
-          nbCols=interpolation.fromIntegralUniform(source_mesh_wrapper,_matrix,_target_method.c_str());
-        }
-      else
-        throw INTERP_KERNEL::Exception("No interpolation available for the given mesh and space dimension of source mesh from -1D sourceMesh");
-    }
-  else
-    throw INTERP_KERNEL::Exception("No interpolation available for the given mesh and space dimension");
-  _deno_multiply.clear();
-  _deno_multiply.resize(_matrix.size());
-  _deno_reverse_multiply.clear();
-  _deno_reverse_multiply.resize(nbCols);
-  declareAsNew();
-  return 1;
-}
-
-int MEDCouplingRemapper::prepareEE(const char *method)
-{
-  MEDCouplingExtrudedMesh *src_mesh=(MEDCouplingExtrudedMesh *)_src_mesh;
-  MEDCouplingExtrudedMesh *target_mesh=(MEDCouplingExtrudedMesh *)_target_mesh;
-  std::string methC(method);
-  if(methC!="P0P0")
-    throw INTERP_KERNEL::Exception("Only P0P0 method implemented for Extruded/Extruded meshes !");
-  INTERP_KERNEL::Interpolation<INTERP_KERNEL::Interpolation3D>::checkAndSplitInterpolationMethod(method,_src_method,_target_method);
-  MEDCouplingNormalizedUnstructuredMesh<3,2> source_mesh_wrapper(src_mesh->getMesh2D());
-  MEDCouplingNormalizedUnstructuredMesh<3,2> target_mesh_wrapper(target_mesh->getMesh2D());
-  INTERP_KERNEL::Interpolation3DSurf interpolation2D(*this);
-  std::vector<std::map<int,double> > matrix2D;
-  int nbCols2D=interpolation2D.interpolateMeshes(source_mesh_wrapper,target_mesh_wrapper,matrix2D,method);
-  MEDCouplingUMesh *s1D,*t1D;
-  double v[3];
-  MEDCouplingExtrudedMesh::project1DMeshes(src_mesh->getMesh1D(),target_mesh->getMesh1D(),getPrecision(),s1D,t1D,v);
-  MEDCouplingNormalizedUnstructuredMesh<1,1> s1DWrapper(s1D);
-  MEDCouplingNormalizedUnstructuredMesh<1,1> t1DWrapper(t1D);
-  std::vector<std::map<int,double> > matrix1D;
-  INTERP_KERNEL::Interpolation1D interpolation1D(*this);
-  int nbCols1D=interpolation1D.interpolateMeshes(s1DWrapper,t1DWrapper,matrix1D,method);
-  s1D->decrRef();
-  t1D->decrRef();
-  buildFinalInterpolationMatrixByConvolution(matrix1D,matrix2D,src_mesh->getMesh3DIds()->getConstPointer(),nbCols2D,nbCols1D,
-                                             target_mesh->getMesh3DIds()->getConstPointer());
-  //
-  _deno_multiply.clear();
-  _deno_multiply.resize(_matrix.size());
-  _deno_reverse_multiply.clear();
-  _deno_reverse_multiply.resize(nbCols2D*nbCols1D);
-  declareAsNew();
-  return 1;
-}
-
-void MEDCouplingRemapper::updateTime()
-{
-}
-
-void MEDCouplingRemapper::releaseData(bool matrixSuppression)
-{
-  if(_src_mesh)
-    _src_mesh->decrRef();
-  if(_target_mesh)
-    _target_mesh->decrRef();
-  _src_mesh=0;
-  _target_mesh=0;
-  if(matrixSuppression)
-    {
-      _matrix.clear();
-      _deno_multiply.clear();
-      _deno_reverse_multiply.clear();
-    }
-}
-
-void MEDCouplingRemapper::computeDeno(NatureOfField nat, const MEDCouplingFieldDouble *srcField, const MEDCouplingFieldDouble *trgField)
-{
-  if(nat==NoNature)
-    return computeDenoFromScratch(nat,srcField,trgField);
-  else if(nat!=_nature_of_deno)
-   return computeDenoFromScratch(nat,srcField,trgField);
-  else if(nat==_nature_of_deno && _time_deno_update!=getTimeOfThis())
-    return computeDenoFromScratch(nat,srcField,trgField);
-}
-
-void MEDCouplingRemapper::computeDenoFromScratch(NatureOfField nat, const MEDCouplingFieldDouble *srcField, const MEDCouplingFieldDouble *trgField)
-{
-  _nature_of_deno=nat;
-  _time_deno_update=getTimeOfThis();
-  switch(_nature_of_deno)
-    {
-    case ConservativeVolumic:
-      {
-        computeRowSumAndColSum(_matrix,_deno_multiply,_deno_reverse_multiply);
-        break;
-      }
-    case Integral:
-      {
-        MEDCouplingFieldDouble *deno=srcField->getDiscretization()->getWeightingField(srcField->getMesh(),true);
-        MEDCouplingFieldDouble *denoR=trgField->getDiscretization()->getWeightingField(trgField->getMesh(),true);
-        const double *denoPtr=deno->getArray()->getConstPointer();
-        const double *denoRPtr=denoR->getArray()->getConstPointer();
-        if(trgField->getMesh()->getMeshDimension()==-1)
-          {
-            double *denoRPtr2=denoR->getArray()->getPointer();
-            denoRPtr2[0]=std::accumulate(denoPtr,denoPtr+deno->getNumberOfTuples(),0.);
-          }
-        if(srcField->getMesh()->getMeshDimension()==-1)
-          {
-            double *denoPtr2=deno->getArray()->getPointer();
-            denoPtr2[0]=std::accumulate(denoRPtr,denoRPtr+denoR->getNumberOfTuples(),0.);
-          }
-        int idx=0;
-        for(std::vector<std::map<int,double> >::const_iterator iter1=_matrix.begin();iter1!=_matrix.end();iter1++,idx++)
-          for(std::map<int,double>::const_iterator iter2=(*iter1).begin();iter2!=(*iter1).end();iter2++)
-            {
-              _deno_multiply[idx][(*iter2).first]=denoPtr[(*iter2).first];
-              _deno_reverse_multiply[(*iter2).first][idx]=denoRPtr[idx];
-            }
-        deno->decrRef();
-        denoR->decrRef();
-        break;
-      }
-    case IntegralGlobConstraint:
-      {
-        computeColSumAndRowSum(_matrix,_deno_multiply,_deno_reverse_multiply);
-        break;
-      }
-    case RevIntegral:
-      {
-        MEDCouplingFieldDouble *deno=trgField->getDiscretization()->getWeightingField(trgField->getMesh(),true);
-        MEDCouplingFieldDouble *denoR=srcField->getDiscretization()->getWeightingField(srcField->getMesh(),true);
-        const double *denoPtr=deno->getArray()->getConstPointer();
-        const double *denoRPtr=denoR->getArray()->getConstPointer();
-        if(trgField->getMesh()->getMeshDimension()==-1)
-          {
-            double *denoRPtr2=denoR->getArray()->getPointer();
-            denoRPtr2[0]=std::accumulate(denoPtr,denoPtr+deno->getNumberOfTuples(),0.);
-          }
-        if(srcField->getMesh()->getMeshDimension()==-1)
-          {
-            double *denoPtr2=deno->getArray()->getPointer();
-            denoPtr2[0]=std::accumulate(denoRPtr,denoRPtr+denoR->getNumberOfTuples(),0.);
-          }
-        int idx=0;
-        for(std::vector<std::map<int,double> >::const_iterator iter1=_matrix.begin();iter1!=_matrix.end();iter1++,idx++)
-          for(std::map<int,double>::const_iterator iter2=(*iter1).begin();iter2!=(*iter1).end();iter2++)
-            {
-              _deno_multiply[idx][(*iter2).first]=denoPtr[idx];
-              _deno_reverse_multiply[(*iter2).first][idx]=denoRPtr[(*iter2).first];
-            }
-        deno->decrRef();
-        denoR->decrRef();
-        break;
-      }
-    case NoNature:
-      throw INTERP_KERNEL::Exception("No nature specified ! Select one !");
-    }
-}
-
-void MEDCouplingRemapper::computeProduct(const double *inputPointer, int inputNbOfCompo, double dftValue, double *resPointer)
-{
-  int idx=0;
-  double *tmp=new double[inputNbOfCompo];
-  for(std::vector<std::map<int,double> >::const_iterator iter1=_matrix.begin();iter1!=_matrix.end();iter1++,idx++)
-    {
-      if((*iter1).empty())
-        {
-          std::fill(resPointer+idx*inputNbOfCompo,resPointer+(idx+1)*inputNbOfCompo,dftValue);
-          continue;
-        }
-      else
-        std::fill(resPointer+idx*inputNbOfCompo,resPointer+(idx+1)*inputNbOfCompo,0.);
-      std::map<int,double>::const_iterator iter3=_deno_multiply[idx].begin();
-      for(std::map<int,double>::const_iterator iter2=(*iter1).begin();iter2!=(*iter1).end();iter2++,iter3++)
-        {
-          std::transform(inputPointer+(*iter2).first*inputNbOfCompo,inputPointer+((*iter2).first+1)*inputNbOfCompo,tmp,std::bind2nd(std::multiplies<double>(),(*iter2).second/(*iter3).second));
-          std::transform(tmp,tmp+inputNbOfCompo,resPointer+idx*inputNbOfCompo,resPointer+idx*inputNbOfCompo,std::plus<double>());
-        }
-    }
-  delete [] tmp;
-}
-
-void MEDCouplingRemapper::computeReverseProduct(const double *inputPointer, int inputNbOfCompo, double dftValue, double *resPointer)
-{
-  std::vector<bool> isReached(_deno_reverse_multiply.size(),false);
-  int idx=0;
-  double *tmp=new double[inputNbOfCompo];
-  std::fill(resPointer,resPointer+inputNbOfCompo*_deno_reverse_multiply.size(),0.);
-  for(std::vector<std::map<int,double> >::const_iterator iter1=_matrix.begin();iter1!=_matrix.end();iter1++,idx++)
-    {
-      for(std::map<int,double>::const_iterator iter2=(*iter1).begin();iter2!=(*iter1).end();iter2++)
-        {
-          isReached[(*iter2).first]=true;
-          std::transform(inputPointer+idx*inputNbOfCompo,inputPointer+(idx+1)*inputNbOfCompo,tmp,std::bind2nd(std::multiplies<double>(),(*iter2).second/_deno_reverse_multiply[(*iter2).first][idx]));
-          std::transform(tmp,tmp+inputNbOfCompo,resPointer+((*iter2).first)*inputNbOfCompo,resPointer+((*iter2).first)*inputNbOfCompo,std::plus<double>());
-        }
-    }
-  delete [] tmp;
-  idx=0;
-  for(std::vector<bool>::const_iterator iter3=isReached.begin();iter3!=isReached.end();iter3++,idx++)
-    if(!*iter3)
-      std::fill(resPointer+idx*inputNbOfCompo,resPointer+(idx+1)*inputNbOfCompo,dftValue);
-}
-
-void MEDCouplingRemapper::reverseMatrix(const std::vector<std::map<int,double> >& matIn, int nbColsMatIn, std::vector<std::map<int,double> >& matOut)
-{
-  matOut.resize(nbColsMatIn);
-  int id=0;
-  for(std::vector<std::map<int,double> >::const_iterator iter1=matIn.begin();iter1!=matIn.end();iter1++,id++)
-    for(std::map<int,double>::const_iterator iter2=(*iter1).begin();iter2!=(*iter1).end();iter2++)
-      matOut[(*iter2).first][id]=(*iter2).second;
-}
-
-void MEDCouplingRemapper::computeRowSumAndColSum(const std::vector<std::map<int,double> >& matrixDeno,
-                                                 std::vector<std::map<int,double> >& deno, std::vector<std::map<int,double> >& denoReverse)
-{
-  std::map<int,double> values;
-  int idx=0;
-  for(std::vector<std::map<int,double> >::const_iterator iter1=matrixDeno.begin();iter1!=matrixDeno.end();iter1++,idx++)
-    {
-      double sum=0.;
-      for(std::map<int,double>::const_iterator iter2=(*iter1).begin();iter2!=(*iter1).end();iter2++)
-        {
-          sum+=(*iter2).second;
-          values[(*iter2).first]+=(*iter2).second;
-        }
-      for(std::map<int,double>::const_iterator iter2=(*iter1).begin();iter2!=(*iter1).end();iter2++)
-        deno[idx][(*iter2).first]=sum;
-    }
-  idx=0;
-  for(std::vector<std::map<int,double> >::const_iterator iter1=matrixDeno.begin();iter1!=matrixDeno.end();iter1++,idx++)
-    {
-      for(std::map<int,double>::const_iterator iter2=(*iter1).begin();iter2!=(*iter1).end();iter2++)
-        denoReverse[(*iter2).first][idx]=values[(*iter2).first];
-    }
-}
-
-void MEDCouplingRemapper::computeColSumAndRowSum(const std::vector<std::map<int,double> >& matrixDeno,
-                                                 std::vector<std::map<int,double> >& deno, std::vector<std::map<int,double> >& denoReverse)
-{
-  std::map<int,double> values;
-  int idx=0;
-  for(std::vector<std::map<int,double> >::const_iterator iter1=matrixDeno.begin();iter1!=matrixDeno.end();iter1++,idx++)
-    {
-      double sum=0.;
-      for(std::map<int,double>::const_iterator iter2=(*iter1).begin();iter2!=(*iter1).end();iter2++)
-        {
-          sum+=(*iter2).second;
-          values[(*iter2).first]+=(*iter2).second;
-        }
-      for(std::map<int,double>::const_iterator iter2=(*iter1).begin();iter2!=(*iter1).end();iter2++)
-        denoReverse[(*iter2).first][idx]=sum;
-    }
-  idx=0;
-  for(std::vector<std::map<int,double> >::const_iterator iter1=matrixDeno.begin();iter1!=matrixDeno.end();iter1++,idx++)
-    {
-      for(std::map<int,double>::const_iterator iter2=(*iter1).begin();iter2!=(*iter1).end();iter2++)
-        deno[idx][(*iter2).first]=values[(*iter2).first];
-    }
-}
-
-void MEDCouplingRemapper::buildFinalInterpolationMatrixByConvolution(const std::vector< std::map<int,double> >& m1D,
-                                                                     const std::vector< std::map<int,double> >& m2D,
-                                                                     const int *corrCellIdSrc, int nbOf2DCellsSrc, int nbOf1DCellsSrc,
-                                                                     const int *corrCellIdTrg)
-{
-  int nbOf2DCellsTrg=m2D.size();
-  int nbOf1DCellsTrg=m1D.size();
-  int nbOf3DCellsTrg=nbOf2DCellsTrg*nbOf1DCellsTrg;
-  _matrix.resize(nbOf3DCellsTrg);
-  int id2R=0;
-  for(std::vector< std::map<int,double> >::const_iterator iter2R=m2D.begin();iter2R!=m2D.end();iter2R++,id2R++)
-    {
-      for(std::map<int,double>::const_iterator iter2C=(*iter2R).begin();iter2C!=(*iter2R).end();iter2C++)
-        {
-          int id1R=0;
-          for(std::vector< std::map<int,double> >::const_iterator iter1R=m1D.begin();iter1R!=m1D.end();iter1R++,id1R++)
-            {
-              for(std::map<int,double>::const_iterator iter1C=(*iter1R).begin();iter1C!=(*iter1R).end();iter1C++)
-                {
-                  _matrix[corrCellIdTrg[id1R*nbOf2DCellsTrg+id2R]][corrCellIdSrc[(*iter1C).first*nbOf2DCellsSrc+(*iter2C).first]]=(*iter1C).second*((*iter2C).second);
-                }
-            }
-        }
-    }
-}
-
-void MEDCouplingRemapper::printMatrix(const std::vector<std::map<int,double> >& m)
-{
-  int id=0;
-  for(std::vector<std::map<int,double> >::const_iterator iter1=m.begin();iter1!=m.end();iter1++,id++)
-    {
-      std::cout << "Target Cell # " << id << " : ";
-      for(std::map<int,double>::const_iterator iter2=(*iter1).begin();iter2!=(*iter1).end();iter2++)
-        std::cout << "(" << (*iter2).first << "," << (*iter2).second << "), ";
-      std::cout << std::endl;
-    }
-}
diff --git a/src/MEDCoupling/MEDCouplingRemapper.hxx b/src/MEDCoupling/MEDCouplingRemapper.hxx
deleted file mode 100644
index 5e2bd63dd..000000000
--- a/src/MEDCoupling/MEDCouplingRemapper.hxx
+++ /dev/null
@@ -1,87 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __PARAMEDMEM_MEDCOUPLINGREMAPPER_HXX__
-#define __PARAMEDMEM_MEDCOUPLINGREMAPPER_HXX__
-
-#include "MEDCoupling.hxx"
-#include "MEDCouplingTimeLabel.hxx"
-#include "InterpolationOptions.hxx"
-#include "MEDCouplingNatureOfField.hxx"
-
-#include <map>
-#include <vector>
-
-namespace ParaMEDMEM
-{
-  class MEDCouplingMesh;
-  class MEDCouplingUMesh;
-  class MEDCouplingFieldDouble;
-}
-
-namespace ParaMEDMEM
-{
-  class MEDCouplingRemapper : public TimeLabel, public INTERP_KERNEL::InterpolationOptions
-  {
-  public:
-    MEDCOUPLINGREMAPPER_EXPORT MEDCouplingRemapper();
-    MEDCOUPLINGREMAPPER_EXPORT ~MEDCouplingRemapper();
-    MEDCOUPLINGREMAPPER_EXPORT int prepare(const MEDCouplingMesh *srcMesh, const MEDCouplingMesh *targetMesh, const char *method);
-    MEDCOUPLINGREMAPPER_EXPORT void transfer(const MEDCouplingFieldDouble *srcField, MEDCouplingFieldDouble *targetField, double dftValue);
-    MEDCOUPLINGREMAPPER_EXPORT void reverseTransfer(MEDCouplingFieldDouble *srcField, const MEDCouplingFieldDouble *targetField, double dftValue);
-    MEDCOUPLINGREMAPPER_EXPORT MEDCouplingFieldDouble *transferField(const MEDCouplingFieldDouble *srcField, double dftValue);
-    MEDCOUPLINGREMAPPER_EXPORT MEDCouplingFieldDouble *reverseTransferField(const MEDCouplingFieldDouble *targetField, double dftValue);
-    MEDCOUPLINGREMAPPER_EXPORT bool setOptionInt(const std::string& key, int value);
-    MEDCOUPLINGREMAPPER_EXPORT bool setOptionDouble(const std::string& key, double value);
-    MEDCOUPLINGREMAPPER_EXPORT bool setOptionString(const std::string& key, std::string& value);
-  public:
-    MEDCOUPLINGREMAPPER_EXPORT static void printMatrix(const std::vector<std::map<int,double> >& m);
-  private:
-    int prepareUU(const char *method);
-    int prepareEE(const char *method);
-    void updateTime();
-    void releaseData(bool matrixSuppression);
-    void computeDeno(NatureOfField nat, const MEDCouplingFieldDouble *srcField, const MEDCouplingFieldDouble *trgField);
-    void computeDenoFromScratch(NatureOfField nat, const MEDCouplingFieldDouble *srcField, const MEDCouplingFieldDouble *trgField);
-    void computeProduct(const double *inputPointer, int inputNbOfCompo, double dftValue, double *resPointer);
-    void computeReverseProduct(const double *inputPointer, int inputNbOfCompo, double dftValue, double *resPointer);
-    void buildFinalInterpolationMatrixByConvolution(const std::vector< std::map<int,double> >& m1D,
-                                                    const std::vector< std::map<int,double> >& m2D,
-                                                    const int *corrCellIdSrc, int nbOf2DCellsSrc, int nbOf1DCellsSrc,
-                                                    const int *corrCellIdTrg);
-    static void reverseMatrix(const std::vector<std::map<int,double> >& matIn, int nbColsMatIn,
-                              std::vector<std::map<int,double> >& matOut);
-    static void computeRowSumAndColSum(const std::vector<std::map<int,double> >& matrixDeno,
-                                       std::vector<std::map<int,double> >& deno, std::vector<std::map<int,double> >& denoReverse);
-    static void computeColSumAndRowSum(const std::vector<std::map<int,double> >& matrixDeno,
-                                       std::vector<std::map<int,double> >& deno, std::vector<std::map<int,double> >& denoReverse);
-  private:
-    MEDCouplingMesh *_src_mesh;
-    MEDCouplingMesh *_target_mesh;
-    std::string _src_method;
-    std::string _target_method;
-    NatureOfField _nature_of_deno;
-    unsigned int _time_deno_update;
-    std::vector<std::map<int,double> > _matrix;
-    std::vector<std::map<int,double> > _deno_multiply;
-    std::vector<std::map<int,double> > _deno_reverse_multiply;
-  };
-}
-
-#endif
diff --git a/src/MEDCoupling/MEDCouplingSMesh.cxx b/src/MEDCoupling/MEDCouplingSMesh.cxx
new file mode 100644
index 000000000..724b157dd
--- /dev/null
+++ b/src/MEDCoupling/MEDCouplingSMesh.cxx
@@ -0,0 +1,164 @@
+//  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
+//
+#include "MEDCouplingSMesh.hxx"
+#include "MemArray.hxx"
+
+using namespace ParaMEDMEM;
+
+MEDCouplingSMesh::MEDCouplingSMesh():_x_array(0),_y_array(0),_z_array(0)
+{
+}
+
+MEDCouplingSMesh::~MEDCouplingSMesh()
+{
+  if(_x_array)
+    _x_array->decrRef();
+  if(_y_array)
+    _y_array->decrRef();
+  if(_z_array)
+    _z_array->decrRef();
+}
+
+MEDCouplingSMesh *MEDCouplingSMesh::New()
+{
+  return new MEDCouplingSMesh;
+}
+
+void MEDCouplingSMesh::updateTime()
+{
+  if(_x_array)
+    updateTimeWith(*_x_array);
+  if(_y_array)
+    updateTimeWith(*_y_array);
+  if(_z_array)
+    updateTimeWith(*_z_array);
+}
+
+void MEDCouplingSMesh::checkCoherency() const throw(INTERP_KERNEL::Exception)
+{
+  const char msg0[]="Invalid ";
+  const char msg1[]=" array ! Must contain more than 1 element.";
+  if(_x_array)
+    if(_x_array->getNbOfElems()<2)
+      {
+        std::ostringstream os; os << msg0 << 'X' << msg1;
+        throw INTERP_KERNEL::Exception(os.str().c_str());
+      }
+  if(_y_array)
+    if(_y_array->getNbOfElems()<2)
+      {
+        std::ostringstream os; os << msg0 << 'Y' << msg1;
+        throw INTERP_KERNEL::Exception(os.str().c_str());
+      }
+  if(_z_array)
+    if(_z_array->getNbOfElems()<2)
+      {
+        std::ostringstream os; os << msg0 << 'Z' << msg1;
+        throw INTERP_KERNEL::Exception(os.str().c_str());
+      }
+}
+
+bool MEDCouplingSMesh::isStructured() const
+{
+  return true;
+}
+
+int MEDCouplingSMesh::getNumberOfCells() const
+{
+  int ret=1;
+  if(_x_array)
+    ret*=_x_array->getNbOfElems()-1;
+  if(_y_array)
+    ret*=_y_array->getNbOfElems()-1;
+  if(_z_array)
+    ret*=_z_array->getNbOfElems()-1;
+  return ret;
+}
+
+int MEDCouplingSMesh::getNumberOfNodes() const
+{
+  int ret=1;
+  if(_x_array)
+    ret*=_x_array->getNbOfElems();
+  if(_y_array)
+    ret*=_y_array->getNbOfElems();
+  if(_z_array)
+    ret*=_z_array->getNbOfElems();
+  return ret;
+}
+
+int MEDCouplingSMesh::getSpaceDimension() const
+{
+  int ret=0;
+  if(_x_array)
+    ret++;
+  if(_y_array)
+    ret++;
+  if(_z_array)
+    ret++;
+  return ret;
+}
+
+int MEDCouplingSMesh::getMeshDimension() const
+{
+  int ret=0;
+  if(_x_array)
+    ret++;
+  if(_y_array)
+    ret++;
+  if(_z_array)
+    ret++;
+  return ret;
+}
+
+DataArrayDouble *MEDCouplingSMesh::getCoordsAt(int i) const throw(INTERP_KERNEL::Exception)
+{
+  switch(i)
+    {
+    case 0:
+      return _x_array;
+    case 1:
+      return _y_array;
+    case 2:
+      return _z_array;
+    default:
+      throw INTERP_KERNEL::Exception("Invalid rank specified must be 0 or 1 or 2.");
+    }
+}
+
+void MEDCouplingSMesh::setCoords(DataArrayDouble *coordsX, DataArrayDouble *coordsY, DataArrayDouble *coordsZ)
+{
+  if(_x_array)
+    _x_array->decrRef();
+  _x_array=coordsX;
+  if(_x_array)
+    _x_array->incrRef();
+  if(_y_array)
+    _y_array->decrRef();
+  _y_array=coordsY;
+  if(_y_array)
+    _y_array->incrRef();
+  if(_z_array)
+    _z_array->decrRef();
+  _z_array=coordsZ;
+  if(_z_array)
+    _z_array->incrRef();
+  declareAsNew();
+}
+
diff --git a/src/MEDCoupling/MEDCouplingSMesh.hxx b/src/MEDCoupling/MEDCouplingSMesh.hxx
new file mode 100644
index 000000000..d782107db
--- /dev/null
+++ b/src/MEDCoupling/MEDCouplingSMesh.hxx
@@ -0,0 +1,53 @@
+//  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
+//
+#ifndef __PARAMEDMEM_MEDCOUPLINGSMESH_HXX__
+#define __PARAMEDMEM_MEDCOUPLINGSMESH_HXX__
+
+#include "MEDCouplingMesh.hxx"
+
+namespace ParaMEDMEM
+{
+  class DataArrayDouble;
+
+  class MEDCouplingSMesh : public MEDCouplingMesh
+  {
+  public:
+    static MEDCouplingSMesh *New();
+    void updateTime();
+    void checkCoherency() const throw(INTERP_KERNEL::Exception);
+    bool isStructured() const;
+    int getNumberOfCells() const;
+    int getNumberOfNodes() const;
+    int getSpaceDimension() const;
+    int getMeshDimension() const;
+    DataArrayDouble *getCoordsAt(int i) const throw(INTERP_KERNEL::Exception);
+    void setCoords(DataArrayDouble *coordsX,
+                   DataArrayDouble *coordsY=0,
+                   DataArrayDouble *coordsZ=0);
+  private:
+    MEDCouplingSMesh();
+    ~MEDCouplingSMesh();
+  private:
+    DataArrayDouble *_x_array;
+    DataArrayDouble *_y_array;
+    DataArrayDouble *_z_array;
+  };
+}
+
+#endif
diff --git a/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx b/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx
deleted file mode 100644
index a030e1b4c..000000000
--- a/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx
+++ /dev/null
@@ -1,1064 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "MEDCouplingTimeDiscretization.hxx"
-#include "MEDCouplingMemArray.hxx"
-
-#include "InterpKernelExprParser.hxx"
-
-#include <cmath>
-#include <iterator>
-
-using namespace ParaMEDMEM;
-
-const char MEDCouplingNoTimeLabel::EXCEPTION_MSG[]="MEDCouplingNoTimeLabel::setTime : no time info attached.";
-
-const char MEDCouplingWithTimeStep::EXCEPTION_MSG[]="No data on this time.";
-
-const char MEDCouplingConstOnTimeInterval::EXCEPTION_MSG[]="No data on this time.";
-
-const double MEDCouplingTimeDiscretization::TIME_TOLERANCE_DFT=1.e-12;
-
-MEDCouplingTimeDiscretization *MEDCouplingTimeDiscretization::New(TypeOfTimeDiscretization type)
-{
-  switch(type)
-    {
-    case MEDCouplingNoTimeLabel::DISCRETIZATION:
-      return new MEDCouplingNoTimeLabel;
-    case MEDCouplingWithTimeStep::DISCRETIZATION:
-      return new MEDCouplingWithTimeStep;
-    case MEDCouplingConstOnTimeInterval::DISCRETIZATION:
-      return new MEDCouplingConstOnTimeInterval;
-    default:
-      throw INTERP_KERNEL::Exception("Time discretization not implemented yet");
-    }
-}
-
-void MEDCouplingTimeDiscretization::updateTime()
-{
-  if(_array)
-    updateTimeWith(*_array);
-}
-
-bool MEDCouplingTimeDiscretization::areCompatible(const MEDCouplingTimeDiscretization *other) const
-{
-  if(std::fabs(_time_tolerance-other->_time_tolerance)>1.e-16)
-    return false;
-  if(_array==0 && other->_array==0)
-    return true;
-  if(_array==0 || other->_array==0)
-    return false;
-  if(_array->getNumberOfComponents()!=other->_array->getNumberOfComponents())
-    return false;
-  return true;
-}
-
-bool MEDCouplingTimeDiscretization::areCompatibleForMul(const MEDCouplingTimeDiscretization *other) const
-{
-  if(std::fabs(_time_tolerance-other->_time_tolerance)>1.e-16)
-    return false;
-  if(_array==0 && other->_array==0)
-    return true;
-  if(_array==0 || other->_array==0)
-    return false;
-  int nbC1=_array->getNumberOfComponents();
-  int nbC2=other->_array->getNumberOfComponents();
-  int nbMin=std::min(nbC1,nbC2);
-  if(nbC1!=nbC2 && nbMin!=1)
-    return false;
-  return true;
-}
-
-bool MEDCouplingTimeDiscretization::isEqual(const MEDCouplingTimeDiscretization *other, double prec) const
-{
-  if(!areCompatible(other))
-    return false;
-  if(_array==other->_array)
-    return true;
-  return _array->isEqual(*other->_array,prec);
-}
-
-MEDCouplingTimeDiscretization *MEDCouplingTimeDiscretization::buildNewTimeReprFromThis(const MEDCouplingTimeDiscretization *other,
-                                                                                       TypeOfTimeDiscretization type, bool deepCpy) const
-{
-  MEDCouplingTimeDiscretization *ret=MEDCouplingTimeDiscretization::New(type);
-  DataArrayDouble *arrSrc=getArray();
-  DataArrayDouble *arr=0;
-  if(arrSrc)
-    arr=arrSrc->performCpy(deepCpy);
-  else
-    arr=0;
-  ret->setArray(arr,0);
-  arr->decrRef();
-  return ret;
-}
-
-void MEDCouplingTimeDiscretization::getTinySerializationIntInformation(std::vector<int>& tinyInfo) const
-{
-  if(_array)
-    {
-      tinyInfo.push_back(_array->getNumberOfTuples());
-      tinyInfo.push_back(_array->getNumberOfComponents());
-    }
-  else
-    {
-      tinyInfo.push_back(-1);
-      tinyInfo.push_back(-1);
-    }
-}
-
-void MEDCouplingTimeDiscretization::resizeForUnserialization(const std::vector<int>& tinyInfoI, std::vector<DataArrayDouble *>& arrays)
-{
-  arrays.resize(1);
-  if(_array!=0)
-    _array->decrRef();
-  DataArrayDouble *arr=0;
-  if(tinyInfoI[0]!=-1 && tinyInfoI[1]!=-1)
-    {
-      arr=DataArrayDouble::New();
-      arr->alloc(tinyInfoI[0],tinyInfoI[1]);
-    }
-  _array=arr;
-  arrays[0]=arr;
-}
-
-void MEDCouplingTimeDiscretization::finishUnserialization(const std::vector<int>& tinyInfoI, const std::vector<double>& tinyInfoD, const std::vector<std::string>& tinyInfoS)
-{
-  _time_tolerance=tinyInfoD[0];
-  int nbOfCompo=_array->getNumberOfComponents();
-  for(int i=0;i<nbOfCompo;i++)
-    _array->setInfoOnComponent(i,tinyInfoS[i].c_str());
-}
-
-void MEDCouplingTimeDiscretization::getTinySerializationDbleInformation(std::vector<double>& tinyInfo) const
-{
-  tinyInfo.push_back(_time_tolerance);
-}
-
-void MEDCouplingTimeDiscretization::getTinySerializationStrInformation(std::vector<std::string>& tinyInfo) const
-{
-  int nbOfCompo=_array->getNumberOfComponents();
-  for(int i=0;i<nbOfCompo;i++)
-    tinyInfo.push_back(_array->getInfoOnComponent(i));
-}
-
-MEDCouplingTimeDiscretization::MEDCouplingTimeDiscretization():_time_tolerance(TIME_TOLERANCE_DFT),_array(0)
-{
-}
-
-MEDCouplingTimeDiscretization::MEDCouplingTimeDiscretization(const MEDCouplingTimeDiscretization& other, bool deepCpy):_time_tolerance(other._time_tolerance)
-{
-  if(other._array)
-    _array=other._array->performCpy(deepCpy);
-  else
-    _array=0;
-}
-
-MEDCouplingTimeDiscretization::~MEDCouplingTimeDiscretization()
-{
-  if(_array)
-    _array->decrRef();
-}
-
-void MEDCouplingTimeDiscretization::setArray(DataArrayDouble *array, TimeLabel *owner)
-{
-  if(array!=_array)
-    {
-      if(_array)
-        _array->decrRef();
-      _array=array;
-      if(_array)
-        _array->incrRef();
-      if(owner)
-        owner->declareAsNew();
-    }
-}
-
-void MEDCouplingTimeDiscretization::setArrays(const std::vector<DataArrayDouble *>& arrays, TimeLabel *owner) throw(INTERP_KERNEL::Exception)
-{
-  if(arrays.size()!=1)
-    throw INTERP_KERNEL::Exception("MEDCouplingTimeDiscretization::setArrays : number of arrays must be one.");
-  setArray(arrays.back(),owner);
-}
-
-void MEDCouplingTimeDiscretization::getArrays(std::vector<DataArrayDouble *>& arrays) const
-{
-  arrays.resize(1);
-  arrays[0]=_array;
-}
-
-bool MEDCouplingTimeDiscretization::isBefore(const MEDCouplingTimeDiscretization *other) const throw(INTERP_KERNEL::Exception)
-{
-  int dt,it;
-  double time1=getEndTime(dt,it)-_time_tolerance;
-  double time2=other->getStartTime(dt,it)+other->getTimeTolerance();
-  return time1<=time2;
-}
-
-bool MEDCouplingTimeDiscretization::isStrictlyBefore(const MEDCouplingTimeDiscretization *other) const throw(INTERP_KERNEL::Exception)
-{
-  int dt,it;
-  double time1=getEndTime(dt,it)+_time_tolerance;
-  double time2=other->getStartTime(dt,it)-other->getTimeTolerance();
-  return time1<time2;
-}
-
-void MEDCouplingTimeDiscretization::applyLin(double a, double b, int compoId)
-{
-  double *ptr=_array->getPointer()+compoId;
-  int nbOfComp=_array->getNumberOfComponents();
-  int nbOfTuple=_array->getNumberOfTuples();
-  for(int i=0;i<nbOfTuple;i++,ptr+=nbOfComp)
-    *ptr=a*(*ptr)+b;
-}
-
-void MEDCouplingTimeDiscretization::applyFunc(int nbOfComp, FunctionToEvaluate func)
-{
-  DataArrayDouble *newArr=DataArrayDouble::New();
-  int nbOfTuples=_array->getNumberOfTuples();
-  int oldNbOfComp=_array->getNumberOfComponents();
-  newArr->alloc(nbOfTuples,nbOfComp);
-  const double *ptr=_array->getConstPointer();
-  double *ptrToFill=newArr->getPointer();
-  for(int i=0;i<nbOfTuples;i++)
-    {
-      if(!func(ptr+i*oldNbOfComp,ptrToFill+i*nbOfComp))
-        {
-          std::ostringstream oss; oss << "For tuple # " << i << " with value (";
-          std::copy(ptr+oldNbOfComp*i,ptr+oldNbOfComp*(i+1),std::ostream_iterator<double>(oss,", "));
-          oss << ") : Evaluation of function failed !";
-          newArr->decrRef();
-          throw INTERP_KERNEL::Exception(oss.str().c_str());
-        }
-    }
-  _array->decrRef();
-  _array=newArr;
-}
-
-void MEDCouplingTimeDiscretization::applyFunc(int nbOfComp, const char *func)
-{
-  INTERP_KERNEL::ExprParser expr(func);
-  expr.parse();
-  std::set<std::string> vars;
-  expr.getTrueSetOfVars(vars);
-  int oldNbOfComp=_array->getNumberOfComponents();
-  if((int)vars.size()>oldNbOfComp)
-    {
-      std::ostringstream oss; oss << "The field has a " << oldNbOfComp << " components and there are ";
-      oss << vars.size() << " variables : ";
-      std::copy(vars.begin(),vars.end(),std::ostream_iterator<std::string>(oss," "));
-      throw INTERP_KERNEL::Exception(oss.str().c_str());
-    }
-  std::vector<std::string> varsV(vars.begin(),vars.end());
-  expr.prepareExprEvaluation(varsV);
-  //
-  DataArrayDouble *newArr=DataArrayDouble::New();
-  int nbOfTuples=_array->getNumberOfTuples();
-  newArr->alloc(nbOfTuples,nbOfComp);
-  const double *ptr=_array->getConstPointer();
-  double *ptrToFill=newArr->getPointer();
-  for(int i=0;i<nbOfTuples;i++)
-    {
-      try
-        {
-          expr.evaluateExpr(nbOfComp,ptrToFill+i*nbOfComp,ptr+i*oldNbOfComp);
-        }
-      catch(INTERP_KERNEL::Exception& e)
-        {
-          std::ostringstream oss; oss << "For tuple # " << i << " with value (";
-          std::copy(ptr+oldNbOfComp*i,ptr+oldNbOfComp*(i+1),std::ostream_iterator<double>(oss,", "));
-          oss << ") : Evaluation of function failed !" << e.what();
-          newArr->decrRef();
-          throw INTERP_KERNEL::Exception(oss.str().c_str());
-        }
-    }
-  _array->decrRef();
-  _array=newArr;
-}
-
-void MEDCouplingTimeDiscretization::applyFunc(const char *func)
-{
-  INTERP_KERNEL::ExprParser expr(func);
-  expr.parse();
-  expr.prepareExprEvaluationVec();
-  //
-  DataArrayDouble *newArr=DataArrayDouble::New();
-  int nbOfTuples=_array->getNumberOfTuples();
-  int nbOfComp=_array->getNumberOfComponents();
-  newArr->alloc(nbOfTuples,nbOfComp);
-  const double *ptr=_array->getConstPointer();
-  double *ptrToFill=newArr->getPointer();
-  for(int i=0;i<nbOfTuples;i++)
-    {
-      try
-        {
-          expr.evaluateExpr(nbOfComp,ptrToFill+i*nbOfComp,ptr+i*nbOfComp);
-        }
-      catch(INTERP_KERNEL::Exception& e)
-        {
-          std::ostringstream oss; oss << "For tuple # " << i << " with value (";
-          std::copy(ptr+nbOfComp*i,ptr+nbOfComp*(i+1),std::ostream_iterator<double>(oss,", "));
-          oss << ") : Evaluation of function failed ! " << e.what();
-          newArr->decrRef();
-          throw INTERP_KERNEL::Exception(oss.str().c_str());
-        }
-    }
-  _array->decrRef();
-  _array=newArr;
-}
-
-MEDCouplingNoTimeLabel::MEDCouplingNoTimeLabel()
-{
-}
-
-MEDCouplingNoTimeLabel::MEDCouplingNoTimeLabel(const MEDCouplingTimeDiscretization& other, bool deepCpy):MEDCouplingTimeDiscretization(other,deepCpy)
-{
-}
-
-bool MEDCouplingNoTimeLabel::areCompatible(const MEDCouplingTimeDiscretization *other) const
-{
-  if(!MEDCouplingTimeDiscretization::areCompatible(other))
-    return false;
-  const MEDCouplingNoTimeLabel *otherC=dynamic_cast<const MEDCouplingNoTimeLabel *>(other);
-  return otherC!=0;
-}
-
-bool MEDCouplingNoTimeLabel::areCompatibleForMul(const MEDCouplingTimeDiscretization *other) const
-{
-  if(!MEDCouplingTimeDiscretization::areCompatibleForMul(other))
-    return false;
-  const MEDCouplingNoTimeLabel *otherC=dynamic_cast<const MEDCouplingNoTimeLabel *>(other);
-  return otherC!=0;
-}
-
-bool MEDCouplingNoTimeLabel::isEqual(const MEDCouplingTimeDiscretization *other, double prec) const
-{
-  const MEDCouplingNoTimeLabel *otherC=dynamic_cast<const MEDCouplingNoTimeLabel *>(other);
-  if(!otherC)
-    return false;
-  return MEDCouplingTimeDiscretization::isEqual(other,prec);
-}
-
-MEDCouplingTimeDiscretization *MEDCouplingNoTimeLabel::aggregate(const MEDCouplingTimeDiscretization *other) const
-{
-  const MEDCouplingNoTimeLabel *otherC=dynamic_cast<const MEDCouplingNoTimeLabel *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("NoTimeLabel::aggregation on mismatched time discretization !");
-  MEDCouplingNoTimeLabel *ret=new MEDCouplingNoTimeLabel;
-  ret->setTimeTolerance(getTimeTolerance());
-  DataArrayDouble *arr=DataArrayDouble::aggregate(getArray(),other->getArray());
-  ret->setArray(arr,0);
-  arr->decrRef();
-  return ret;
-}
-
-MEDCouplingTimeDiscretization *MEDCouplingNoTimeLabel::add(const MEDCouplingTimeDiscretization *other) const
-{
-  const MEDCouplingNoTimeLabel *otherC=dynamic_cast<const MEDCouplingNoTimeLabel *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("NoTimeLabel::add on mismatched time discretization !");
-  MEDCouplingNoTimeLabel *ret=new MEDCouplingNoTimeLabel;
-  DataArrayDouble *arr=DataArrayDouble::add(getArray(),other->getArray());
-  ret->setArray(arr,0);
-  arr->decrRef();
-  return ret;
-}
-
-void MEDCouplingNoTimeLabel::addEqual(const MEDCouplingTimeDiscretization *other)
-{
-  const MEDCouplingNoTimeLabel *otherC=dynamic_cast<const MEDCouplingNoTimeLabel *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("NoTimeLabel::addEqual on mismatched time discretization !");
-  getArray()->addEqual(other->getArray());
-}
-
-MEDCouplingTimeDiscretization *MEDCouplingNoTimeLabel::substract(const MEDCouplingTimeDiscretization *other) const
-{
-  const MEDCouplingNoTimeLabel *otherC=dynamic_cast<const MEDCouplingNoTimeLabel *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("NoTimeLabel::substract on mismatched time discretization !");
-  MEDCouplingNoTimeLabel *ret=new MEDCouplingNoTimeLabel;
-  DataArrayDouble *arr=DataArrayDouble::substract(getArray(),other->getArray());
-  ret->setArray(arr,0);
-  arr->decrRef();
-  return ret;
-}
-
-void MEDCouplingNoTimeLabel::substractEqual(const MEDCouplingTimeDiscretization *other)
-{
-  const MEDCouplingNoTimeLabel *otherC=dynamic_cast<const MEDCouplingNoTimeLabel *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("NoTimeLabel::substractEqual on mismatched time discretization !");
-  getArray()->substractEqual(other->getArray());
-}
-
-MEDCouplingTimeDiscretization *MEDCouplingNoTimeLabel::multiply(const MEDCouplingTimeDiscretization *other) const
-{
-  const MEDCouplingNoTimeLabel *otherC=dynamic_cast<const MEDCouplingNoTimeLabel *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("NoTimeLabel::multiply on mismatched time discretization !");
-  MEDCouplingNoTimeLabel *ret=new MEDCouplingNoTimeLabel;
-  DataArrayDouble *arr=DataArrayDouble::multiply(getArray(),other->getArray());
-  ret->setArray(arr,0);
-  arr->decrRef();
-  return ret;
-}
-
-void MEDCouplingNoTimeLabel::multiplyEqual(const MEDCouplingTimeDiscretization *other)
-{
-  const MEDCouplingNoTimeLabel *otherC=dynamic_cast<const MEDCouplingNoTimeLabel *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("NoTimeLabel::multiplyEqual on mismatched time discretization !");
-  getArray()->multiplyEqual(other->getArray());
-}
-
-MEDCouplingTimeDiscretization *MEDCouplingNoTimeLabel::divide(const MEDCouplingTimeDiscretization *other) const
-{
-  const MEDCouplingNoTimeLabel *otherC=dynamic_cast<const MEDCouplingNoTimeLabel *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("divide on mismatched time discretization !");
-  MEDCouplingNoTimeLabel *ret=new MEDCouplingNoTimeLabel;
-  DataArrayDouble *arr=DataArrayDouble::divide(getArray(),other->getArray());
-  ret->setArray(arr,0);
-  arr->decrRef();
-  return ret;
-}
-
-void MEDCouplingNoTimeLabel::divideEqual(const MEDCouplingTimeDiscretization *other)
-{
-  const MEDCouplingNoTimeLabel *otherC=dynamic_cast<const MEDCouplingNoTimeLabel *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("NoTimeLabel::divideEqual on mismatched time discretization !");
-  getArray()->divideEqual(other->getArray());
-}
-
-MEDCouplingTimeDiscretization *MEDCouplingNoTimeLabel::performCpy(bool deepCpy) const
-{
-  return new MEDCouplingNoTimeLabel(*this,deepCpy);
-}
-
-void MEDCouplingNoTimeLabel::checkTimePresence(double time) const throw(INTERP_KERNEL::Exception)
-{
-  throw INTERP_KERNEL::Exception(EXCEPTION_MSG);
-}
-
-std::vector< const DataArrayDouble *> MEDCouplingNoTimeLabel::getArraysForTime(double time) const throw(INTERP_KERNEL::Exception)
-{
-  throw INTERP_KERNEL::Exception(EXCEPTION_MSG);
-}
-
-void MEDCouplingNoTimeLabel::getValueForTime(double time, const std::vector<double>& vals, double *res) const
-{
-  throw INTERP_KERNEL::Exception(EXCEPTION_MSG);
-}
-
-bool MEDCouplingNoTimeLabel::isBefore(const MEDCouplingTimeDiscretization *other) const throw(INTERP_KERNEL::Exception)
-{
-  throw INTERP_KERNEL::Exception(EXCEPTION_MSG);
-}
-
-bool MEDCouplingNoTimeLabel::isStrictlyBefore(const MEDCouplingTimeDiscretization *other) const throw(INTERP_KERNEL::Exception)
-{
-  throw INTERP_KERNEL::Exception(EXCEPTION_MSG);
-}
-
-double MEDCouplingNoTimeLabel::getStartTime(int& dt, int& it) const throw(INTERP_KERNEL::Exception)
-{
-  throw INTERP_KERNEL::Exception(EXCEPTION_MSG);
-}
-
-double MEDCouplingNoTimeLabel::getEndTime(int& dt, int& it) const throw(INTERP_KERNEL::Exception)
-{
-  throw INTERP_KERNEL::Exception(EXCEPTION_MSG);
-}
-
-void MEDCouplingNoTimeLabel::setStartTime(double time, int dt, int it) throw(INTERP_KERNEL::Exception)
-{
-  throw INTERP_KERNEL::Exception(EXCEPTION_MSG);
-}
-
-void MEDCouplingNoTimeLabel::setEndTime(double time, int dt, int it) throw(INTERP_KERNEL::Exception)
-{
-  throw INTERP_KERNEL::Exception(EXCEPTION_MSG);
-}
-
-void MEDCouplingNoTimeLabel::getValueOnTime(int eltId, double time, double *value) const throw(INTERP_KERNEL::Exception)
-{
-  throw INTERP_KERNEL::Exception(EXCEPTION_MSG);
-}
-
-void MEDCouplingNoTimeLabel::getValueOnDiscTime(int eltId, int dt, int it, double *value) const throw(INTERP_KERNEL::Exception)
-{
-  throw INTERP_KERNEL::Exception(EXCEPTION_MSG);
-}
-
-MEDCouplingWithTimeStep::MEDCouplingWithTimeStep(const MEDCouplingWithTimeStep& other, bool deepCpy):MEDCouplingTimeDiscretization(other,deepCpy),
-                                                                                                     _time(other._time),_dt(other._dt),_it(other._it)
-{
-}
-
-MEDCouplingWithTimeStep::MEDCouplingWithTimeStep():_time(0.),_dt(-1),_it(-1)
-{
-}
-
-void MEDCouplingWithTimeStep::getTinySerializationIntInformation(std::vector<int>& tinyInfo) const
-{
-  MEDCouplingTimeDiscretization::getTinySerializationIntInformation(tinyInfo);
-  tinyInfo.push_back(_dt);
-  tinyInfo.push_back(_it);
-}
-
-void MEDCouplingWithTimeStep::getTinySerializationDbleInformation(std::vector<double>& tinyInfo) const
-{
-  MEDCouplingTimeDiscretization::getTinySerializationDbleInformation(tinyInfo);
-  tinyInfo.push_back(_time);
-}
-
-void MEDCouplingWithTimeStep::finishUnserialization(const std::vector<int>& tinyInfoI, const std::vector<double>& tinyInfoD, const std::vector<std::string>& tinyInfoS)
-{
-  MEDCouplingTimeDiscretization::finishUnserialization(tinyInfoI,tinyInfoD,tinyInfoS);
-  _time=tinyInfoD[1];
-  _dt=tinyInfoI[2];
-  _it=tinyInfoI[3];
-}
-
-bool MEDCouplingWithTimeStep::areCompatible(const MEDCouplingTimeDiscretization *other) const
-{
-  if(!MEDCouplingTimeDiscretization::areCompatible(other))
-    return false;
-  const MEDCouplingWithTimeStep *otherC=dynamic_cast<const MEDCouplingWithTimeStep *>(other);
-  if(!otherC)
-    return false;
-  return std::fabs(_time-otherC->_time)<_time_tolerance;
-}
-
-bool MEDCouplingWithTimeStep::areCompatibleForMul(const MEDCouplingTimeDiscretization *other) const
-{
-  if(!MEDCouplingTimeDiscretization::areCompatibleForMul(other))
-    return false;
-  const MEDCouplingWithTimeStep *otherC=dynamic_cast<const MEDCouplingWithTimeStep *>(other);
-  if(!otherC)
-    return false;
-  return std::fabs(_time-otherC->_time)<_time_tolerance;
-}
-
-bool MEDCouplingWithTimeStep::isEqual(const MEDCouplingTimeDiscretization *other, double prec) const
-{
-  const MEDCouplingWithTimeStep *otherC=dynamic_cast<const MEDCouplingWithTimeStep *>(other);
-  if(!otherC)
-    return false;
-  if(_dt!=otherC->_dt)
-    return false;
-  if(_it!=otherC->_it)
-    return false;
-  if(std::fabs(_time-otherC->_time)>_time_tolerance)
-    return false;
-  return MEDCouplingTimeDiscretization::isEqual(other,prec);
-}
-
-MEDCouplingTimeDiscretization *MEDCouplingWithTimeStep::aggregate(const MEDCouplingTimeDiscretization *other) const
-{
-  const MEDCouplingWithTimeStep *otherC=dynamic_cast<const MEDCouplingWithTimeStep *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("WithTimeStep::aggregation on mismatched time discretization !");
-  MEDCouplingWithTimeStep *ret=new MEDCouplingWithTimeStep;
-  ret->setTimeTolerance(getTimeTolerance());
-  DataArrayDouble *arr=DataArrayDouble::aggregate(getArray(),other->getArray());
-  ret->setArray(arr,0);
-  arr->decrRef();
-  int tmp1,tmp2;
-  double tmp3=getStartTime(tmp1,tmp2);
-  ret->setStartTime(tmp3,tmp1,tmp2);
-  return ret;
-}
-
-MEDCouplingTimeDiscretization *MEDCouplingWithTimeStep::add(const MEDCouplingTimeDiscretization *other) const
-{
-  const MEDCouplingWithTimeStep *otherC=dynamic_cast<const MEDCouplingWithTimeStep *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("WithTimeStep::add on mismatched time discretization !");
-  MEDCouplingWithTimeStep *ret=new MEDCouplingWithTimeStep;
-  DataArrayDouble *arr=DataArrayDouble::add(getArray(),other->getArray());
-  ret->setArray(arr,0);
-  arr->decrRef();
-  int tmp1,tmp2;
-  double tmp3=getStartTime(tmp1,tmp2);
-  ret->setStartTime(tmp3,tmp1,tmp2);
-  return ret;
-}
-
-void MEDCouplingWithTimeStep::addEqual(const MEDCouplingTimeDiscretization *other)
-{
-  const MEDCouplingWithTimeStep *otherC=dynamic_cast<const MEDCouplingWithTimeStep *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("WithTimeStep::addEqual on mismatched time discretization !");
-  getArray()->addEqual(other->getArray());
-}
-
-MEDCouplingTimeDiscretization *MEDCouplingWithTimeStep::substract(const MEDCouplingTimeDiscretization *other) const
-{
-  const MEDCouplingWithTimeStep *otherC=dynamic_cast<const MEDCouplingWithTimeStep *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("WithTimeStep::substract on mismatched time discretization !");
-  MEDCouplingWithTimeStep *ret=new MEDCouplingWithTimeStep;
-  DataArrayDouble *arr=DataArrayDouble::substract(getArray(),other->getArray());
-  ret->setArray(arr,0);
-  arr->decrRef();
-  int tmp1,tmp2;
-  double tmp3=getStartTime(tmp1,tmp2);
-  ret->setStartTime(tmp3,tmp1,tmp2);
-  return ret;
-}
-
-void MEDCouplingWithTimeStep::substractEqual(const MEDCouplingTimeDiscretization *other)
-{
-  const MEDCouplingWithTimeStep *otherC=dynamic_cast<const MEDCouplingWithTimeStep *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("WithTimeStep::substractEqual on mismatched time discretization !");
-  getArray()->substractEqual(other->getArray());
-}
-
-MEDCouplingTimeDiscretization *MEDCouplingWithTimeStep::multiply(const MEDCouplingTimeDiscretization *other) const
-{
-  const MEDCouplingWithTimeStep *otherC=dynamic_cast<const MEDCouplingWithTimeStep *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("WithTimeStep::multiply on mismatched time discretization !");
-  MEDCouplingWithTimeStep *ret=new MEDCouplingWithTimeStep;
-  DataArrayDouble *arr=DataArrayDouble::multiply(getArray(),other->getArray());
-  ret->setArray(arr,0);
-  arr->decrRef();
-  int tmp1,tmp2;
-  double tmp3=getStartTime(tmp1,tmp2);
-  ret->setStartTime(tmp3,tmp1,tmp2);
-  return ret;
-}
-
-void MEDCouplingWithTimeStep::multiplyEqual(const MEDCouplingTimeDiscretization *other)
-{
-  const MEDCouplingWithTimeStep *otherC=dynamic_cast<const MEDCouplingWithTimeStep *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("WithTimeStep::multiplyEqual on mismatched time discretization !");
-  getArray()->multiplyEqual(other->getArray());
-}
-
-MEDCouplingTimeDiscretization *MEDCouplingWithTimeStep::divide(const MEDCouplingTimeDiscretization *other) const
-{
-  const MEDCouplingWithTimeStep *otherC=dynamic_cast<const MEDCouplingWithTimeStep *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("WithTimeStep::divide on mismatched time discretization !");
-  MEDCouplingWithTimeStep *ret=new MEDCouplingWithTimeStep;
-  DataArrayDouble *arr=DataArrayDouble::divide(getArray(),other->getArray());
-  ret->setArray(arr,0);
-  arr->decrRef();
-  int tmp1,tmp2;
-  double tmp3=getStartTime(tmp1,tmp2);
-  ret->setStartTime(tmp3,tmp1,tmp2);
-  return ret;
-}
-
-void MEDCouplingWithTimeStep::divideEqual(const MEDCouplingTimeDiscretization *other)
-{
-  const MEDCouplingWithTimeStep *otherC=dynamic_cast<const MEDCouplingWithTimeStep *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("WithTimeStep::divideEqual on mismatched time discretization !");
-  getArray()->divideEqual(other->getArray());
-}
-
-MEDCouplingTimeDiscretization *MEDCouplingWithTimeStep::performCpy(bool deepCpy) const
-{
-  return new MEDCouplingWithTimeStep(*this,deepCpy);
-}
-
-void MEDCouplingWithTimeStep::checkNoTimePresence() const throw(INTERP_KERNEL::Exception)
-{
-  throw INTERP_KERNEL::Exception("No time specified on a field defined on one time");
-}
-
-void MEDCouplingWithTimeStep::checkTimePresence(double time) const throw(INTERP_KERNEL::Exception)
-{
-  if(std::fabs(time-_time)>_time_tolerance)
-    {
-      std::ostringstream stream;
-      stream << "The field is defined on time " << _time << " with eps=" << _time_tolerance << " and asking time = " << time << " !";
-      throw INTERP_KERNEL::Exception(stream.str().c_str());
-    }
-}
-
-std::vector< const DataArrayDouble *> MEDCouplingWithTimeStep::getArraysForTime(double time) const throw(INTERP_KERNEL::Exception)
-{
-  if(std::fabs(time-_time)<=_time_tolerance)
-    {
-      std::vector< const DataArrayDouble *> ret(1);
-      ret[0]=_array;
-      return ret;
-    }
-  else
-    throw INTERP_KERNEL::Exception(EXCEPTION_MSG);
-}
-
-void MEDCouplingWithTimeStep::getValueForTime(double time, const std::vector<double>& vals, double *res) const
-{
-  std::copy(vals.begin(),vals.end(),res);
-}
-
-void MEDCouplingWithTimeStep::getValueOnTime(int eltId, double time, double *value) const throw(INTERP_KERNEL::Exception)
-{
-  if(std::fabs(time-_time)<=_time_tolerance)
-    if(_array)
-      _array->getTuple(eltId,value);
-    else
-      throw INTERP_KERNEL::Exception("No array existing.");
-  else
-    throw INTERP_KERNEL::Exception(EXCEPTION_MSG);
-}
-
-void MEDCouplingWithTimeStep::getValueOnDiscTime(int eltId, int dt, int it, double *value) const throw(INTERP_KERNEL::Exception)
-{
-  if(_dt==dt && _it==it)
-    if(_array)
-      _array->getTuple(eltId,value);
-    else
-      throw INTERP_KERNEL::Exception("No array existing.");
-  else
-    throw INTERP_KERNEL::Exception("No data on this discrete time.");
-}
-
-MEDCouplingConstOnTimeInterval::MEDCouplingConstOnTimeInterval():_start_time(0.),_end_time(0.),_start_dt(-1),_end_dt(-1),_start_it(-1),_end_it(-1)
-{
-}
-
-void MEDCouplingConstOnTimeInterval::getTinySerializationIntInformation(std::vector<int>& tinyInfo) const
-{
-  MEDCouplingTimeDiscretization::getTinySerializationIntInformation(tinyInfo);
-  tinyInfo.push_back(_start_dt);
-  tinyInfo.push_back(_start_it);
-  tinyInfo.push_back(_end_dt);
-  tinyInfo.push_back(_end_it);
-}
-
-void MEDCouplingConstOnTimeInterval::getTinySerializationDbleInformation(std::vector<double>& tinyInfo) const
-{
-  MEDCouplingTimeDiscretization::getTinySerializationDbleInformation(tinyInfo);
-  tinyInfo.push_back(_start_time);
-  tinyInfo.push_back(_end_time);
-}
-
-void MEDCouplingConstOnTimeInterval::finishUnserialization(const std::vector<int>& tinyInfoI, const std::vector<double>& tinyInfoD, const std::vector<std::string>& tinyInfoS)
-{
-  MEDCouplingTimeDiscretization::finishUnserialization(tinyInfoI,tinyInfoD,tinyInfoS);
-  _start_time=tinyInfoD[1];
-  _end_time=tinyInfoD[2];
-  _start_dt=tinyInfoI[2];
-  _start_it=tinyInfoI[3];
-  _end_dt=tinyInfoI[4];
-  _end_it=tinyInfoI[5];
-}
-
-MEDCouplingConstOnTimeInterval::MEDCouplingConstOnTimeInterval(const MEDCouplingConstOnTimeInterval& other, bool deepCpy):
-  MEDCouplingTimeDiscretization(other,deepCpy),_start_time(other._start_time),_end_time(other._end_time),_start_dt(other._start_dt),
-  _end_dt(other._end_dt),_start_it(other._start_it),_end_it(other._end_it)
-{
-}
-
-MEDCouplingTimeDiscretization *MEDCouplingConstOnTimeInterval::performCpy(bool deepCpy) const
-{
-  return new MEDCouplingConstOnTimeInterval(*this,deepCpy);
-}
-
-std::vector< const DataArrayDouble *> MEDCouplingConstOnTimeInterval::getArraysForTime(double time) const throw(INTERP_KERNEL::Exception)
-{
-  if(time>_start_time-_time_tolerance && time<_end_time+_time_tolerance)
-    {
-      std::vector< const DataArrayDouble *> ret(1);
-      ret[0]=_array;
-      return ret;
-    }
-  else
-    throw INTERP_KERNEL::Exception(EXCEPTION_MSG);
-}
-
-void MEDCouplingConstOnTimeInterval::getValueForTime(double time, const std::vector<double>& vals, double *res) const
-{
-  std::copy(vals.begin(),vals.end(),res);
-}
-
-bool MEDCouplingConstOnTimeInterval::areCompatible(const MEDCouplingTimeDiscretization *other) const
-{
-  if(!MEDCouplingTimeDiscretization::areCompatible(other))
-    return false;
-  const MEDCouplingConstOnTimeInterval *otherC=dynamic_cast<const MEDCouplingConstOnTimeInterval *>(other);
-  if(!otherC)
-    return false;
-  return (std::fabs(_start_time-otherC->_start_time)<_time_tolerance && std::fabs(_end_time-otherC->_end_time)<_time_tolerance);
-}
-
-bool MEDCouplingConstOnTimeInterval::areCompatibleForMul(const MEDCouplingTimeDiscretization *other) const
-{
-  if(!MEDCouplingTimeDiscretization::areCompatible(other))
-    return false;
-  const MEDCouplingConstOnTimeInterval *otherC=dynamic_cast<const MEDCouplingConstOnTimeInterval *>(other);
-  if(!otherC)
-    return false;
-  return (std::fabs(_start_time-otherC->_start_time)<_time_tolerance && std::fabs(_end_time-otherC->_end_time)<_time_tolerance);
-}
-
-bool MEDCouplingConstOnTimeInterval::isEqual(const MEDCouplingTimeDiscretization *other, double prec) const
-{
-  const MEDCouplingConstOnTimeInterval *otherC=dynamic_cast<const MEDCouplingConstOnTimeInterval *>(other);
-  if(!otherC)
-    return false;
-  if(_start_dt!=otherC->_start_dt)
-    return false;
-  if(_start_it!=otherC->_start_it)
-    return false;
-  if(std::fabs(_start_time-otherC->_start_time)>_time_tolerance)
-    return false;
-  if(_end_dt!=otherC->_end_dt)
-    return false;
-  if(_end_it!=otherC->_end_it)
-    return false;
-  if(std::fabs(_end_time-otherC->_end_time)>_time_tolerance)
-    return false;
-  return MEDCouplingTimeDiscretization::isEqual(other,prec);
-}
-
-void MEDCouplingConstOnTimeInterval::getValueOnTime(int eltId, double time, double *value) const throw(INTERP_KERNEL::Exception)
-{
-  if(time>_start_time-_time_tolerance && time<_end_time+_time_tolerance)
-    if(_array)
-      _array->getTuple(eltId,value);
-    else
-      throw INTERP_KERNEL::Exception("No array existing.");
-  else
-    throw INTERP_KERNEL::Exception(EXCEPTION_MSG);
-}
-
-void MEDCouplingConstOnTimeInterval::getValueOnDiscTime(int eltId, int dt, int it, double *value) const throw(INTERP_KERNEL::Exception)
-{
-  if(dt>=_start_dt && dt<=_end_dt)
-    if(_array)
-      _array->getTuple(eltId,value);
-    else
-      throw INTERP_KERNEL::Exception("No array existing.");
-  else
-    throw INTERP_KERNEL::Exception(EXCEPTION_MSG);
-}
-
-void MEDCouplingConstOnTimeInterval::checkNoTimePresence() const throw(INTERP_KERNEL::Exception)
-{
-  throw INTERP_KERNEL::Exception("No time specified on a field defined as constant on one time interval");
-}
-
-void MEDCouplingConstOnTimeInterval::checkTimePresence(double time) const throw(INTERP_KERNEL::Exception)
-{
-  if(time<_start_time-_time_tolerance || time>_end_time+_time_tolerance)
-    {
-      std::ostringstream stream;
-      stream << "The field is defined between times " << _start_time << " and " << _end_time << " with tolerance ";
-      stream << _time_tolerance << " and trying to access on time = " << time;
-      throw INTERP_KERNEL::Exception(stream.str().c_str());
-    }
-}
-
-MEDCouplingTimeDiscretization *MEDCouplingConstOnTimeInterval::aggregate(const MEDCouplingTimeDiscretization *other) const
-{
-   const MEDCouplingConstOnTimeInterval *otherC=dynamic_cast<const MEDCouplingConstOnTimeInterval *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("ConstOnTimeInterval::aggregation on mismatched time discretization !");
-  MEDCouplingConstOnTimeInterval *ret=new MEDCouplingConstOnTimeInterval;
-  ret->setTimeTolerance(getTimeTolerance());
-  DataArrayDouble *arr=DataArrayDouble::aggregate(getArray(),other->getArray());
-  ret->setArray(arr,0);
-  arr->decrRef();
-  int tmp1,tmp2;
-  double tmp3=getStartTime(tmp1,tmp2);
-  ret->setStartTime(tmp3,tmp1,tmp2);
-  tmp3=getEndTime(tmp1,tmp2);
-  ret->setEndTime(tmp3,tmp1,tmp2);
-  return ret;
-}
-
-MEDCouplingTimeDiscretization *MEDCouplingConstOnTimeInterval::add(const MEDCouplingTimeDiscretization *other) const
-{
-  const MEDCouplingConstOnTimeInterval *otherC=dynamic_cast<const MEDCouplingConstOnTimeInterval *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("ConstOnTimeInterval::add on mismatched time discretization !");
-  MEDCouplingConstOnTimeInterval *ret=new MEDCouplingConstOnTimeInterval;
-  DataArrayDouble *arr=DataArrayDouble::add(getArray(),other->getArray());
-  ret->setArray(arr,0);
-  arr->decrRef();
-  int tmp1,tmp2;
-  double tmp3=getStartTime(tmp1,tmp2);
-  ret->setStartTime(tmp3,tmp1,tmp2);
-  tmp3=getEndTime(tmp1,tmp2);
-  ret->setEndTime(tmp3,tmp1,tmp2);
-  return ret;
-}
-
-void MEDCouplingConstOnTimeInterval::addEqual(const MEDCouplingTimeDiscretization *other)
-{
-  const MEDCouplingConstOnTimeInterval *otherC=dynamic_cast<const MEDCouplingConstOnTimeInterval *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("ConstOnTimeInterval::addEqual on mismatched time discretization !");
-  getArray()->addEqual(other->getArray());
-}
- 
-MEDCouplingTimeDiscretization *MEDCouplingConstOnTimeInterval::substract(const MEDCouplingTimeDiscretization *other) const
-{
-  const MEDCouplingConstOnTimeInterval *otherC=dynamic_cast<const MEDCouplingConstOnTimeInterval *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("ConstOnTimeInterval::substract on mismatched time discretization !");
-  MEDCouplingConstOnTimeInterval *ret=new MEDCouplingConstOnTimeInterval;
-  DataArrayDouble *arr=DataArrayDouble::substract(getArray(),other->getArray());
-  ret->setArray(arr,0);
-  arr->decrRef();
-  int tmp1,tmp2;
-  double tmp3=getStartTime(tmp1,tmp2);
-  ret->setStartTime(tmp3,tmp1,tmp2);
-  tmp3=getEndTime(tmp1,tmp2);
-  ret->setEndTime(tmp3,tmp1,tmp2);
-  return ret;
-}
-
-void MEDCouplingConstOnTimeInterval::substractEqual(const MEDCouplingTimeDiscretization *other)
-{
-  const MEDCouplingConstOnTimeInterval *otherC=dynamic_cast<const MEDCouplingConstOnTimeInterval *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("ConstOnTimeInterval::substractEqual on mismatched time discretization !");
-  getArray()->substractEqual(other->getArray());
-}
-
-MEDCouplingTimeDiscretization *MEDCouplingConstOnTimeInterval::multiply(const MEDCouplingTimeDiscretization *other) const
-{
-  const MEDCouplingConstOnTimeInterval *otherC=dynamic_cast<const MEDCouplingConstOnTimeInterval *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("multiply on mismatched time discretization !");
-  MEDCouplingConstOnTimeInterval *ret=new MEDCouplingConstOnTimeInterval;
-  DataArrayDouble *arr=DataArrayDouble::multiply(getArray(),other->getArray());
-  ret->setArray(arr,0);
-  arr->decrRef();
-  int tmp1,tmp2;
-  double tmp3=getStartTime(tmp1,tmp2);
-  ret->setStartTime(tmp3,tmp1,tmp2);
-  tmp3=getEndTime(tmp1,tmp2);
-  ret->setEndTime(tmp3,tmp1,tmp2);
-  return ret;
-}
-
-void MEDCouplingConstOnTimeInterval::multiplyEqual(const MEDCouplingTimeDiscretization *other)
-{
-  const MEDCouplingConstOnTimeInterval *otherC=dynamic_cast<const MEDCouplingConstOnTimeInterval *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("ConstOnTimeInterval::multiplyEqual on mismatched time discretization !");
-  getArray()->multiplyEqual(other->getArray());
-}
-
-MEDCouplingTimeDiscretization *MEDCouplingConstOnTimeInterval::divide(const MEDCouplingTimeDiscretization *other) const
-{
-  const MEDCouplingConstOnTimeInterval *otherC=dynamic_cast<const MEDCouplingConstOnTimeInterval *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("divide on mismatched time discretization !");
-  MEDCouplingConstOnTimeInterval *ret=new MEDCouplingConstOnTimeInterval;
-  DataArrayDouble *arr=DataArrayDouble::divide(getArray(),other->getArray());
-  ret->setArray(arr,0);
-  arr->decrRef();
-  int tmp1,tmp2;
-  double tmp3=getStartTime(tmp1,tmp2);
-  ret->setStartTime(tmp3,tmp1,tmp2);
-  tmp3=getEndTime(tmp1,tmp2);
-  ret->setEndTime(tmp3,tmp1,tmp2);
-  return ret;
-}
-
-void MEDCouplingConstOnTimeInterval::divideEqual(const MEDCouplingTimeDiscretization *other)
-{
-  const MEDCouplingConstOnTimeInterval *otherC=dynamic_cast<const MEDCouplingConstOnTimeInterval *>(other);
-  if(!otherC)
-    throw INTERP_KERNEL::Exception("ConstOnTimeInterval::divideEqual on mismatched time discretization !");
-  getArray()->divideEqual(other->getArray());
-}
-
-MEDCouplingTwoTimeSteps::MEDCouplingTwoTimeSteps():_start_time(0.),_end_time(0.),_start_dt(-1),_end_dt(-1),_start_it(-1),_end_it(-1),_end_array(0)
-{
-}
-
-MEDCouplingTwoTimeSteps::~MEDCouplingTwoTimeSteps()
-{
-  if(_end_array)
-    _end_array->decrRef();
-}
-
-void MEDCouplingTwoTimeSteps::checkNoTimePresence() const throw(INTERP_KERNEL::Exception)
-{
-  throw INTERP_KERNEL::Exception("The field presents a time to be specified in every access !");
-}
-
-void MEDCouplingTwoTimeSteps::checkTimePresence(double time) const throw(INTERP_KERNEL::Exception)
-{
-  if(time<_start_time-_time_tolerance || time>_end_time+_time_tolerance)
-    {
-      std::ostringstream stream;
-      stream << "The field is defined between times " << _start_time << " and " << _end_time << " with tolerance ";
-      stream << _time_tolerance << " and trying to access on time = " << time;
-      throw INTERP_KERNEL::Exception(stream.str().c_str());
-    }
-}
-
-void MEDCouplingTwoTimeSteps::getArrays(std::vector<DataArrayDouble *>& arrays) const
-{
-  arrays.resize(2);
-  arrays[0]=_array;
-  arrays[1]=_end_array;
-}
-
-void MEDCouplingTwoTimeSteps::resizeForUnserialization(const std::vector<int>& tinyInfoI, std::vector<DataArrayDouble *>& arrays)
-{
-  arrays.resize(2);
-  if(_array!=0)
-    _array->decrRef();
-  if(_end_array!=0)
-    _end_array->decrRef();
-  DataArrayDouble *arr=0;
-  if(tinyInfoI[0]!=-1 && tinyInfoI[1]!=-1)
-    {
-      arr=DataArrayDouble::New();
-      arr->alloc(tinyInfoI[0],tinyInfoI[1]);
-    }
-  _array=arr;
-  arrays[0]=arr;
-  arr=0;
-  if(tinyInfoI[2]!=-1 && tinyInfoI[3]!=-1)
-    {
-      arr=DataArrayDouble::New();
-      arr->alloc(tinyInfoI[2],tinyInfoI[3]);
-    }
-  _end_array=arr;
-  arrays[1]=arr;
-}
-
-void MEDCouplingTwoTimeSteps::finishUnserialization(const std::vector<int>& tinyInfoI, const std::vector<double>& tinyInfoD, const std::vector<std::string>& tinyInfoS)
-{
-  MEDCouplingTimeDiscretization::finishUnserialization(tinyInfoI,tinyInfoD,tinyInfoS);
-  _start_time=tinyInfoD[1];
-  _end_time=tinyInfoD[2];
-  _start_dt=tinyInfoI[2];
-  _end_dt=tinyInfoI[3];
-  _start_it=tinyInfoI[4];
-  _end_it=tinyInfoI[5];
-}
diff --git a/src/MEDCoupling/MEDCouplingTimeDiscretization.hxx b/src/MEDCoupling/MEDCouplingTimeDiscretization.hxx
deleted file mode 100644
index 8ea2f8c6d..000000000
--- a/src/MEDCoupling/MEDCouplingTimeDiscretization.hxx
+++ /dev/null
@@ -1,260 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __MEDCOUPLINGTIMEDISCRETIZATION_HXX__
-#define __MEDCOUPLINGTIMEDISCRETIZATION_HXX__
-
-#include "MEDCoupling.hxx"
-#include "MEDCouplingTimeLabel.hxx"
-#include "MEDCouplingRefCountObject.hxx"
-#include "InterpKernelException.hxx"
-
-#include <vector>
-
-namespace ParaMEDMEM
-{
-  class DataArrayDouble;
-  class TimeLabel;
-
-  class MEDCOUPLING_EXPORT MEDCouplingTimeDiscretization : public TimeLabel
-  {
-  protected:
-    MEDCouplingTimeDiscretization();
-    MEDCouplingTimeDiscretization(const MEDCouplingTimeDiscretization& other, bool deepCpy);
-  public:
-    void updateTime();
-    static MEDCouplingTimeDiscretization *New(TypeOfTimeDiscretization type);
-    virtual bool areCompatible(const MEDCouplingTimeDiscretization *other) const;
-    virtual bool areCompatibleForMul(const MEDCouplingTimeDiscretization *other) const;
-    virtual bool isEqual(const MEDCouplingTimeDiscretization *other, double prec) const;
-    virtual MEDCouplingTimeDiscretization *buildNewTimeReprFromThis(const MEDCouplingTimeDiscretization *other,
-                                                                    TypeOfTimeDiscretization type, bool deepCpy) const;
-    virtual TypeOfTimeDiscretization getEnum() const = 0;
-    virtual MEDCouplingTimeDiscretization *aggregate(const MEDCouplingTimeDiscretization *other) const = 0;
-    virtual MEDCouplingTimeDiscretization *add(const MEDCouplingTimeDiscretization *other) const = 0;
-    virtual void addEqual(const MEDCouplingTimeDiscretization *other) = 0;
-    virtual MEDCouplingTimeDiscretization *substract(const MEDCouplingTimeDiscretization *other) const = 0;
-    virtual void substractEqual(const MEDCouplingTimeDiscretization *other) = 0;
-    virtual MEDCouplingTimeDiscretization *multiply(const MEDCouplingTimeDiscretization *other) const = 0;
-    virtual void multiplyEqual(const MEDCouplingTimeDiscretization *other) = 0;
-    virtual MEDCouplingTimeDiscretization *divide(const MEDCouplingTimeDiscretization *other) const = 0;
-    virtual void divideEqual(const MEDCouplingTimeDiscretization *other) = 0;
-    virtual void getTinySerializationIntInformation(std::vector<int>& tinyInfo) const;
-    virtual void getTinySerializationDbleInformation(std::vector<double>& tinyInfo) const;
-    virtual void getTinySerializationStrInformation(std::vector<std::string>& tinyInfo) const;
-    virtual void resizeForUnserialization(const std::vector<int>& tinyInfoI, std::vector<DataArrayDouble *>& arrays);
-    virtual void finishUnserialization(const std::vector<int>& tinyInfoI, const std::vector<double>& tinyInfoD, const std::vector<std::string>& tinyInfoS);
-    virtual MEDCouplingTimeDiscretization *performCpy(bool deepCpy) const = 0;
-    void setTimeTolerance(double val) { _time_tolerance=val; }
-    double getTimeTolerance() const { return _time_tolerance; }
-    virtual void checkNoTimePresence() const throw(INTERP_KERNEL::Exception) = 0;
-    virtual void checkTimePresence(double time) const throw(INTERP_KERNEL::Exception) = 0;
-    virtual void setArray(DataArrayDouble *array, TimeLabel *owner);
-    virtual void setArrays(const std::vector<DataArrayDouble *>& arrays, TimeLabel *owner) throw(INTERP_KERNEL::Exception);
-    DataArrayDouble *getArray() const { return _array; }
-    virtual DataArrayDouble *getEndArray() const { return _array; }
-    virtual std::vector< const DataArrayDouble *> getArraysForTime(double time) const throw(INTERP_KERNEL::Exception) = 0;
-    virtual void getValueForTime(double time, const std::vector<double>& vals, double *res) const = 0; 
-    virtual void getArrays(std::vector<DataArrayDouble *>& arrays) const;
-    virtual bool isBefore(const MEDCouplingTimeDiscretization *other) const throw(INTERP_KERNEL::Exception);
-    virtual bool isStrictlyBefore(const MEDCouplingTimeDiscretization *other) const throw(INTERP_KERNEL::Exception);
-    double getTime(int& dt, int& it) const throw(INTERP_KERNEL::Exception) { return getStartTime(dt,it); }
-    virtual double getStartTime(int& dt, int& it) const throw(INTERP_KERNEL::Exception) = 0;
-    virtual double getEndTime(int& dt, int& it) const throw(INTERP_KERNEL::Exception) = 0;
-    void setTime(double time, int dt, int it) throw(INTERP_KERNEL::Exception) { setStartTime(time,dt,it); }
-    virtual void setStartTime(double time, int dt, int it) throw(INTERP_KERNEL::Exception) = 0;
-    virtual void setEndTime(double time, int dt, int it) throw(INTERP_KERNEL::Exception) = 0;
-    virtual void getValueOnTime(int eltId, double time, double *value) const throw(INTERP_KERNEL::Exception) = 0;
-    virtual void getValueOnDiscTime(int eltId, int dt, int it, double *value) const throw(INTERP_KERNEL::Exception) = 0;
-    //
-    virtual void applyLin(double a, double b, int compoId);
-    virtual void applyFunc(int nbOfComp, FunctionToEvaluate func);
-    virtual void applyFunc(int nbOfComp, const char *func);
-    virtual void applyFunc(const char *func);
-    //
-    virtual ~MEDCouplingTimeDiscretization();
-  protected:
-    double _time_tolerance;
-    DataArrayDouble *_array;
-  protected:
-    static const double TIME_TOLERANCE_DFT;
-  };
-
-  class MEDCOUPLING_EXPORT MEDCouplingNoTimeLabel : public MEDCouplingTimeDiscretization
-  {
-  public:
-    MEDCouplingNoTimeLabel();
-    MEDCouplingNoTimeLabel(const MEDCouplingTimeDiscretization& other, bool deepCpy);
-    TypeOfTimeDiscretization getEnum() const { return DISCRETIZATION; }
-    MEDCouplingTimeDiscretization *aggregate(const MEDCouplingTimeDiscretization *other) const;
-    MEDCouplingTimeDiscretization *add(const MEDCouplingTimeDiscretization *other) const;
-    void addEqual(const MEDCouplingTimeDiscretization *other);
-    MEDCouplingTimeDiscretization *substract(const MEDCouplingTimeDiscretization *other) const;
-    void substractEqual(const MEDCouplingTimeDiscretization *other);
-    MEDCouplingTimeDiscretization *multiply(const MEDCouplingTimeDiscretization *other) const;
-    void multiplyEqual(const MEDCouplingTimeDiscretization *other);
-    MEDCouplingTimeDiscretization *divide(const MEDCouplingTimeDiscretization *other) const;
-    void divideEqual(const MEDCouplingTimeDiscretization *other);
-    bool isEqual(const MEDCouplingTimeDiscretization *other, double prec) const;
-    bool areCompatible(const MEDCouplingTimeDiscretization *other) const;
-    bool areCompatibleForMul(const MEDCouplingTimeDiscretization *other) const;
-    MEDCouplingTimeDiscretization *performCpy(bool deepCpy) const;
-    void checkNoTimePresence() const throw(INTERP_KERNEL::Exception) { }
-    void checkTimePresence(double time) const throw(INTERP_KERNEL::Exception);
-    std::vector< const DataArrayDouble *> getArraysForTime(double time) const throw(INTERP_KERNEL::Exception);
-    void getValueForTime(double time, const std::vector<double>& vals, double *res) const;
-    bool isBefore(const MEDCouplingTimeDiscretization *other) const throw(INTERP_KERNEL::Exception);
-    bool isStrictlyBefore(const MEDCouplingTimeDiscretization *other) const throw(INTERP_KERNEL::Exception);
-    double getStartTime(int& dt, int& it) const throw(INTERP_KERNEL::Exception);
-    double getEndTime(int& dt, int& it) const throw(INTERP_KERNEL::Exception);
-    void setStartTime(double time, int dt, int it) throw(INTERP_KERNEL::Exception);
-    void setEndTime(double time, int dt, int it) throw(INTERP_KERNEL::Exception);
-    void getValueOnTime(int eltId, double time, double *value) const throw(INTERP_KERNEL::Exception);
-    void getValueOnDiscTime(int eltId, int dt, int it, double *value) const throw(INTERP_KERNEL::Exception);
-  public:
-    static const TypeOfTimeDiscretization DISCRETIZATION=NO_TIME;
-  private:
-    static const char EXCEPTION_MSG[];
-  };
-
-  class MEDCOUPLING_EXPORT MEDCouplingWithTimeStep : public MEDCouplingTimeDiscretization
-  {
-  protected:
-    MEDCouplingWithTimeStep(const MEDCouplingWithTimeStep& other, bool deepCpy);
-  public:
-    MEDCouplingWithTimeStep();
-    TypeOfTimeDiscretization getEnum() const { return DISCRETIZATION; }
-    MEDCouplingTimeDiscretization *aggregate(const MEDCouplingTimeDiscretization *other) const;
-    MEDCouplingTimeDiscretization *add(const MEDCouplingTimeDiscretization *other) const;
-    void addEqual(const MEDCouplingTimeDiscretization *other);
-    MEDCouplingTimeDiscretization *substract(const MEDCouplingTimeDiscretization *other) const;
-    void substractEqual(const MEDCouplingTimeDiscretization *other);
-    MEDCouplingTimeDiscretization *multiply(const MEDCouplingTimeDiscretization *other) const;
-    void multiplyEqual(const MEDCouplingTimeDiscretization *other);
-    MEDCouplingTimeDiscretization *divide(const MEDCouplingTimeDiscretization *other) const;
-    void divideEqual(const MEDCouplingTimeDiscretization *other);
-    bool isEqual(const MEDCouplingTimeDiscretization *other, double prec) const;
-    bool areCompatible(const MEDCouplingTimeDiscretization *other) const;
-    bool areCompatibleForMul(const MEDCouplingTimeDiscretization *other) const;
-    void getTinySerializationIntInformation(std::vector<int>& tinyInfo) const;
-    void getTinySerializationDbleInformation(std::vector<double>& tinyInfo) const;
-    void finishUnserialization(const std::vector<int>& tinyInfoI, const std::vector<double>& tinyInfoD, const std::vector<std::string>& tinyInfoS);
-    MEDCouplingTimeDiscretization *performCpy(bool deepCpy) const;
-    void checkNoTimePresence() const throw(INTERP_KERNEL::Exception);
-    void checkTimePresence(double time) const throw(INTERP_KERNEL::Exception);
-    void setStartTime(double time, int dt, int it) throw(INTERP_KERNEL::Exception) { _time=time; _dt=dt; _it=it; }
-    void setEndTime(double time, int dt, int it) throw(INTERP_KERNEL::Exception) { _time=time; _dt=dt; _it=it; }
-    double getStartTime(int& dt, int& it) const throw(INTERP_KERNEL::Exception) { dt=_dt; it=_it; return _time; }
-    double getEndTime(int& dt, int& it) const throw(INTERP_KERNEL::Exception) { dt=_dt; it=_it; return _time; }
-    DataArrayDouble *getArrayOnTime(double time) const throw(INTERP_KERNEL::Exception);
-    std::vector< const DataArrayDouble *> getArraysForTime(double time) const throw(INTERP_KERNEL::Exception);
-    void getValueForTime(double time, const std::vector<double>& vals, double *res) const;
-    void getValueOnTime(int eltId, double time, double *value) const throw(INTERP_KERNEL::Exception);
-    void getValueOnDiscTime(int eltId, int dt, int it, double *value) const throw(INTERP_KERNEL::Exception);
-  public:
-    static const TypeOfTimeDiscretization DISCRETIZATION=ONE_TIME;
-  private:
-    static const char EXCEPTION_MSG[];
-  protected:
-    double _time;
-    int _dt;
-    int _it;
-  };
-
-  class MEDCOUPLING_EXPORT MEDCouplingConstOnTimeInterval : public MEDCouplingTimeDiscretization
-  {
-  protected:
-    MEDCouplingConstOnTimeInterval(const MEDCouplingConstOnTimeInterval& other, bool deepCpy);
-  public:
-    MEDCouplingConstOnTimeInterval();
-    void getTinySerializationIntInformation(std::vector<int>& tinyInfo) const;
-    void getTinySerializationDbleInformation(std::vector<double>& tinyInfo) const;
-    void finishUnserialization(const std::vector<int>& tinyInfoI, const std::vector<double>& tinyInfoD, const std::vector<std::string>& tinyInfoS);
-    MEDCouplingTimeDiscretization *performCpy(bool deepCpy) const;
-    bool areCompatible(const MEDCouplingTimeDiscretization *other) const;
-    bool areCompatibleForMul(const MEDCouplingTimeDiscretization *other) const;
-    bool isEqual(const MEDCouplingTimeDiscretization *other, double prec) const;
-    std::vector< const DataArrayDouble *> getArraysForTime(double time) const throw(INTERP_KERNEL::Exception);
-    void getValueForTime(double time, const std::vector<double>& vals, double *res) const;
-    void getValueOnTime(int eltId, double time, double *value) const throw(INTERP_KERNEL::Exception);
-    void getValueOnDiscTime(int eltId, int dt, int it, double *value) const throw(INTERP_KERNEL::Exception);
-    TypeOfTimeDiscretization getEnum() const { return DISCRETIZATION; }
-    MEDCouplingTimeDiscretization *aggregate(const MEDCouplingTimeDiscretization *other) const;
-    MEDCouplingTimeDiscretization *add(const MEDCouplingTimeDiscretization *other) const;
-    void addEqual(const MEDCouplingTimeDiscretization *other);
-    MEDCouplingTimeDiscretization *substract(const MEDCouplingTimeDiscretization *other) const;
-    void substractEqual(const MEDCouplingTimeDiscretization *other);
-    MEDCouplingTimeDiscretization *multiply(const MEDCouplingTimeDiscretization *other) const;
-    void multiplyEqual(const MEDCouplingTimeDiscretization *other);
-    MEDCouplingTimeDiscretization *divide(const MEDCouplingTimeDiscretization *other) const;
-    void divideEqual(const MEDCouplingTimeDiscretization *other);
-    void setStartTime(double time, int dt, int it) throw(INTERP_KERNEL::Exception) { _start_time=time; _start_dt=dt; _start_it=it; }
-    void setEndTime(double time, int dt, int it) throw(INTERP_KERNEL::Exception) { _end_time=time; _end_dt=dt; _end_it=it; }
-    double getStartTime(int& dt, int& it) const throw(INTERP_KERNEL::Exception) { dt=_start_dt; it=_start_it; return _start_time; }
-    double getEndTime(int& dt, int& it) const throw(INTERP_KERNEL::Exception) { dt=_end_dt; it=_end_it; return _end_time; }
-    void checkNoTimePresence() const throw(INTERP_KERNEL::Exception);
-    void checkTimePresence(double time) const throw(INTERP_KERNEL::Exception);
-  public:
-    static const TypeOfTimeDiscretization DISCRETIZATION=CONST_ON_TIME_INTERVAL;
-  private:
-    static const char EXCEPTION_MSG[];
-  protected:
-    double _start_time;
-    double _end_time;
-    int _start_dt;
-    int _end_dt;
-    int _start_it;
-    int _end_it;
-  };
-
-  class MEDCOUPLING_EXPORT MEDCouplingTwoTimeSteps : public MEDCouplingTimeDiscretization
-  {
-  protected:
-    MEDCouplingTwoTimeSteps();
-    ~MEDCouplingTwoTimeSteps();
-  public:
-    void checkNoTimePresence() const throw(INTERP_KERNEL::Exception);
-    void checkTimePresence(double time) const throw(INTERP_KERNEL::Exception);
-    void getArrays(std::vector<DataArrayDouble *>& arrays) const;
-    DataArrayDouble *getEndArray() const { return _end_array; }
-    void setStartTime(double time, int dt, int it) throw(INTERP_KERNEL::Exception) { _start_time=time; _start_dt=dt; _start_it=it; }
-    void setEndTime(double time, int dt, int it) throw(INTERP_KERNEL::Exception) { _end_time=time; _end_dt=dt; _end_it=it; }
-    double getStartTime(int& dt, int& it) const throw(INTERP_KERNEL::Exception) { dt=_start_dt; it=_start_it; return _start_time; }
-    double getEndTime(int& dt, int& it) const throw(INTERP_KERNEL::Exception) { dt=_end_dt; it=_end_it; return _end_time; }
-    void resizeForUnserialization(const std::vector<int>& tinyInfoI, std::vector<DataArrayDouble *>& arrays);
-    void finishUnserialization(const std::vector<int>& tinyInfoI, const std::vector<double>& tinyInfoD, const std::vector<std::string>& tinyInfoS);
-  protected:
-    double _start_time;
-    double _end_time;
-    int _start_dt;
-    int _end_dt;
-    int _start_it;
-    int _end_it;
-    DataArrayDouble *_end_array;
-  };
-
-  class MEDCOUPLING_EXPORT MEDCouplingLinearTime : public MEDCouplingTwoTimeSteps
-  {
-  public:
-    TypeOfTimeDiscretization getEnum() const { return DISCRETIZATION; }
-    static const TypeOfTimeDiscretization DISCRETIZATION=LINEAR_TIME;
-  };
-}
-
-#endif
diff --git a/src/MEDCoupling/MEDCouplingUMeshDesc.cxx b/src/MEDCoupling/MEDCouplingUMeshDesc.cxx
deleted file mode 100644
index 29f1e58e3..000000000
--- a/src/MEDCoupling/MEDCouplingUMeshDesc.cxx
+++ /dev/null
@@ -1,389 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "MEDCouplingUMeshDesc.hxx"
-#include "CellModel.hxx"
-#include "MEDCouplingMemArray.hxx"
-
-#include <limits>
-
-using namespace ParaMEDMEM;
-
-MEDCouplingUMeshDesc::MEDCouplingUMeshDesc():_mesh_dim(-1),_desc_connec(0),_desc_connec_index(0),
-                                             _nodal_connec_face(0),_nodal_connec_face_index(0)
-{
-}
-
-MEDCouplingUMeshDesc::~MEDCouplingUMeshDesc()
-{
-  if(_desc_connec)
-    _desc_connec->decrRef();
-  if(_desc_connec_index)
-    _desc_connec_index->decrRef();
-  if(_nodal_connec_face)
-    _nodal_connec_face->decrRef();
-  if(_nodal_connec_face_index)
-    _nodal_connec_face_index->decrRef();
-}
-
-MEDCouplingUMeshDesc *MEDCouplingUMeshDesc::New()
-{
-  return new MEDCouplingUMeshDesc;
-}
-
-MEDCouplingUMeshDesc *MEDCouplingUMeshDesc::New(const char *meshName, int meshDim)
-{
-  MEDCouplingUMeshDesc *ret=new MEDCouplingUMeshDesc;
-  ret->setName(meshName);
-  ret->setMeshDimension(meshDim);
-  return ret;
-}
-
-void MEDCouplingUMeshDesc::checkCoherency() const throw(INTERP_KERNEL::Exception)
-{
-  for(std::set<INTERP_KERNEL::NormalizedCellType>::const_iterator iter=_types.begin();iter!=_types.end();iter++)
-    {
-      if(INTERP_KERNEL::CellModel::getCellModel(*iter).getDimension()!=_mesh_dim)
-        {
-          std::ostringstream message;
-          message << "MeshDesc invalid because dimension is " << _mesh_dim << " and there is presence of cell(s) with type " << (*iter);
-          throw INTERP_KERNEL::Exception(message.str().c_str());
-        }
-    }
-}
-
-void MEDCouplingUMeshDesc::setMeshDimension(unsigned meshDim)
-{
-  _mesh_dim=meshDim;
-  declareAsNew();
-}
-
-int MEDCouplingUMeshDesc::getNumberOfCells() const
-{
-  if(_desc_connec_index)
-    return _desc_connec_index->getNumberOfTuples()-1;
-  else
-    throw INTERP_KERNEL::Exception("Unable to get number of cells because no connectivity specified !");
-}
-
-int MEDCouplingUMeshDesc::getNumberOfFaces() const
-{
-  if(_nodal_connec_face_index)
-    return _nodal_connec_face_index->getNumberOfTuples()-1;
-  else
-    throw INTERP_KERNEL::Exception("Unable to get number of faces because no connectivity specified !");
-}
-
-int MEDCouplingUMeshDesc::getCellMeshLength() const
-{
-  return _desc_connec->getNbOfElems();
-}
-
-int MEDCouplingUMeshDesc::getFaceMeshLength() const
-{
-  return _nodal_connec_face->getNbOfElems();
-}
-
-INTERP_KERNEL::NormalizedCellType MEDCouplingUMeshDesc::getTypeOfCell(int cellId) const
-{
-  const int *desc_connec=_desc_connec->getConstPointer();
-  const int *desc_connec_index=_desc_connec_index->getConstPointer();
-  return (INTERP_KERNEL::NormalizedCellType)desc_connec[desc_connec_index[cellId]+1];
-}
-
-void MEDCouplingUMeshDesc::getNodeIdsOfCell(int cellId, std::vector<int>& conn) const
-{
-  //not implemented yet.
-}
-
-void MEDCouplingUMeshDesc::getCoordinatesOfNode(int nodeId, std::vector<double>& coo) const
-{
-  //not implemented yet.
-}
-
-void MEDCouplingUMeshDesc::setConnectivity(DataArrayInt *descConn, DataArrayInt *descConnIndex, DataArrayInt *nodalFaceConn, DataArrayInt *nodalFaceConnIndx)
-{
-  DataArrayInt::setArrayIn(descConn,_desc_connec);
-  DataArrayInt::setArrayIn(descConnIndex,_desc_connec_index);
-  DataArrayInt::setArrayIn(nodalFaceConn,_nodal_connec_face);
-  DataArrayInt::setArrayIn(nodalFaceConnIndx,_nodal_connec_face_index);
-  computeTypes();
-}
-
-void MEDCouplingUMeshDesc::getTinySerializationInformation(std::vector<int>& tinyInfo, std::vector<std::string>& littleStrings) const
-{
-  MEDCouplingPointSet::getTinySerializationInformation(tinyInfo,littleStrings);
-  tinyInfo.push_back(getMeshDimension());
-  tinyInfo.push_back(getNumberOfNodes());
-  tinyInfo.push_back(getNumberOfCells());
-  tinyInfo.push_back(getCellMeshLength());
-  tinyInfo.push_back(getNumberOfFaces());
-  tinyInfo.push_back(getFaceMeshLength());
-}
-
-bool MEDCouplingUMeshDesc::isEmptyMesh(const std::vector<int>& tinyInfo) const
-{
-  return tinyInfo[5]<=0;
-}
-
-void MEDCouplingUMeshDesc::resizeForUnserialization(const std::vector<int>& tinyInfo, DataArrayInt *a1, DataArrayDouble *a2, std::vector<std::string>& littleStrings)
-{
-  std::vector<int> tinyInfoTmp(tinyInfo.begin()+1,tinyInfo.end());
-  MEDCouplingPointSet::resizeForUnserialization(tinyInfoTmp,a1,a2,littleStrings);
-  a1->alloc(tinyInfo[5]+tinyInfo[4]+1+tinyInfo[7]+tinyInfo[6]+1,1);
-}
-
-void MEDCouplingUMeshDesc::serialize(DataArrayInt *&a1, DataArrayDouble *&a2) const
-{
-  MEDCouplingPointSet::serialize(a1,a2);
-  //
-  a1=DataArrayInt::New();
-  a1->alloc(getCellMeshLength()+getNumberOfCells()+1+getFaceMeshLength()+getNumberOfFaces()+1,1);
-  int *ptA1=a1->getPointer();
-  const int *descConn=_desc_connec->getConstPointer();
-  const int *descConnIndex=_desc_connec_index->getConstPointer();
-  const int *faceConn=_nodal_connec_face->getConstPointer();
-  const int *faceConnIndex=_nodal_connec_face_index->getConstPointer();
-  ptA1=std::copy(descConn,descConn+getCellMeshLength(),ptA1);
-  ptA1=std::copy(descConnIndex,descConnIndex+getNumberOfCells()+1,ptA1);
-  ptA1=std::copy(faceConn,faceConn+getFaceMeshLength(),ptA1);
-  std::copy(faceConnIndex,faceConnIndex+getNumberOfFaces()+1,ptA1);
-}
-
-void MEDCouplingUMeshDesc::unserialization(const std::vector<int>& tinyInfo, DataArrayInt *a1, DataArrayDouble *a2, const std::vector<std::string>& littleStrings)
-{
-  std::vector<int> tinyInfoTmp(tinyInfo.begin()+1,tinyInfo.end());
-  MEDCouplingPointSet::unserialization(tinyInfoTmp,a1,a2,littleStrings);
-  //
-  const int *recvBuffer=a1->getConstPointer();
-  DataArrayInt *descConn=DataArrayInt::New();
-  descConn->alloc(tinyInfo[5],1);
-  std::copy(recvBuffer,recvBuffer+tinyInfo[5],descConn->getPointer());
-  DataArrayInt *descConnIndex=DataArrayInt::New();
-  descConnIndex->alloc(tinyInfo[4]+1,1);
-  std::copy(recvBuffer+tinyInfo[5],recvBuffer+tinyInfo[5]+tinyInfo[4]+1,descConnIndex->getPointer());
-  DataArrayInt *faceConn=DataArrayInt::New();
-  faceConn->alloc(tinyInfo[7],1);
-  std::copy(recvBuffer+tinyInfo[5]+tinyInfo[4]+1,recvBuffer+tinyInfo[5]+tinyInfo[4]+1+tinyInfo[7],faceConn->getPointer());
-  DataArrayInt *faceConnIndex=DataArrayInt::New();
-  faceConnIndex->alloc(tinyInfo[6]+1,1);
-  std::copy(recvBuffer+tinyInfo[5]+tinyInfo[4]+1+tinyInfo[7],
-            recvBuffer+tinyInfo[5]+tinyInfo[5]+1+tinyInfo[7]+tinyInfo[6]+1,faceConnIndex->getPointer());
-  setConnectivity(descConn,descConnIndex,faceConn,faceConnIndex);
-  descConn->decrRef();
-  descConnIndex->decrRef();
-  faceConn->decrRef();
-  faceConnIndex->decrRef();
-  setMeshDimension(tinyInfo[2]);
-}
-
-void MEDCouplingUMeshDesc::giveElemsInBoundingBox(const double *bbox, double eps, std::vector<int>& elems)
-{
-  int dim=getSpaceDimension();
-  double* elem_bb=new double[2*dim];
-  const int* conn      = _desc_connec->getConstPointer();
-  const int* conn_index= _desc_connec_index->getConstPointer();
-  const int* face      = _nodal_connec_face->getConstPointer();
-  const int* face_index= _nodal_connec_face_index->getConstPointer();
-  const double* coords = getCoords()->getConstPointer();
-  int nbOfCells=getNumberOfCells();
-  for ( int ielem=0; ielem<nbOfCells;ielem++ )
-    {
-      for (int i=0; i<dim; i++)
-        {
-          elem_bb[i*2]=std::numeric_limits<double>::max();
-          elem_bb[i*2+1]=-std::numeric_limits<double>::max();
-        }
-
-      for (int jface=conn_index[ielem]+1; jface<conn_index[ielem+1]; jface++)//+1 due to offset of cell type.
-        {
-          int iface=conn[jface];
-          for(int inode=face_index[iface]+1;inode<face_index[iface+1];inode++)
-            {
-              int node=face[inode];
-              for (int idim=0; idim<dim; idim++)
-                {
-                  if ( coords[node*dim+idim] < elem_bb[idim*2] )
-                    {
-                      elem_bb[idim*2] = coords[node*dim+idim] ;
-                    }
-                  if ( coords[node*dim+idim] > elem_bb[idim*2+1] )
-                    {
-                      elem_bb[idim*2+1] = coords[node*dim+idim] ;
-                    }
-                }
-            }
-        }
-      if (intersectsBoundingBox(elem_bb, bbox, dim, eps))
-        {
-          elems.push_back(ielem);
-        }
-    }
-  delete [] elem_bb;
-}
-
-void MEDCouplingUMeshDesc::giveElemsInBoundingBox(const INTERP_KERNEL::DirectedBoundingBox &bbox, double eps, std::vector<int>& elems)
-{
-  int dim=getSpaceDimension();
-  double* elem_bb=new double[2*dim];
-  const int* conn      = _desc_connec->getConstPointer();
-  const int* conn_index= _desc_connec_index->getConstPointer();
-  const int* face      = _nodal_connec_face->getConstPointer();
-  const int* face_index= _nodal_connec_face_index->getConstPointer();
-  const double* coords = getCoords()->getConstPointer();
-  int nbOfCells=getNumberOfCells();
-  for ( int ielem=0; ielem<nbOfCells;ielem++ )
-    {
-      for (int i=0; i<dim; i++)
-        {
-          elem_bb[i*2]=std::numeric_limits<double>::max();
-          elem_bb[i*2+1]=-std::numeric_limits<double>::max();
-        }
-
-      for (int jface=conn_index[ielem]+1; jface<conn_index[ielem+1]; jface++)//+1 due to offset of cell type.
-        {
-          int iface=conn[jface];
-          for(int inode=face_index[iface]+1;inode<face_index[iface+1];inode++)
-            {
-              int node=face[inode];
-              for (int idim=0; idim<dim; idim++)
-                {
-                  if ( coords[node*dim+idim] < elem_bb[idim*2] )
-                    {
-                      elem_bb[idim*2] = coords[node*dim+idim] ;
-                    }
-                  if ( coords[node*dim+idim] > elem_bb[idim*2+1] )
-                    {
-                      elem_bb[idim*2+1] = coords[node*dim+idim] ;
-                    }
-                }
-            }
-        }
-      if (intersectsBoundingBox(bbox, elem_bb, dim, eps))
-        {
-          elems.push_back(ielem);
-        }
-    }
-  delete [] elem_bb;
-}
-
-DataArrayInt *MEDCouplingUMeshDesc::mergeNodes(double precision, bool& areNodesMerged)
-{
-  //not implemented yet.
-  areNodesMerged=false;
-  return 0;
-}
-
-MEDCouplingPointSet *MEDCouplingUMeshDesc::buildPartOfMySelf(const int *start, const int *end, bool keepCoords) const
-{
-  //not implemented yet.
-  return 0;
-}
-
-MEDCouplingPointSet *MEDCouplingUMeshDesc::buildPartOfMySelfNode(const int *start, const int *end, bool fullyIn) const
-{
-  //not implemented yet
-  return 0;
-}
-
-MEDCouplingPointSet *MEDCouplingUMeshDesc::buildFacePartOfMySelfNode(const int *start, const int *end, bool fullyIn) const
-{
-  //not implemented yet
-  return 0;
-}
-
-void MEDCouplingUMeshDesc::findBoundaryNodes(std::vector<int>& nodes) const
-{
-  //not implemented yet
-}
-
-MEDCouplingPointSet *MEDCouplingUMeshDesc::buildBoundaryMesh(bool keepCoords) const
-{
-  //not implemented yet
-  return 0;
-}
-
-void MEDCouplingUMeshDesc::renumberNodes(const int *newNodeNumbers, int newNbOfNodes)
-{
-  MEDCouplingPointSet::renumberNodes(newNodeNumbers,newNbOfNodes);
-  //not implemented yet
-}
-
-MEDCouplingFieldDouble *MEDCouplingUMeshDesc::getMeasureField(bool isAbs) const
-{
-  //not implemented yet.
-  return 0;
-}
-
-MEDCouplingFieldDouble *MEDCouplingUMeshDesc::getMeasureFieldOnNode(bool isAbs) const
-{
-  //not implemented yet.
-  return 0;
-}
-
-MEDCouplingFieldDouble *MEDCouplingUMeshDesc::buildOrthogonalField() const
-{
-  if(getMeshDimension()!=2)
-    throw INTERP_KERNEL::Exception("Expected a cmesh with meshDim == 2 !");
-  //not implemented yet !
-  return 0;
-}
-
-DataArrayInt *MEDCouplingUMeshDesc::zipCoordsTraducer()
-{
-  //not implemented yet.
-  return 0;
-}
-
-void MEDCouplingUMeshDesc::computeTypes()
-{
-  if(_desc_connec && _desc_connec_index)
-    {
-      _types.clear();
-      const int *conn=_desc_connec->getConstPointer();
-      const int *connIndex=_desc_connec_index->getConstPointer();
-      int nbOfElem=_desc_connec_index->getNbOfElems()-1;
-      for(const int *pt=connIndex;pt!=connIndex+nbOfElem;pt++)
-        _types.insert((INTERP_KERNEL::NormalizedCellType)conn[*pt]);
-    }
-}
-
-void MEDCouplingUMeshDesc::checkFullyDefined() const throw(INTERP_KERNEL::Exception)
-{
-  if(!_desc_connec || !_desc_connec_index || !_nodal_connec_face || !_nodal_connec_face_index || !_coords)
-    throw INTERP_KERNEL::Exception("full connectivity and coordinates not set in unstructured mesh.");
-}
-
-MEDCouplingMesh *MEDCouplingUMeshDesc::mergeMyselfWith(const MEDCouplingMesh *other) const
-{  
-  //not implemented yet.
-  return 0;
-}
-
-DataArrayDouble *MEDCouplingUMeshDesc::getBarycenterAndOwner() const
-{
-  //not implemented yet.
-  return 0;
-}
-
-int MEDCouplingUMeshDesc::getCellContainingPoint(const double *pos, double eps) const
-{
-  //not implemented yet.
-  return -1;
-}
diff --git a/src/MEDCoupling/MEDCouplingUMeshDesc.hxx b/src/MEDCoupling/MEDCouplingUMeshDesc.hxx
deleted file mode 100644
index 91ce649ed..000000000
--- a/src/MEDCoupling/MEDCouplingUMeshDesc.hxx
+++ /dev/null
@@ -1,85 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __PARAMEDMEM_MEDCOUPLINGUMESHDESC_HXX__
-#define __PARAMEDMEM_MEDCOUPLINGUMESHDESC_HXX__
-
-#include "MEDCouplingPointSet.hxx"
-#include "MEDCoupling.hxx"
-#include "NormalizedUnstructuredMesh.hxx"
-
-#include <set>
-
-namespace ParaMEDMEM
-{
-  class MEDCouplingUMeshDesc : public MEDCouplingPointSet
-  {
-  public:
-    MEDCOUPLING_EXPORT static MEDCouplingUMeshDesc *New();
-    MEDCOUPLING_EXPORT static MEDCouplingUMeshDesc *New(const char *meshName, int meshDim);
-    MEDCOUPLING_EXPORT void checkCoherency() const throw(INTERP_KERNEL::Exception);
-    MEDCOUPLING_EXPORT void setMeshDimension(unsigned meshDim);
-    MEDCOUPLING_EXPORT int getNumberOfCells() const;
-    MEDCOUPLING_EXPORT int getNumberOfFaces() const;
-    MEDCOUPLING_EXPORT int getCellMeshLength() const;
-    MEDCOUPLING_EXPORT int getFaceMeshLength() const;
-    MEDCOUPLING_EXPORT int getMeshDimension() const { return _mesh_dim; }
-    MEDCOUPLING_EXPORT INTERP_KERNEL::NormalizedCellType getTypeOfCell(int cellId) const;
-    MEDCOUPLING_EXPORT void getNodeIdsOfCell(int cellId, std::vector<int>& conn) const;
-    MEDCOUPLING_EXPORT void getCoordinatesOfNode(int nodeId, std::vector<double>& coo) const;
-    MEDCOUPLING_EXPORT MEDCouplingMeshType getType() const { return UNSTRUCTURED_DESC; }
-    MEDCOUPLING_EXPORT void setConnectivity(DataArrayInt *descConn, DataArrayInt *descConnIndex, DataArrayInt *nodalFaceConn, DataArrayInt *nodalFaceConnIndx);
-    //tools to overload
-    MEDCOUPLING_EXPORT void getTinySerializationInformation(std::vector<int>& tinyInfo, std::vector<std::string>& littleStrings) const;
-    MEDCOUPLING_EXPORT bool isEmptyMesh(const std::vector<int>& tinyInfo) const;
-    MEDCOUPLING_EXPORT void resizeForUnserialization(const std::vector<int>& tinyInfo, DataArrayInt *a1, DataArrayDouble *a2, std::vector<std::string>& littleStrings);
-    MEDCOUPLING_EXPORT void serialize(DataArrayInt *&a1, DataArrayDouble *&a2) const;
-    MEDCOUPLING_EXPORT void unserialization(const std::vector<int>& tinyInfo, DataArrayInt *a1, DataArrayDouble *a2, const std::vector<std::string>& littleStrings);
-    MEDCOUPLING_EXPORT void giveElemsInBoundingBox(const double *bbox, double eps, std::vector<int>& elems);
-    MEDCOUPLING_EXPORT void giveElemsInBoundingBox(const INTERP_KERNEL::DirectedBoundingBox &bbox, double eps, std::vector<int>& elems);
-    MEDCOUPLING_EXPORT DataArrayInt *mergeNodes(double precision, bool& areNodesMerged);
-    MEDCOUPLING_EXPORT MEDCouplingPointSet *buildPartOfMySelf(const int *start, const int *end, bool keepCoords) const;
-    MEDCOUPLING_EXPORT MEDCouplingPointSet *buildPartOfMySelfNode(const int *start, const int *end, bool fullyIn) const;
-    MEDCOUPLING_EXPORT MEDCouplingPointSet *buildFacePartOfMySelfNode(const int *start, const int *end, bool fullyIn) const;
-    MEDCOUPLING_EXPORT void findBoundaryNodes(std::vector<int>& nodes) const;
-    MEDCOUPLING_EXPORT MEDCouplingPointSet *buildBoundaryMesh(bool keepCoords) const;
-    MEDCOUPLING_EXPORT void renumberNodes(const int *newNodeNumbers, int newNbOfNodes);
-    MEDCOUPLING_EXPORT MEDCouplingFieldDouble *getMeasureField(bool isAbs) const;
-    MEDCOUPLING_EXPORT MEDCouplingFieldDouble *getMeasureFieldOnNode(bool isAbs) const;
-    MEDCOUPLING_EXPORT int getCellContainingPoint(const double *pos, double eps) const;
-    MEDCOUPLING_EXPORT MEDCouplingFieldDouble *buildOrthogonalField() const;
-    MEDCOUPLING_EXPORT DataArrayInt *zipCoordsTraducer();
-    MEDCOUPLING_EXPORT MEDCouplingMesh *mergeMyselfWith(const MEDCouplingMesh *other) const;
-    MEDCOUPLING_EXPORT DataArrayDouble *getBarycenterAndOwner() const;
-  private:
-    MEDCouplingUMeshDesc();
-    ~MEDCouplingUMeshDesc();
-    void computeTypes();
-    void checkFullyDefined() const throw(INTERP_KERNEL::Exception);
-  private:
-    unsigned _mesh_dim;
-    DataArrayInt *_desc_connec;
-    DataArrayInt *_desc_connec_index;
-    DataArrayInt *_nodal_connec_face;
-    DataArrayInt *_nodal_connec_face_index;
-    std::set<INTERP_KERNEL::NormalizedCellType> _types;
-  };
-}
-
-#endif
diff --git a/src/MEDCoupling/MemArray.cxx b/src/MEDCoupling/MemArray.cxx
new file mode 100644
index 000000000..90d43a8fe
--- /dev/null
+++ b/src/MEDCoupling/MemArray.cxx
@@ -0,0 +1,82 @@
+//  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
+//
+#include "MemArray.txx"
+
+using namespace ParaMEDMEM;
+
+void DataArray::setName(const char *name)
+{
+  _name=name;
+}
+
+DataArrayDouble *DataArrayDouble::New()
+{
+  return new DataArrayDouble;
+}
+
+void DataArrayDouble::alloc(int nbOfTuple, int nbOfCompo)
+{
+  _nb_of_tuples=nbOfTuple;
+  _info_on_compo.resize(nbOfCompo);
+  _mem.alloc(nbOfCompo*_nb_of_tuples);
+  declareAsNew();
+}
+
+void DataArrayDouble::reAlloc(int nbOfTuples)
+{
+  _mem.reAlloc(_info_on_compo.size()*nbOfTuples);
+  _nb_of_tuples=nbOfTuples;
+  declareAsNew();
+}
+
+void DataArrayDouble::useArray(double *array, bool ownership,  DeallocType type, int nbOfTuple, int nbOfCompo)
+{
+  _nb_of_tuples=nbOfTuple;
+  _info_on_compo.resize(nbOfCompo);
+  _mem.useArray(array,ownership,type,nbOfTuple*nbOfCompo);
+  declareAsNew();
+}
+
+DataArrayInt *DataArrayInt::New()
+{
+  return new DataArrayInt;
+}
+
+void DataArrayInt::alloc(int nbOfTuple, int nbOfCompo)
+{
+  _nb_of_tuples=nbOfTuple;
+  _info_on_compo.resize(nbOfCompo);
+  _mem.alloc(nbOfCompo*_nb_of_tuples);
+  declareAsNew();
+}
+
+void DataArrayInt::useArray(int *array, bool ownership,  DeallocType type, int nbOfTuple, int nbOfCompo)
+{
+  _nb_of_tuples=nbOfTuple;
+  _info_on_compo.resize(nbOfCompo);
+  _mem.useArray(array,ownership,type,nbOfTuple*nbOfCompo);
+  declareAsNew();
+}
+
+void DataArrayInt::reAlloc(int nbOfTuples)
+{
+  _mem.reAlloc(_info_on_compo.size()*nbOfTuples);
+  _nb_of_tuples=nbOfTuples;
+  declareAsNew();
+}
diff --git a/src/MEDCoupling/MemArray.hxx b/src/MEDCoupling/MemArray.hxx
new file mode 100644
index 000000000..b8c9c4e38
--- /dev/null
+++ b/src/MEDCoupling/MemArray.hxx
@@ -0,0 +1,116 @@
+//  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
+//
+#ifndef __PARAMEDMEM_MEMARRAY_HXX__
+#define __PARAMEDMEM_MEMARRAY_HXX__
+
+#include "RefCountObject.hxx"
+
+#include <string>
+#include <vector>
+
+namespace ParaMEDMEM
+{
+  template<class T>
+  class MemArray
+  {
+  public:
+    MemArray():_nb_of_elem(-1),_ownership(false),_pointer(0),_dealloc(CPP_DEALLOC) { }
+    T *getPointer() const { return _pointer; }
+    MemArray<T> &operator=(const MemArray<T>& other);
+    T operator[](int id) const { return _pointer[id]; }
+    T& operator[](int id) { return _pointer[id]; }
+    void alloc(int nbOfElements);
+    void reAlloc(int newNbOfElements);
+    void useArray(void *array, bool ownership, DeallocType type, int nbOfElem);
+    void writeOnPlace(int id, T element0, const T *others, int sizeOfOthers);
+    ~MemArray() { destroy(); }
+  private:
+    void destroy();
+    static void destroyPointer(T *pt, DeallocType type);
+  private:
+    int _nb_of_elem;
+    bool _ownership;
+    T *_pointer;
+    DeallocType _dealloc;
+  };
+
+  class DataArray : public RefCountObject
+  {
+  public:
+    void setName(const char *name);
+    std::string getName() const { return _name; }
+    std::string getInfoOnComponent(int i) const { return _info_on_compo[i]; }
+    void setInfoOnComponent(int i, const char *info) { _info_on_compo[i]=info; }
+    int getNumberOfComponents() const { return _info_on_compo.size(); }
+    int getNumberOfTuples() const { return _nb_of_tuples; }
+    int getNbOfElems() const { return _info_on_compo.size()*_nb_of_tuples; }
+  protected:
+    DataArray():_nb_of_tuples(-1) { }
+  protected:
+    int _nb_of_tuples;
+    std::string _name;
+    std::vector<std::string> _info_on_compo;
+  };
+}
+
+#include "MemArray.txx"
+
+namespace ParaMEDMEM
+{
+  class DataArrayDouble : public DataArray
+  {
+  public:
+    static DataArrayDouble *New();
+    void alloc(int nbOfTuple, int nbOfCompo);
+    //!alloc or useArray should have been called before.
+    void reAlloc(int nbOfTuples);
+    double getIJ(int tupleId, int compoId) const { return _mem[tupleId*_info_on_compo.size()+compoId]; }
+    void setIJ(int tupleId, int compoId, double newVal) { _mem[tupleId*_info_on_compo.size()+compoId]=newVal; }
+    double *getPointer() const { return _mem.getPointer(); }
+    void useArray(double *array, bool ownership, DeallocType type, int nbOfTuple, int nbOfCompo);
+    void writeOnPlace(int id, double element0, const double *others, int sizeOfOthers) { _mem.writeOnPlace(id,element0,others,sizeOfOthers); }
+    //! nothing to do here because this class does not aggregate any TimeLabel instance.
+    void updateTime() { }
+  private:
+    DataArrayDouble() { }
+  private:
+    MemArray<double> _mem;
+  };
+
+  class DataArrayInt : public DataArray
+  {
+  public:
+    static DataArrayInt *New();
+    void alloc(int nbOfTuple, int nbOfCompo);
+    //!alloc or useArray should have been called before.
+    void reAlloc(int nbOfTuples);
+    int getIJ(int tupleId, int compoId) const { return _mem[tupleId*_info_on_compo.size()+compoId]; }
+    int *getPointer() const { return _mem.getPointer(); }
+    void useArray(int *array, bool ownership, DeallocType type, int nbOfTuple, int nbOfCompo);
+    void writeOnPlace(int id, int element0, const int *others, int sizeOfOthers) { _mem.writeOnPlace(id,element0,others,sizeOfOthers); }
+    //! nothing to do here because this class does not aggregate any TimeLabel instance.
+    void updateTime() { }
+  private:
+    DataArrayInt() { }
+  private:
+    MemArray<int> _mem;
+  };
+}
+
+#endif
diff --git a/src/MEDCoupling/MEDCouplingMemArray.txx b/src/MEDCoupling/MemArray.txx
similarity index 52%
rename from src/MEDCoupling/MEDCouplingMemArray.txx
rename to src/MEDCoupling/MemArray.txx
index 476f147ae..8c858bd1f 100644
--- a/src/MEDCoupling/MEDCouplingMemArray.txx
+++ b/src/MEDCoupling/MemArray.txx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,10 +16,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#ifndef __PARAMEDMEM_MEDCOUPLINGMEMARRAY_TXX__
-#define __PARAMEDMEM_MEDCOUPLINGMEMARRAY_TXX__
+#ifndef __PARAMEDMEM_MEMARRAY_TXX__
+#define __PARAMEDMEM_MEMARRAY_TXX__
 
-#include "MEDCouplingMemArray.hxx"
+#include "MemArray.hxx"
 #include "NormalizedUnstructuredMesh.hxx"
 #include "InterpKernelException.hxx"
 
@@ -29,39 +29,11 @@
 namespace ParaMEDMEM
 {
   template<class T>
-  void MEDCouplingPointer<T>::setInternal(T *pointer)
-  {
-    _internal=pointer;
-    _external=0;
-  }
-
-  template<class T>
-  void MEDCouplingPointer<T>::setExternal(const T *pointer)
-  {
-    _external=pointer;
-    _internal=0;
-  }
-
-  template<class T>
-  MemArray<T>::MemArray(const MemArray<T>& other):_nb_of_elem(-1),_ownership(false),_dealloc(CPP_DEALLOC)
-  {
-    if(!other._pointer.isNull())
-      {
-        T *pointer=new T[other._nb_of_elem];
-        std::copy(other._pointer.getConstPointer(),other._pointer.getConstPointer()+other._nb_of_elem,pointer);
-        useArray(pointer,true,CPP_DEALLOC,other._nb_of_elem);
-      }
-  }
-
-  template<class T>
-  void MemArray<T>::useArray(const T *array, bool ownership, DeallocType type, int nbOfElem)
+  void MemArray<T>::useArray(void *array, bool ownership, DeallocType type, int nbOfElem)
   {
     _nb_of_elem=nbOfElem;
     destroy();
-    if(ownership)
-      _pointer.setInternal((T *)array);
-    else
-      _pointer.setExternal(array);
+    _pointer=(T *)array;
     _ownership=ownership;
     _dealloc=type;
   }
@@ -71,26 +43,8 @@ namespace ParaMEDMEM
   {
     if(id+sizeOfOthers>=_nb_of_elem)
       reAlloc(2*_nb_of_elem+sizeOfOthers+1);
-    T *pointer=_pointer.getPointer();
-    pointer[id]=element0;
-    std::copy(others,others+sizeOfOthers,pointer+id+1);
-  }
-
-  template<class T>
-  bool MemArray<T>::isEqual(const MemArray<T>& other, T prec) const
-  {
-    if(_nb_of_elem!=other._nb_of_elem)
-      return false;
-    const T *pt1=_pointer.getConstPointer();
-    const T *pt2=other._pointer.getConstPointer();
-    if(pt1==0 && pt2==0)
-      return true;
-    if(pt1==0 || pt2==0)
-      return false;
-    for(int i=0;i<_nb_of_elem;i++)
-      if(pt1[i]-pt2[i]<-prec || (pt1[i]-pt2[i])>prec)
-        return false;
-    return true;
+    _pointer[id]=element0;
+    memcpy(_pointer+id+1,others,sizeOfOthers*sizeof(T));
   }
 
   template<class T>
@@ -98,7 +52,7 @@ namespace ParaMEDMEM
   {
     destroy();
     _nb_of_elem=nbOfElements;
-    _pointer.setInternal(new T[_nb_of_elem]);
+    _pointer=new T[_nb_of_elem];
     _ownership=true;
     _dealloc=CPP_DEALLOC;
   }
@@ -107,10 +61,9 @@ namespace ParaMEDMEM
   void MemArray<T>::reAlloc(int newNbOfElements)
   {
     T *pointer=new T[newNbOfElements];
-    std::copy(_pointer.getConstPointer(),_pointer.getConstPointer()+std::min<int>(_nb_of_elem,newNbOfElements),pointer);
-    if(_ownership)
-      destroyPointer((T *)_pointer.getConstPointer(),_dealloc);
-    _pointer.setInternal(pointer);
+    memcpy(pointer,_pointer,std::min<int>(_nb_of_elem,newNbOfElements)*sizeof(int));
+    destroyPointer(_pointer,_dealloc);
+    _pointer=pointer;
     _nb_of_elem=newNbOfElements;
     _ownership=true;
     _dealloc=CPP_DEALLOC;
@@ -142,8 +95,8 @@ namespace ParaMEDMEM
   void MemArray<T>::destroy()
   {
     if(_ownership)
-      destroyPointer((T *)_pointer.getConstPointer(),_dealloc);
-    _pointer.null();
+      destroyPointer(_pointer,_dealloc);
+    _pointer=0;
     _ownership=false;
   }
   
@@ -151,7 +104,7 @@ namespace ParaMEDMEM
   MemArray<T> &MemArray<T>::operator=(const MemArray<T>& other)
   {
     alloc(other._nb_of_elem);
-    std::copy(other._pointer.getConstPointer(),other._pointer.getConstPointer()+_nb_of_elem,_pointer.getPointer());
+    memcpy(_pointer,other._pointer,_nb_of_elem*sizeof(T));
     return *this;
   }
 }
diff --git a/src/MEDCoupling/MEDCouplingRefCountObject.hxx b/src/MEDCoupling/RefCountObject.hxx
similarity index 62%
rename from src/MEDCoupling/MEDCouplingRefCountObject.hxx
rename to src/MEDCoupling/RefCountObject.hxx
index 6929b8533..ca28fd1bf 100644
--- a/src/MEDCoupling/MEDCouplingRefCountObject.hxx
+++ b/src/MEDCoupling/RefCountObject.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,11 +16,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#ifndef __PARAMEDMEM_REFCOUNTOBJECT_HXX__
+#define __PARAMEDMEM_REFCOUNTOBJECT_HXX__
 
-#ifndef __PARAMEDMEM_MEDCOUPLINGREFCOUNTOBJECT_HXX__
-#define __PARAMEDMEM_MEDCOUPLINGREFCOUNTOBJECT_HXX__
-
-#include "MEDCoupling.hxx"
+#include "TimeLabel.hxx"
 
 namespace ParaMEDMEM
 {
@@ -36,28 +35,16 @@ namespace ParaMEDMEM
       ON_NODES = 1
     } TypeOfField;
 
-  typedef enum
-    {
-      NO_TIME = 4,
-      ONE_TIME = 5,
-      LINEAR_TIME = 6,
-      CONST_ON_TIME_INTERVAL = 7
-    } TypeOfTimeDiscretization;
-
-  typedef bool (*FunctionToEvaluate)(const double *pos, double *res);
-
-  class MEDCOUPLING_EXPORT RefCountObject
+  class RefCountObject : public TimeLabel
   {
-  protected:
-    RefCountObject();
-    RefCountObject(const RefCountObject& other);
   public:
-    bool decrRef();
-    void incrRef() const;
+    RefCountObject():_cnt(1) { }
+    bool decrRef() { bool ret=((--_cnt)==0); if(ret)delete this; return ret; }
+    void incrRef() { _cnt++; }
   protected:
-    virtual ~RefCountObject();
+    virtual ~RefCountObject() { }
   private:
-    mutable int _cnt;
+    int _cnt;
   };
 }
 
diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest0.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest0.cxx
deleted file mode 100644
index 959a8c2c3..000000000
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTest0.cxx
+++ /dev/null
@@ -1,688 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "MEDCouplingBasicsTest.hxx"
-#include "MEDCouplingUMesh.hxx"
-#include "MEDCouplingExtrudedMesh.hxx"
-#include "MEDCouplingFieldDouble.hxx"
-#include "MEDCouplingMemArray.hxx"
-
-#include "MEDCouplingBasicsTestData1.hxx"
-
-using namespace ParaMEDMEM;
-
-MEDCouplingUMesh *MEDCouplingBasicsTest::build3DSourceMesh_2()
-{
-  double sourceCoords[84]={100.0, 100.0, 0.0, 100.0, 100.0, 100.0, 100.0, 0.0, 100.0, 100.0, 0.0, 0.0, 0.0, 100.0, 0.0, 0.0, 100.0, 100.0, 0.0,
-                           0.0, 100.0, 0.0, 0.0, 0.0, 100.0, 100.0, 200.0, 100.0, 0.0, 200.0, 0.0, 100.0, 200.0, 0.0, 0.0, 200.0, 100.0, 200.0,
-                           0.0, 100.0, 200.0, 100.0, 0.0, 200.0, 0.0, 0.0, 200.0, 100.0, 100.0, 200.0, 200.0, 0.0, 200.0, 200.0, 200.0, 100.0,
-                           0.0, 200.0, 100.00000000833332, 100.00000000833332, 200.0, 0.0, 100.0, 200.0, 0.0, 0.0, 200.0, 100.0, 200.0, 200.0,
-                           0.0, 200.0, 200.0, 200.0, 0.0, 200.0, 200.0, 100.0, 200.0, 200.0, 200.0, 149.999999970343, 149.9999999874621, 49.999999881628682};
-  
-  
-  int sourceConn[212]={25, 27, 13, 19, 18, 3, 20, 21, 5, 10, 17, 1, 1, 3, 0, 7, 18, 1, 0, 27, 12, 27, 13, 24, 25, 19, 16, 26, 1, 2, 6, 8, 15, 13, 
-                       12, 5, 24, 13, 25, 27, 10, 11, 9, 6, 19, 8, 23, 1, 22, 8, 23, 19, 16, 13, 17, 1, 6, 9, 10, 8, 13, 17, 5, 15, 5, 4, 1, 12, 18,
-                       0, 24, 27, 19, 20, 18, 1, 7, 6, 5, 1, 4, 12, 15, 14, 25, 27, 19, 18, 1, 19, 16, 13, 20, 19, 23, 1, 27, 12, 1, 0, 6, 5, 1, 10,
-                       4, 5, 1, 7, 12, 27, 1, 13, 5, 15, 4, 12, 19, 16, 26, 22, 13, 5, 17, 1, 1, 3, 7, 2, 13, 5, 1, 12, 18, 1, 3, 0, 8, 23, 2, 9, 3,
-                       1, 18, 20, 1, 27, 19, 13, 24, 25, 18, 27, 25, 16, 19, 13, 7, 1, 2, 6, 3, 1, 20, 2, 8, 16, 17, 1, 7, 4, 0, 1, 18, 19, 1, 27,
-                       27, 12, 0, 24, 9, 6, 2, 8, 1, 4, 0, 12, 19, 16, 22, 8, 8, 2, 23, 1, 1, 16, 19, 8, 20, 2, 1, 23, 10, 1, 6, 8, 10, 8, 17, 1};
-  
-  MEDCouplingUMesh *sourceMesh=MEDCouplingUMesh::New();
-  sourceMesh->setMeshDimension(3);
-  sourceMesh->allocateCells(53);
-  for(int i=0;i<53;i++)
-    sourceMesh->insertNextCell(INTERP_KERNEL::NORM_TETRA4,4,sourceConn+4*i);
-  sourceMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(28,3);
-  std::copy(sourceCoords,sourceCoords+84,myCoords->getPointer());
-  sourceMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return sourceMesh;
-}
-
-MEDCouplingUMesh *MEDCouplingBasicsTest::build3DTargetMesh_2()
-{
-  double targetCoords[24]={200.0, 200.0, 0.0, 200.0, 200.0, 200.0, 200.0, 0.0, 0.0, 200.0, 0.0, 200.0, 0.0, 200.0, 0.0, 0.0, 200.0, 200.0, 0.0, 0.0, 0.0, 0.0, 0.0, 200.0};
-  int targetConn[20]={5, 6, 3, 0, 1, 3, 0, 5, 3, 6, 5, 7, 6, 4, 0, 5, 6, 3, 0, 2};
-  MEDCouplingUMesh *targetMesh=MEDCouplingUMesh::New();
-  targetMesh->setMeshDimension(3);
-  targetMesh->allocateCells(5);
-  for(int i=0;i<5;i++)
-    targetMesh->insertNextCell(INTERP_KERNEL::NORM_TETRA4,4,targetConn+4*i);
-  targetMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(8,3);
-  std::copy(targetCoords,targetCoords+24,myCoords->getPointer());
-  targetMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return targetMesh;
-}
-
-MEDCouplingUMesh *MEDCouplingBasicsTest::build1DTargetMesh_1()
-{
-  double targetCoords[36]={
-    25.,25.,0., 25.,25.,50., 25.,25.,200., 75.,25.,0., 75.,25.,50., 75.,25.,200.,
-    25.,125.,0., 25.,125.,50., 25.,125.,200., 125.,125.,0., 125.,125.,50., 125.,125.,200.
-  };
-  int targetConn[16]={0,1, 1,2, 3,4, 4,5, 6,7, 7,8, 9,10, 10,11};
-
-  MEDCouplingUMesh *targetMesh=MEDCouplingUMesh::New("my name of mesh 1D",1);
-  targetMesh->allocateCells(8);
-  for(int i=0;i<8;i++)
-    targetMesh->insertNextCell(INTERP_KERNEL::NORM_SEG2,2,targetConn+2*i);
-  targetMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(12,3);
-  std::copy(targetCoords,targetCoords+36,myCoords->getPointer());
-  targetMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return targetMesh;
-}
-
-MEDCouplingUMesh *MEDCouplingBasicsTest::build2DSourceMesh_1()
-{
-  double sourceCoords[8]={-0.3,-0.3, 0.7,-0.3, -0.3,0.7, 0.7,0.7};
-  int sourceConn[6]={0,3,1,0,2,3};
-  MEDCouplingUMesh *sourceMesh=MEDCouplingUMesh::New("my name of mesh 2D",2);
-  sourceMesh->allocateCells(2);
-  sourceMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,sourceConn);
-  sourceMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,sourceConn+3);
-  sourceMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(4,2);
-  std::copy(sourceCoords,sourceCoords+8,myCoords->getPointer());
-  sourceMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return sourceMesh;
-}
-
-MEDCouplingUMesh *MEDCouplingBasicsTest::build2DTargetMesh_1()
-{
-  double targetCoords[18]={-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 };
-  int targetConn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
-  MEDCouplingUMesh *targetMesh=MEDCouplingUMesh::New();
-  targetMesh->setMeshDimension(2);
-  targetMesh->allocateCells(5);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+4);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+7);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+10);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+14);
-  targetMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(9,2);
-  std::copy(targetCoords,targetCoords+18,myCoords->getPointer());
-  targetMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return targetMesh;
-}
-
-MEDCouplingUMesh *MEDCouplingBasicsTest::build2DTargetMeshPerm_1()
-{
-  double targetCoords[18]={-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 };
-  int targetConn[18]={0,3,4,1, 1,2,4, 4,5,2, 6,7,4,3, 7,8,5,4};
-  MEDCouplingUMesh *targetMesh=MEDCouplingUMesh::New();
-  targetMesh->setMeshDimension(2);
-  targetMesh->allocateCells(5);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+4);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+7);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+10);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+14);
-  targetMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(9,2);
-  std::copy(targetCoords,targetCoords+18,myCoords->getPointer());
-  targetMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return targetMesh;
-}
-
-MEDCouplingUMesh *MEDCouplingBasicsTest::build2DTargetMesh_2()
-{
-  double targetCoords[18]={-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 };
-  int targetConn[24]={0,3,4, 0,4,1, 1,4,2, 4,5,2, 3,6,4, 6,7,4, 4,7,5, 7,8,5 };
-  MEDCouplingUMesh *targetMesh=MEDCouplingUMesh::New();
-  targetMesh->setMeshDimension(2);
-  targetMesh->allocateCells(8);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+3);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+6);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+9);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+12);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+15);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+18);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+21);
-  targetMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(9,2);
-  std::copy(targetCoords,targetCoords+18,myCoords->getPointer());
-  targetMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return targetMesh;
-}
-
-MEDCouplingUMesh *MEDCouplingBasicsTest::buildCU1DMesh_U()
-{
-  double coords[4]={ 0.0, 0.3, 0.75, 1.0 };
-  int conn[2*3]={ 0,1, 1,2, 2,3 };
-  MEDCouplingUMesh *mesh=MEDCouplingUMesh::New();
-  mesh->setMeshDimension(1);
-  mesh->allocateCells(3);
-  mesh->insertNextCell(INTERP_KERNEL::NORM_SEG2,2,conn);
-  mesh->insertNextCell(INTERP_KERNEL::NORM_SEG2,2,conn+2);
-  mesh->insertNextCell(INTERP_KERNEL::NORM_SEG2,2,conn+4);
-  mesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(4,1);
-  std::copy(coords,coords+4,myCoords->getPointer());
-  mesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return mesh;
-}
-MEDCouplingUMesh *MEDCouplingBasicsTest::buildCU2DMesh_U()
-{
-  double coords[18]={0.0,0.0, 0.5,0.0, 1.0,0.0, 0.0,0.5, 0.5,0.5, 1.0,0.5, 0.0,1.0, 0.5,1.0, 1.0,1.0 };
-  int conn[18]={0,1,4,3, 3,4,7,6, 4,5,8,7, 1,5,4, 1,2,5 };
-  MEDCouplingUMesh *mesh=MEDCouplingUMesh::New();
-  mesh->setMeshDimension(2);
-  mesh->allocateCells(5);
-  mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);
-  mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+4);
-  mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+8);
-  mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,conn+12);
-  mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,conn+15);
-  mesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(9,2);
-  std::copy(coords,coords+18,myCoords->getPointer());
-  mesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return mesh;
-}
-MEDCouplingUMesh *MEDCouplingBasicsTest::buildCU3DMesh_U()
-{
-  double coords[27*3]=
-    {
-//   0.0,1.0,0.0 ,0.0,0.3,0.0 ,0.0,0.3,0.3 ,0.3,0.0,0.0 ,0.3,0.3,1.0 ,1.0,0.0,1.0 ,1.0,0.0,0.3 ,0.3,0.0,0.3 ,0.3,1.0,0.3 ,0.0,0.3,1.0 ,0.3,0.0,1.0 ,0.3,0.3,0.3 ,1.0,0.3,1.0 ,1.0,0.0,0.0 ,0.0,0.0,0.0 ,1.0,0.3,0.3 ,0.3,1.0,0.0 ,1.0,1.0,0.3 ,1.0,1.0,1.0 ,0.0,1.0,1.0 ,0.3,0.3,0.0 ,0.0,1.0,0.3 ,0.0,0.0,1.0 ,0.3,1.0,1.0 ,1.0,0.3,0.0 ,0.0,0.0,0.3 ,1.0,1.0,0.0
-      0.0,0.0,0.0, 0.3,0.0,0.0, 1.0,0.0,0.0, 0.0,0.3,0.0, 0.3,0.3,0.0, 1.0,0.3,0.0, 0.0,1.0,0.0, 0.3,1.0,0.0, 1.0,1.0,0.0, 0.0,0.0,0.3, 0.3,0.0,0.3, 1.0,0.0,0.3, 0.0,0.3,0.3, 0.3,0.3,0.3, 1.0,0.3,0.3, 0.0,1.0,0.3, 0.3,1.0,0.3, 1.0,1.0,0.3, 0.0,0.0,1.0, 0.3,0.0,1.0, 1.0,0.0,1.0, 0.0,0.3,1.0, 0.3,0.3,1.0, 1.0,0.3,1.0, 0.0,1.0,1.0, 0.3,1.0,1.0, 1.0,1.0,1.0,
-    };
-  int conn[8*8]=
-    {
-//       11,15,12,4,8,17,18,23,3,13,6,7,20,24,15,11,14,3,7,25,1,20,11,2,1,20,11,2,0,16,8,21,20,24,15,11,16,26,17,8,25,7,10,22,2,11,4,9,2,11,4,9,21,8,23,19,7,6,5,10,11,15,12,4
-      0,3,4,1,9,12,13,10, 1,4,5,2,10,13,14,11, 3,6,7,4,12,15,16,13, 4,7,8,5,13,16,17,14, 9,12,13,10,18,21,22,19, 10,13,14,11,19,22,23,20, 12,15,16,13,21,24,25,22, 13,16,17,14,22,25,26,23
-    };
-  MEDCouplingUMesh *mesh=MEDCouplingUMesh::New();
-  mesh->setMeshDimension(3);
-  mesh->allocateCells(8);
-  for(int i=0;i<8;i++)
-    mesh->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+8*i);
-  mesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(27,3);
-  std::copy(coords,coords+27*3,myCoords->getPointer());
-  mesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return mesh;
-}
-
-MEDCouplingUMesh *MEDCouplingBasicsTest::build3DSurfSourceMesh_1()
-{
-  double sourceCoords[12]={-0.3,-0.3,0.5, 0.7,-0.3,1.5, -0.3,0.7,0.5, 0.7,0.7,1.5};
-  int sourceConn[6]={0,3,1,0,2,3};
-  MEDCouplingUMesh *sourceMesh=MEDCouplingUMesh::New();
-  sourceMesh->setMeshDimension(2);
-  sourceMesh->allocateCells(2);
-  sourceMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,sourceConn);
-  sourceMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,sourceConn+3);
-  sourceMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(4,3);
-  std::copy(sourceCoords,sourceCoords+12,myCoords->getPointer());
-  sourceMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return sourceMesh;
-}
-
-MEDCouplingUMesh *MEDCouplingBasicsTest::build3DSurfSourceMesh_2()
-{
-  double sourceCoords[12]={-0.3,-0.3,0., 0.7,-0.3,0., -0.3,0.7,0., 0.7,0.7,0.};
-  int sourceConn[6]={0,3,1,0,2,3};
-  MEDCouplingUMesh *sourceMesh=MEDCouplingUMesh::New();
-  sourceMesh->setMeshDimension(2);
-  sourceMesh->allocateCells(2);
-  sourceMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,sourceConn);
-  sourceMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,sourceConn+3);
-  sourceMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(4,3);
-  std::copy(sourceCoords,sourceCoords+12,myCoords->getPointer());
-  sourceMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return sourceMesh;
-}
-
-MEDCouplingUMesh *MEDCouplingBasicsTest::build3DSurfTargetMesh_1()
-{
-  double targetCoords[27]={-0.3,-0.3,0.5, 0.2,-0.3,1., 0.7,-0.3,1.5, -0.3,0.2,0.5, 0.2,0.2,1., 0.7,0.2,1.5, -0.3,0.7,0.5, 0.2,0.7,1., 0.7,0.7,1.5};
-  int targetConn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
-  MEDCouplingUMesh *targetMesh=MEDCouplingUMesh::New();
-  targetMesh->setMeshDimension(2);
-  targetMesh->allocateCells(5);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+4);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+7);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+10);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+14);
-  targetMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(9,3);
-  std::copy(targetCoords,targetCoords+27,myCoords->getPointer());
-  targetMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return targetMesh;
-}
-
-/*!
- * Idem build3DSurfTargetMesh_1 except that cell id 2 is not correctly numbered.
- */
-MEDCouplingUMesh *MEDCouplingBasicsTest::build3DSurfTargetMeshPerm_1()
-{
-  double targetCoords[27]={-0.3,-0.3,0.5, 0.2,-0.3,1., 0.7,-0.3,1.5, -0.3,0.2,0.5, 0.2,0.2,1., 0.7,0.2,1.5, -0.3,0.7,0.5, 0.2,0.7,1., 0.7,0.7,1.5};
-  int targetConn[18]={0,3,4,1, 1,4,2, 4,2,5, 6,7,4,3, 7,8,5,4};
-  MEDCouplingUMesh *targetMesh=MEDCouplingUMesh::New();
-  targetMesh->setMeshDimension(2);
-  targetMesh->allocateCells(5);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+4);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+7);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+10);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+14);
-  targetMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(9,3);
-  std::copy(targetCoords,targetCoords+27,myCoords->getPointer());
-  targetMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return targetMesh;
-}
-
-MEDCouplingUMesh *MEDCouplingBasicsTest::build3DSurfTargetMesh_2()
-{
-  double targetCoords[27]={-0.3,-0.3,0.5, 0.2,-0.3,1., 0.7,-0.3,1.5, -0.3,0.2,0.5, 0.2,0.2,1., 0.7,0.2,1.5, -0.3,0.7,0.5, 0.2,0.7,1., 0.7,0.7,1.5};
-  int targetConn[24]={0,3,4, 0,4,1, 1,4,2, 4,5,2, 3,6,4, 6,7,4, 4,7,5, 7,8,5 };
-  MEDCouplingUMesh *targetMesh=MEDCouplingUMesh::New();
-  targetMesh->setMeshDimension(2);
-  targetMesh->allocateCells(8);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+3);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+6);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+9);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+12);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+15);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+18);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+21);
-  targetMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(9,3);
-  std::copy(targetCoords,targetCoords+27,myCoords->getPointer());
-  targetMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return targetMesh;
-}
-
-MEDCouplingUMesh *MEDCouplingBasicsTest::build3DSourceMesh_1()
-{
-  double sourceCoords[27]={ 0.0, 0.0, 200.0, 0.0, 0.0, 0.0, 0.0, 200.0, 200.0, 0.0, 200.0, 0.0, 200.0, 0.0, 200.0,
-                            200.0, 0.0, 0.0, 200.0, 200.0, 200.0, 200.0, 200.0, 0.0, 100.0, 100.0, 100.0 };
-  int sourceConn[48]={8,1,7,3, 6,0,8,2, 7,4,5,8, 6,8,4,7, 6,8,0,4, 6,8,7,3, 8,1,3,0, 4,1,5,8, 1,7,5,8, 0,3,8,2, 8,1,0,4, 3,6,8,2};
-  MEDCouplingUMesh *sourceMesh=MEDCouplingUMesh::New();
-  sourceMesh->setMeshDimension(3);
-  sourceMesh->allocateCells(12);
-  sourceMesh->insertNextCell(INTERP_KERNEL::NORM_TETRA4,4,sourceConn);
-  sourceMesh->insertNextCell(INTERP_KERNEL::NORM_TETRA4,4,sourceConn+4);
-  sourceMesh->insertNextCell(INTERP_KERNEL::NORM_TETRA4,4,sourceConn+8);
-  sourceMesh->insertNextCell(INTERP_KERNEL::NORM_TETRA4,4,sourceConn+12);
-  sourceMesh->insertNextCell(INTERP_KERNEL::NORM_TETRA4,4,sourceConn+16);
-  sourceMesh->insertNextCell(INTERP_KERNEL::NORM_TETRA4,4,sourceConn+20);
-  sourceMesh->insertNextCell(INTERP_KERNEL::NORM_TETRA4,4,sourceConn+24);
-  sourceMesh->insertNextCell(INTERP_KERNEL::NORM_TETRA4,4,sourceConn+28);
-  sourceMesh->insertNextCell(INTERP_KERNEL::NORM_TETRA4,4,sourceConn+32);
-  sourceMesh->insertNextCell(INTERP_KERNEL::NORM_TETRA4,4,sourceConn+36);
-  sourceMesh->insertNextCell(INTERP_KERNEL::NORM_TETRA4,4,sourceConn+40);
-  sourceMesh->insertNextCell(INTERP_KERNEL::NORM_TETRA4,4,sourceConn+44);
-  sourceMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(9,3);
-  std::copy(sourceCoords,sourceCoords+27,myCoords->getPointer());
-  sourceMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return sourceMesh;
-}
-
-MEDCouplingUMesh *MEDCouplingBasicsTest::build3DTargetMesh_1()
-{
-  double targetCoords[81]={ 0., 0., 0., 50., 0., 0. , 200., 0., 0.  , 0., 50., 0., 50., 50., 0. , 200., 50., 0.,   0., 200., 0., 50., 200., 0. , 200., 200., 0. ,
-                            0., 0., 50., 50., 0., 50. , 200., 0., 50.  , 0., 50., 50., 50., 50., 50. , 200., 50., 50.,   0., 200., 50., 50., 200., 50. , 200., 200., 50. ,
-                            0., 0., 200., 50., 0., 200. , 200., 0., 200.  , 0., 50., 200., 50., 50., 200. , 200., 50., 200.,   0., 200., 200., 50., 200., 200. , 200., 200., 200. };
-  int targetConn[64]={0,1,4,3,9,10,13,12, 1,2,5,4,10,11,14,13, 3,4,7,6,12,13,16,15, 4,5,8,7,13,14,17,16,
-                      9,10,13,12,18,19,22,21, 10,11,14,13,19,20,23,22, 12,13,16,15,21,22,25,24, 13,14,17,16,22,23,26,25};
-  MEDCouplingUMesh *targetMesh=MEDCouplingUMesh::New();
-  targetMesh->setMeshDimension(3);
-  targetMesh->allocateCells(12);
-  for(int i=0;i<8;i++)
-    targetMesh->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,targetConn+8*i);
-  targetMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(27,3);
-  std::copy(targetCoords,targetCoords+81,myCoords->getPointer());
-  targetMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return targetMesh;
-}
-
-MEDCouplingUMesh *MEDCouplingBasicsTest::build2DTargetMeshMergeNode_1()
-{
-  double targetCoords[36]={-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,-0.3, 0.2,-0.3, 0.2,-0.3, 0.2,0.2, 0.2,0.2, 0.7,-0.3, -0.3,0.2, 0.2,0.2, 0.7,0.2, -0.3,0.7, 0.7,0.2, -0.3,0.7, 0.2,0.7, 0.7,0.7, 0.2,0.7 };
-  int targetConn[18]={0,9,7,5, 4,6,2, 10,11,8, 9,14,15,7, 17,16,13,6};
-  MEDCouplingUMesh *targetMesh=MEDCouplingUMesh::New();
-  targetMesh->setMeshDimension(2);
-  targetMesh->allocateCells(5);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+4);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+7);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+10);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+14);
-  targetMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(18,2);
-  std::copy(targetCoords,targetCoords+36,myCoords->getPointer());
-  targetMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return targetMesh;
-}
-
-MEDCouplingUMesh *MEDCouplingBasicsTest::build3DTargetMeshMergeNode_1()
-{
-  double targetCoords[93]={ 0., 0., 0., 50., 0., 0. , 200., 0., 0.  , 0., 50., 0., 50., 50., 0. , 200., 50., 0.,   0., 200., 0., 50., 200., 0. , 200., 200., 0. ,
-                            0., 0., 50., 50., 0., 50. , 200., 0., 50.  , 0., 50., 50., 50., 50., 50. , 200., 50., 50.,   0., 200., 50., 50., 200., 50. , 200., 200., 50. ,
-                            0., 0., 200., 50., 0., 200. , 200., 0., 200.  , 0., 50., 200., 50., 50., 200. , 200., 50., 200.,   0., 200., 200., 50., 200., 200. , 200., 200., 200., 50.,0.,0., 50.,0.,0., 50.,0.,0.,  200., 50., 200.};
-  int targetConn[64]={0,29,4,3,9,10,13,12, 28,2,5,4,10,11,14,13, 3,4,7,6,12,13,16,15, 4,5,8,7,13,14,17,16,
-                      9,10,13,12,18,19,22,21, 10,11,14,13,19,20,23,22, 12,13,16,15,21,22,25,24, 13,14,17,16,22,30,26,25};
-  MEDCouplingUMesh *targetMesh=MEDCouplingUMesh::New();
-  targetMesh->setMeshDimension(3);
-  targetMesh->allocateCells(12);
-  for(int i=0;i<8;i++)
-    targetMesh->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,targetConn+8*i);
-  targetMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(31,3);
-  std::copy(targetCoords,targetCoords+93,myCoords->getPointer());
-  targetMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return targetMesh;
-}
-
-MEDCouplingUMesh *MEDCouplingBasicsTest::build3DExtrudedUMesh_1(MEDCouplingUMesh *&mesh2D)
-{
-  double coords[180]={
-    0.,0.,0., 1.,1.,0., 1.,1.25,0., 0.,1.,0., 1.,1.5,0., 2.,0.,0., 2.,1.,0., 1.,2.,0., 0.,2.,0., 3.,1.,0.,
-    3.,2.,0., 0.,1.,0., 1.,3.,0., 2.,2.,0., 2.,3.,0.,
-    0.,0.,1., 1.,1.,1., 1.,1.25,1., 0.,1.,1., 1.,1.5,1., 2.,0.,1., 2.,1.,1., 1.,2.,1., 0.,2.,1., 3.,1.,1.,
-    3.,2.,1., 0.,1.,1., 1.,3.,1., 2.,2.,1., 2.,3.,1.,
-    0.,0.,2., 1.,1.,2., 1.,1.25,2., 0.,1.,2., 1.,1.5,2., 2.,0.,2., 2.,1.,2., 1.,2.,2., 0.,2.,2., 3.,1.,2.,
-    3.,2.,2., 0.,1.,2., 1.,3.,2., 2.,2.,2., 2.,3.,2.,
-    0.,0.,3., 1.,1.,3., 1.,1.25,3., 0.,1.,3., 1.,1.5,3., 2.,0.,3., 2.,1.,3., 1.,2.,3., 0.,2.,3., 3.,1.,3.,
-    3.,2.,3., 0.,1.,3., 1.,3.,3., 2.,2.,3., 2.,3.,3.};
-
-  int conn[354]={
-    // 0
-    0,11,1,3,15,26,16,18,   1,2,4,7,13,6,-1,1,16,21,6,-1,6,21,28,13,-1,13,7,22,28,-1,7,4,19,22,-1,4,2,17,19,-1,2,1,16,17,-1,16,21,28,22,19,17,
-    1,6,5,3,16,21,20,18,   13,10,9,6,28,25,24,21,
-    11,8,7,4,2,1,-1,11,26,16,1,-1,1,16,17,2,-1,2,17,19,4,-1,4,19,22,7,-1,7,8,23,22,-1,8,11,26,23,-1,26,16,17,19,22,23,
-    7,12,14,13,22,27,29,28,
-    // 1
-    15,26,16,18,30,41,31,33,   16,17,19,22,28,21,-1,16,31,36,21,-1,21,36,43,28,-1,28,22,37,43,-1,22,19,34,37,-1,19,17,32,34,-1,17,16,31,32,-1,31,36,43,37,34,32,
-    16,21,20,18,31,36,35,33,   28,25,24,21,43,40,39,36,
-    26,23,22,19,17,16,-1,26,41,31,16,-1,16,31,32,17,-1,17,32,34,19,-1,19,34,37,22,-1,22,23,38,37,-1,23,26,41,38,-1,41,31,32,34,37,38,
-    22,27,29,28,37,42,44,43,
-    // 2
-    30,41,31,33,45,56,46,48,  31,32,34,37,43,36,-1,31,46,51,36,-1,36,51,58,43,-1,43,37,52,58,-1,37,34,49,52,-1,34,32,47,49,-1,32,31,46,47,-1,46,51,58,52,49,47,
-    31,36,35,33,46,51,50,48,  43,40,39,36,58,55,54,51,
-    41,38,37,34,32,31,-1,41,56,46,31,-1,31,46,47,32,-1,32,47,49,34,-1,34,49,52,37,-1,37,38,53,52,-1,38,41,56,53,-1,56,46,47,49,52,53,
-    37,42,44,43,52,57,59,58
-  };
-  int conn2[28]={7,12,14,13, 11,8,7,4,2,1, 13,10,9,6, 1,6,5,3, 1,2,4,7,13,6, 0,11,1,3};
-  //
-  MEDCouplingUMesh *ret=MEDCouplingUMesh::New();
-  ret->setMeshDimension(3);
-  ret->allocateCells(18);
-  //
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn);
-  ret->insertNextCell(INTERP_KERNEL::NORM_POLYHED,43,conn+8);
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+51);
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+59);
-  ret->insertNextCell(INTERP_KERNEL::NORM_POLYHED,43,conn+67);
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+110);
-  //
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+118);
-  ret->insertNextCell(INTERP_KERNEL::NORM_POLYHED,43,conn+126);
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+169);
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+177);
-  ret->insertNextCell(INTERP_KERNEL::NORM_POLYHED,43,conn+185);
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+228);
-  //
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+236);
-  ret->insertNextCell(INTERP_KERNEL::NORM_POLYHED,43,conn+244);
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+287);
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+295);
-  ret->insertNextCell(INTERP_KERNEL::NORM_POLYHED,43,conn+303);
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+346);
-  //
-  ret->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(60,3);
-  std::copy(coords,coords+180,myCoords->getPointer());
-  ret->setCoords(myCoords);
-  //
-  mesh2D=MEDCouplingUMesh::New();
-  mesh2D->setMeshDimension(2);
-  mesh2D->allocateCells(6);
-  mesh2D->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn2);
-  mesh2D->insertNextCell(INTERP_KERNEL::NORM_POLYGON,6,conn2+4);
-  mesh2D->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn2+10);
-  mesh2D->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn2+14);
-  mesh2D->insertNextCell(INTERP_KERNEL::NORM_POLYGON,6,conn2+18);
-  mesh2D->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn2+24);
-  mesh2D->setCoords(myCoords);
-  myCoords->decrRef();
-  return ret;
-}
-
-void MEDCouplingBasicsTest::build3DExtrudedUMesh_2(MEDCouplingUMesh *&meshN, MEDCouplingUMesh *&meshTT, MEDCouplingUMesh *&meshTF)
-{
-  const double coordsN[270]={
-    0, 0, 0, 0.10803000450134277, 0, 0, 0.21606000900268554, 0, 0, 0.28808000564575198, 0, 0, 0.36010002136230468, 0, 0, 0.43212001800537109, 0, 0, 0,
-    0.072020001411437995, 0, 0.10803000450134277, 0.072020001411437995, 0, 0.21606000900268554, 0.072020001411437995, 0, 0.28808000564575198, 0.072020001411437995,
-    0, 0.36010002136230468, 0.072020001411437995, 0, 0.43212001800537109, 0.072020001411437995, 0, 0, 0.10803000450134277, 0, 0.10803000450134277,
-    0.10803000450134277, 0, 0.21606000900268554, 0.10803000450134277, 0, 0.28808000564575198, 0.10803000450134277, 0, 0.36010002136230468, 0.10803000450134277, 0,
-    0.43212001800537109, 0.10803000450134277, 0, 0, 0.14404000282287599, 0, 0.10803000450134277, 0.14404000282287599, 0, 0.21606000900268554, 0.14404000282287599, 0,
-    0.28808000564575198, 0.14404000282287599, 0, 0.36010002136230468, 0.14404000282287599, 0, 0.43212001800537109, 0.14404000282287599, 0, 0, 0.21606000900268554, 0,
-    0.10803000450134277, 0.21606000900268554, 0, 0.21606000900268554, 0.21606000900268554, 0, 0.28808000564575198, 0.21606000900268554, 0, 0.36010002136230468,
-    0.21606000900268554, 0, 0.43212001800537109, 0.21606000900268554, 0, 0, 0, 2.1364999389648438, 0.10803000450134277, 0, 2.1364999389648438, 0.21606000900268554,
-    0, 2.1364999389648438, 0.28808000564575198, 0, 2.1364999389648438, 0.36010002136230468, 0, 2.1364999389648438, 0.43212001800537109, 0, 2.1364999389648438, 0,
-    0.072020001411437995, 2.1364999389648438, 0.10803000450134277, 0.072020001411437995, 2.1364999389648438, 0.21606000900268554, 0.072020001411437995,
-    2.1364999389648438, 0.28808000564575198, 0.072020001411437995, 2.1364999389648438, 0.36010002136230468, 0.072020001411437995, 2.1364999389648438,
-    0.43212001800537109, 0.072020001411437995, 2.1364999389648438, 0, 0.10803000450134277, 2.1364999389648438, 0.10803000450134277, 0.10803000450134277,
-    2.1364999389648438, 0.21606000900268554, 0.10803000450134277, 2.1364999389648438, 0.28808000564575198, 0.10803000450134277, 2.1364999389648438,
-    0.36010002136230468, 0.10803000450134277, 2.1364999389648438, 0.43212001800537109, 0.10803000450134277, 2.1364999389648438, 0, 0.14404000282287599,
-    2.1364999389648438, 0.10803000450134277, 0.14404000282287599, 2.1364999389648438, 0.21606000900268554, 0.14404000282287599, 2.1364999389648438,
-    0.28808000564575198, 0.14404000282287599, 2.1364999389648438, 0.36010002136230468, 0.14404000282287599, 2.1364999389648438, 0.43212001800537109,
-    0.14404000282287599, 2.1364999389648438, 0, 0.21606000900268554, 2.1364999389648438, 0.10803000450134277, 0.21606000900268554, 2.1364999389648438,
-    0.21606000900268554, 0.21606000900268554, 2.1364999389648438, 0.28808000564575198, 0.21606000900268554, 2.1364999389648438, 0.36010002136230468,
-    0.21606000900268554, 2.1364999389648438, 0.43212001800537109, 0.21606000900268554, 2.1364999389648438, 0, 0, 4.2729998779296876, 0.10803000450134277, 0,
-    4.2729998779296876, 0.21606000900268554, 0, 4.2729998779296876, 0.28808000564575198, 0, 4.2729998779296876, 0.36010002136230468, 0, 4.2729998779296876,
-    0.43212001800537109, 0, 4.2729998779296876, 0, 0.072020001411437995, 4.2729998779296876, 0.10803000450134277, 0.072020001411437995, 4.2729998779296876, 
-    0.21606000900268554, 0.072020001411437995, 4.2729998779296876, 0.28808000564575198, 0.072020001411437995, 4.2729998779296876, 0.36010002136230468, 
-    0.072020001411437995, 4.2729998779296876, 0.43212001800537109, 0.072020001411437995, 4.2729998779296876, 0, 0.10803000450134277, 4.2729998779296876,
-    0.10803000450134277, 0.10803000450134277, 4.2729998779296876, 0.21606000900268554, 0.10803000450134277, 4.2729998779296876, 0.28808000564575198,
-    0.10803000450134277, 4.2729998779296876, 0.36010002136230468, 0.10803000450134277, 4.2729998779296876, 0.43212001800537109, 0.10803000450134277, 
-    4.2729998779296876, 0, 0.14404000282287599, 4.2729998779296876, 0.10803000450134277, 0.14404000282287599, 4.2729998779296876, 0.21606000900268554,
-    0.14404000282287599, 4.2729998779296876, 0.28808000564575198, 0.14404000282287599, 4.2729998779296876, 0.36010002136230468, 0.14404000282287599,
-    4.2729998779296876, 0.43212001800537109, 0.14404000282287599, 4.2729998779296876, 0, 0.21606000900268554, 4.2729998779296876, 0.10803000450134277,
-    0.21606000900268554, 4.2729998779296876, 0.21606000900268554, 0.21606000900268554, 4.2729998779296876, 0.28808000564575198, 0.21606000900268554,
-    4.2729998779296876, 0.36010002136230468, 0.21606000900268554, 4.2729998779296876, 0.43212001800537109, 0.21606000900268554, 4.2729998779296876};
-  const int connN[320]={
-    0, 1, 7, 6, 30, 31, 37, 36, 1, 2, 8, 7, 31, 32, 38, 37, 2, 3, 9, 8, 32, 33, 39, 38, 3, 4, 10, 9, 33, 34, 40, 39, 4, 5, 11, 10, 34, 35, 41, 40, 6,
-    7, 13, 12, 36, 37, 43, 42, 7, 8, 14, 13, 37, 38, 44, 43, 8, 9, 15, 14, 38, 39, 45, 44, 9, 10, 16, 15, 39, 40, 46, 45, 10, 11, 17, 16, 40, 41, 47,
-    46, 12, 13, 19, 18, 42, 43, 49, 48, 13, 14, 20, 19, 43, 44, 50, 49, 14, 15, 21, 20, 44, 45, 51, 50, 15, 16, 22, 21, 45, 46, 52, 51, 16, 17, 23,
-    22, 46, 47, 53, 52, 18, 19, 25, 24, 48, 49, 55, 54, 19, 20, 26, 25, 49, 50, 56, 55, 20, 21, 27, 26, 50, 51, 57, 56, 21, 22, 28, 27, 51, 52, 58,
-    57, 22, 23, 29, 28, 52, 53, 59, 58, 30, 31, 37, 36, 60, 61, 67, 66, 31, 32, 38, 37, 61, 62, 68, 67, 32, 33, 39, 38, 62, 63, 69, 68, 33, 34, 40,
-    39, 63, 64, 70, 69, 34, 35, 41, 40, 64, 65, 71, 70, 36, 37, 43, 42, 66, 67, 73, 72, 37, 38, 44, 43, 67, 68, 74, 73, 38, 39, 45, 44, 68, 69, 75,
-    74, 39, 40, 46, 45, 69, 70, 76, 75, 40, 41, 47, 46, 70, 71, 77, 76, 42, 43, 49, 48, 72, 73, 79, 78, 43, 44, 50, 49, 73, 74, 80, 79, 44, 45, 51,
-    50, 74, 75, 81, 80, 45, 46, 52, 51, 75, 76, 82, 81, 46, 47, 53, 52, 76, 77, 83, 82, 48, 49, 55, 54, 78, 79, 85, 84, 49, 50, 56, 55, 79, 80, 86,
-    85, 50, 51, 57, 56, 80, 81, 87, 86, 51, 52, 58, 57, 81, 82, 88, 87, 52, 53, 59, 58, 82, 83, 89, 88};
-  meshN=MEDCouplingUMesh::New();
-  meshN->setName("meshExtrudedN");
-  meshN->setMeshDimension(3);
-  meshN->allocateCells(40);
-  for(int i=0;i<40;i++)
-    meshN->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,connN+8*i);
-  meshN->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(90,3);
-  std::copy(coordsN,coordsN+270,myCoords->getPointer());
-  meshN->setCoords(myCoords);
-  myCoords->decrRef();
-  //
-  meshTT=MEDCouplingUMesh::New();
-  meshTT->setName("meshExtrudedTT");
-  meshTT->setMeshDimension(3);
-  meshTT->allocateCells(200);
-  for(int i=0;i<200;i++)
-    meshTT->insertNextCell(INTERP_KERNEL::NORM_POLYHED,connITT[i+1]-connITT[i],connTT+connITT[i]);
-  meshTT->finishInsertingCells();
-  myCoords=DataArrayDouble::New();
-  myCoords->alloc(1720,3);
-  std::copy(coordsTT,coordsTT+5160,myCoords->getPointer());
-  meshTT->setCoords(myCoords);
-  myCoords->decrRef();
-  //
-  meshTF=MEDCouplingUMesh::New();
-  meshTF->setName("meshExtrudedTF");
-  meshTF->setMeshDimension(3);
-  meshTF->allocateCells(340);
-  for(int i=0;i<320;i++)
-    meshTF->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,connTFH8+8*i);
-  for(int i=0;i<20;i++)
-    meshTF->insertNextCell(INTERP_KERNEL::NORM_POLYHED,connTFPOLH_I[i+1]-connTFPOLH_I[i],connTFPOLH+connTFPOLH_I[i]);
-  meshTF->finishInsertingCells();
-  myCoords=DataArrayDouble::New();
-  myCoords->alloc(567,3);
-  std::copy(coordsTF,coordsTF+1701,myCoords->getPointer());
-  meshTF->setCoords(myCoords);
-  myCoords->decrRef();
-}
-
-MEDCouplingUMesh *MEDCouplingBasicsTest::build2DTargetMeshMerged_1()
-{
-  double targetCoords[26]={
-    -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,
-    0.7,-0.3, 1.7,-0.3, 0.7,0.7, 1.7,0.7
-  };
-  int targetConn[24]={
-    0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4,
-    9,12,10,9,11,12
-  };
-  MEDCouplingUMesh *targetMesh=MEDCouplingUMesh::New();
-  targetMesh->setName("merge");
-  targetMesh->setMeshDimension(2);
-  targetMesh->allocateCells(10);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+4);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+7);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+10);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+14);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+18);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+21);
-  targetMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(13,2);
-  std::copy(targetCoords,targetCoords+26,myCoords->getPointer());
-  targetMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return targetMesh;
-}
-
-MEDCouplingUMesh *MEDCouplingBasicsTest::build2DCurveMesh(double dx, double dy)
-{
-  // 1d mesh:
-  //
-  //       *
-  //      /
-  // *---*
-  double targetCoords[3*2]=
-    {
-      0.+dx,0.+dy, 1.+dx,0.+dy, 2.+dx,1.+dy
-    };
-  int targetConn[2*2]={1,2, 0,1};
-
-  MEDCouplingUMesh *targetMesh=MEDCouplingUMesh::New("2Dcurve 1D mesh",1);
-  targetMesh->allocateCells(2);
-  for(int i=0;i<2;i++)
-    targetMesh->insertNextCell(INTERP_KERNEL::NORM_SEG2,2,targetConn+2*i);
-  targetMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(3,2);
-  std::copy(targetCoords,targetCoords+3*2,myCoords->getPointer());
-  targetMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return targetMesh;
-}
-
-MEDCouplingUMesh *MEDCouplingBasicsTest::build1DMesh(double dx)
-{
-  double targetCoords[4]=
-    {
-      0.+dx, 1.+dx, 3.+dx, 4.+dx
-    };
-  int targetConn[2*3]={1,2, 0,1, 2,3};
-
-  MEDCouplingUMesh *targetMesh=MEDCouplingUMesh::New("1D mesh",1);
-  targetMesh->allocateCells(3);
-  for(int i=0;i<3;i++)
-    targetMesh->insertNextCell(INTERP_KERNEL::NORM_SEG2,2,targetConn+2*i);
-  targetMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(4,1);
-  std::copy(targetCoords,targetCoords+4,myCoords->getPointer());
-  targetMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return targetMesh;
-}
-
-double MEDCouplingBasicsTest::sumAll(const std::vector< std::map<int,double> >& matrix)
-{
-  double ret=0.;
-  for(std::vector< std::map<int,double> >::const_iterator iter=matrix.begin();iter!=matrix.end();iter++)
-    for(std::map<int,double>::const_iterator iter2=(*iter).begin();iter2!=(*iter).end();iter2++)
-      ret+=(*iter2).second;
-  return ret;
-}
diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx
deleted file mode 100644
index dbd2a6ff9..000000000
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx
+++ /dev/null
@@ -1,1881 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "MEDCouplingBasicsTest.hxx"
-#include "MEDCouplingUMesh.hxx"
-#include "MEDCouplingCMesh.hxx"
-#include "MEDCouplingExtrudedMesh.hxx"
-#include "MEDCouplingFieldDouble.hxx"
-#include "MEDCouplingMemArray.hxx"
-
-#include <cmath>
-#include <functional>
-
-using namespace ParaMEDMEM;
-
-void MEDCouplingBasicsTest::testArray()
-{
-  int tmp1[6]={7,6,5,4,3,2};
-  const int tmp2[3]={8,9,10};
-  {
-    MemArray<int> mem;
-    mem.useArray(tmp1,false,CPP_DEALLOC,6);
-    CPPUNIT_ASSERT(tmp1==mem.getConstPointer());
-    CPPUNIT_ASSERT_THROW(mem.getPointer(),INTERP_KERNEL::Exception);
-    CPPUNIT_ASSERT_THROW(mem[2]=7,INTERP_KERNEL::Exception);
-    CPPUNIT_ASSERT_THROW(mem.writeOnPlace(0,12,tmp2,3),INTERP_KERNEL::Exception);
-    mem.writeOnPlace(4,12,tmp2,3);
-  }
-  {
-    int *tmp3=new int[6];
-    std::copy(tmp1,tmp1+6,tmp3);
-    MemArray<int> mem2;
-    mem2.useArray(tmp3,true,CPP_DEALLOC,6);
-    CPPUNIT_ASSERT(tmp3==mem2.getConstPointer());
-    CPPUNIT_ASSERT(tmp3==mem2.getPointer());
-    CPPUNIT_ASSERT_EQUAL(5,mem2[2]);
-    mem2[2]=7;
-    CPPUNIT_ASSERT_EQUAL(7,mem2[2]);
-    mem2.writeOnPlace(0,12,tmp2,3);
-    CPPUNIT_ASSERT_EQUAL(9,mem2[2]);
-    CPPUNIT_ASSERT_EQUAL(12,mem2[0]);
-    mem2.writeOnPlace(4,12,tmp2,3);
-  }
-}
-
-void MEDCouplingBasicsTest::testMesh()
-{
-  const int nbOfCells=6;
-  const int nbOfNodes=12;
-  
-  double coords[3*nbOfNodes]={ 
-    0.024155, 0.04183768725682622, -0.305, 0.04831000000000001, -1.015761910347357e-17, -0.305, 0.09662000000000001, -1.832979297858306e-18, 
-    -0.305, 0.120775, 0.04183768725682623, -0.305, 0.09662000000000001, 0.08367537451365245, -0.305, 0.04831000000000001, 
-    0.08367537451365246, -0.305, 0.024155, 0.04183768725682622, -0.2863, 0.04831000000000001, -1.015761910347357e-17, -0.2863, 
-    0.09662000000000001, -1.832979297858306e-18, -0.2863, 0.120775, 0.04183768725682623, -0.2863, 0.09662000000000001, 0.08367537451365245, 
-    -0.2863, 0.04831000000000001, 0.08367537451365246, -0.2863, };
-  
-  int tab4[4*nbOfCells]={ 
-    1, 2, 8, 7, 2, 3, 9, 8, 3, 4, 10, 9, 4, 5, 11, 10, 5, 0, 6, 11, 
-    0, 1, 7, 6, };
-  
-  MEDCouplingUMesh *mesh=MEDCouplingUMesh::New();
-  mesh->setMeshDimension(2);
-  mesh->allocateCells(8);
-  const int *curConn=tab4;
-  for(int i=0;i<nbOfCells;i++,curConn+=4)
-    mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,curConn);
-  mesh->finishInsertingCells();
-  CPPUNIT_ASSERT_EQUAL(30,mesh->getNodalConnectivity()->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(nbOfCells,mesh->getNumberOfCells());
-  //test 0 - no copy no ownership
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->useArray(coords,false,CPP_DEALLOC,nbOfNodes,3);
-  mesh->setCoords(myCoords);
-  mesh->setCoords(myCoords);
-  myCoords->decrRef();
-  CPPUNIT_ASSERT_EQUAL(nbOfCells,mesh->getNumberOfCells());
-  mesh->checkCoherency();
-  //test 1 - no copy ownership C++
-  myCoords=DataArrayDouble::New();
-  double *tmp=new double[3*nbOfNodes];
-  std::copy(coords,coords+3*nbOfNodes,tmp);
-  myCoords->useArray(tmp,true,CPP_DEALLOC,nbOfNodes,3);
-  mesh->setCoords(myCoords);
-  myCoords->decrRef();
-  CPPUNIT_ASSERT_EQUAL(nbOfCells,mesh->getNumberOfCells());
-  mesh->checkCoherency();
-  //test 2 - no copy ownership C
-  myCoords=DataArrayDouble::New();
-  tmp=(double *)malloc(3*nbOfNodes*sizeof(double));
-  std::copy(coords,coords+3*nbOfNodes,tmp);
-  myCoords->useArray(tmp,true,C_DEALLOC,nbOfNodes,3);
-  mesh->setCoords(myCoords);
-  myCoords->decrRef();
-  CPPUNIT_ASSERT_EQUAL(nbOfNodes,mesh->getNumberOfNodes());
-  mesh->checkCoherency();
-  //test 3 - copy.
-  myCoords=DataArrayDouble::New();
-  myCoords->alloc(nbOfNodes,3);
-  tmp=myCoords->getPointer();
-  std::copy(coords,coords+3*nbOfNodes,tmp);
-  // test 3 bis deepcopy
-  DataArrayDouble *myCoords2=DataArrayDouble::New();
-  *myCoords2=*myCoords;
-  myCoords2->decrRef();
-  //
-  mesh->setCoords(myCoords);
-  myCoords->decrRef();
-  CPPUNIT_ASSERT_EQUAL(nbOfNodes,mesh->getNumberOfNodes());
-  mesh->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(3,mesh->getSpaceDimension());
-  // test clone not recursively
-  MEDCouplingUMesh *mesh2=mesh->clone(false);
-  CPPUNIT_ASSERT(mesh2!=mesh);
-  mesh2->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(nbOfCells,mesh2->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(nbOfNodes,mesh2->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(3,mesh2->getSpaceDimension());
-  CPPUNIT_ASSERT(mesh!=mesh2);
-  CPPUNIT_ASSERT(mesh->getCoords()==mesh2->getCoords());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.2863,mesh2->getCoords()->getIJ(11,2),1e-14);
-  CPPUNIT_ASSERT(mesh->getNodalConnectivity()==mesh2->getNodalConnectivity());
-  CPPUNIT_ASSERT_EQUAL(3,mesh2->getNodalConnectivity()->getIJ(7,0));
-  CPPUNIT_ASSERT(mesh->getNodalConnectivityIndex()==mesh2->getNodalConnectivityIndex());
-  CPPUNIT_ASSERT_EQUAL(15,mesh2->getNodalConnectivityIndex()->getIJ(3,0));
-  mesh2->decrRef();
-  // test clone not recursively
-  MEDCouplingUMesh *mesh3=mesh->clone(true);
-  CPPUNIT_ASSERT(mesh3!=mesh);
-  mesh3->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(nbOfCells,mesh3->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(nbOfNodes,mesh3->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(3,mesh3->getSpaceDimension());
-  CPPUNIT_ASSERT(mesh!=mesh3);
-  CPPUNIT_ASSERT(mesh->getCoords()!=mesh3->getCoords());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.2863,mesh3->getCoords()->getIJ(11,2),1e-14);
-  CPPUNIT_ASSERT(mesh->getNodalConnectivity()!=mesh3->getNodalConnectivity());
-  CPPUNIT_ASSERT_EQUAL(3,mesh3->getNodalConnectivity()->getIJ(7,0));
-  CPPUNIT_ASSERT(mesh->getNodalConnectivityIndex()!=mesh3->getNodalConnectivityIndex());
-  CPPUNIT_ASSERT_EQUAL(15,mesh3->getNodalConnectivityIndex()->getIJ(3,0));
-  mesh3->decrRef();
-  //test 4 - Field on cells
-  MEDCouplingFieldDouble *fieldOnCells=MEDCouplingFieldDouble::New(ON_CELLS);
-  fieldOnCells->setMesh(mesh);
-  DataArrayDouble *array=DataArrayDouble::New();
-  array->alloc(nbOfCells,9);
-  fieldOnCells->setArray(array);
-  tmp=array->getPointer();
-  array->decrRef();
-  std::fill(tmp,tmp+9*nbOfCells,7.);
-  //content of field changed -> declare it.
-  fieldOnCells->declareAsNew();
-  fieldOnCells->checkCoherency();
-  // testing clone of fields - no recursive
-  MEDCouplingFieldDouble *fieldOnCells2=fieldOnCells->clone(false);
-  CPPUNIT_ASSERT(fieldOnCells2!=fieldOnCells);
-  fieldOnCells2->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(nbOfCells,fieldOnCells2->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(9,fieldOnCells2->getNumberOfComponents());
-  CPPUNIT_ASSERT(fieldOnCells2->getArray()==fieldOnCells->getArray());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(7.,fieldOnCells2->getArray()->getIJ(3,7),1e-14);
-  CPPUNIT_ASSERT(fieldOnCells2->getMesh()==fieldOnCells->getMesh());
-  // testing clone of fields - recursive
-  MEDCouplingFieldDouble *fieldOnCells3=fieldOnCells->clone(true);
-  CPPUNIT_ASSERT(fieldOnCells3!=fieldOnCells);
-  fieldOnCells3->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(nbOfCells,fieldOnCells3->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(9,fieldOnCells3->getNumberOfComponents());
-  CPPUNIT_ASSERT(fieldOnCells3->getArray()!=fieldOnCells->getArray());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(7.,fieldOnCells3->getArray()->getIJ(3,7),1e-14);
-  CPPUNIT_ASSERT(fieldOnCells3->getMesh()==fieldOnCells->getMesh());
-  fieldOnCells2->decrRef();
-  fieldOnCells3->decrRef();
-  //
-  fieldOnCells->decrRef();
-  //clean-up
-  mesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testMeshPointsCloud()
-{
-  double targetCoords[27]={-0.3,-0.3,0.5, 0.2,-0.3,1., 0.7,-0.3,1.5, -0.3,0.2,0.5, 0.2,0.2,1., 0.7,0.2,1.5, -0.3,0.7,0.5, 0.2,0.7,1., 0.7,0.7,1.5};
-  int *targetConn=0;
-  MEDCouplingUMesh *targetMesh=MEDCouplingUMesh::New();
-  targetMesh->setMeshDimension(0);
-  targetMesh->allocateCells(8);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_POINT0,0,targetConn);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_POINT0,0,targetConn);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_POINT0,0,targetConn);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_POINT0,0,targetConn);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_POINT0,0,targetConn);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_POINT0,0,targetConn);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_POINT0,0,targetConn);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_POINT0,0,targetConn);
-  targetMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(9,3);
-  std::copy(targetCoords,targetCoords+27,myCoords->getPointer());
-  targetMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  //
-  targetMesh->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(3,targetMesh->getSpaceDimension());
-  CPPUNIT_ASSERT_EQUAL(8,targetMesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(9,targetMesh->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(0,targetMesh->getMeshDimension());
-  //
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testMeshM1D()
-{
-  MEDCouplingUMesh *meshM1D=MEDCouplingUMesh::New();
-  CPPUNIT_ASSERT_THROW(meshM1D->getMeshDimension(),INTERP_KERNEL::Exception);
-  CPPUNIT_ASSERT_THROW(meshM1D->getNumberOfNodes(),INTERP_KERNEL::Exception);
-  CPPUNIT_ASSERT_THROW(meshM1D->getNumberOfCells(),INTERP_KERNEL::Exception);
-  CPPUNIT_ASSERT_THROW(meshM1D->setMeshDimension(-2),INTERP_KERNEL::Exception);
-  CPPUNIT_ASSERT_THROW(meshM1D->setMeshDimension(-10),INTERP_KERNEL::Exception);
-  CPPUNIT_ASSERT_THROW(meshM1D->checkCoherency(),INTERP_KERNEL::Exception);
-  meshM1D->setMeshDimension(-1);
-  meshM1D->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(-1,meshM1D->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(1,meshM1D->getNumberOfCells());
-  CPPUNIT_ASSERT_THROW(meshM1D->getNumberOfNodes(),INTERP_KERNEL::Exception);
-  CPPUNIT_ASSERT_THROW(meshM1D->getSpaceDimension(),INTERP_KERNEL::Exception);
-  MEDCouplingUMesh *cpy=meshM1D->clone(true);
-  CPPUNIT_ASSERT(cpy->isEqual(meshM1D,1e-12));
-  cpy->decrRef();
-  MEDCouplingFieldDouble *fieldOnCells=MEDCouplingFieldDouble::New(ON_CELLS);
-  fieldOnCells->setMesh(meshM1D);
-  DataArrayDouble *array=DataArrayDouble::New();
-  array->alloc(1,6);
-  fieldOnCells->setArray(array);
-  double *tmp=array->getPointer();
-  array->decrRef();
-  std::fill(tmp,tmp+6,7.);
-  fieldOnCells->checkCoherency();
-  //
-  fieldOnCells->decrRef();
-  meshM1D->decrRef();
-}
-
-void MEDCouplingBasicsTest::testDeepCopy()
-{
-  DataArrayDouble *array=DataArrayDouble::New();
-  array->alloc(5,3);
-  std::fill(array->getPointer(),array->getPointer()+5*3,7.);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(7.,array->getIJ(3,2),1e-14);
-  double *tmp1=array->getPointer();
-  DataArrayDouble *array2=array->deepCopy();
-  double *tmp2=array2->getPointer();
-  CPPUNIT_ASSERT(tmp1!=tmp2);
-  array->decrRef();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(7.,array2->getIJ(3,2),1e-14);
-  array2->decrRef();
-  //
-  DataArrayInt *array3=DataArrayInt::New();
-  array3->alloc(5,3);
-  std::fill(array3->getPointer(),array3->getPointer()+5*3,17);
-  CPPUNIT_ASSERT_EQUAL(17,array3->getIJ(3,2));
-  int *tmp3=array3->getPointer();
-  DataArrayInt *array4=array3->deepCopy();
-  int *tmp4=array4->getPointer();
-  CPPUNIT_ASSERT(tmp3!=tmp4);
-  array3->decrRef();
-  CPPUNIT_ASSERT_EQUAL(17,array4->getIJ(3,2));
-  array4->decrRef();
-}
-
-void MEDCouplingBasicsTest::testRevNodal()
-{
-  MEDCouplingUMesh *mesh=build2DTargetMesh_1();
-  DataArrayInt *revNodal=DataArrayInt::New();
-  DataArrayInt *revNodalIndx=DataArrayInt::New();
-  //
-  mesh->getReverseNodalConnectivity(revNodal,revNodalIndx);
-  const int revNodalExpected[18]={0,0,1,1,2,0,3,0,1,2,3,4,2,4,3,3,4,4};
-  const int revNodalIndexExpected[10]={0,1,3,5,7,12,14,15,17,18};
-  CPPUNIT_ASSERT_EQUAL(18,revNodal->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(10,revNodalIndx->getNbOfElems());
-  CPPUNIT_ASSERT(std::equal(revNodalExpected,revNodalExpected+18,revNodal->getPointer()));
-  CPPUNIT_ASSERT(std::equal(revNodalIndexExpected,revNodalIndexExpected+10,revNodalIndx->getPointer()));
-  //
-  revNodal->decrRef();
-  revNodalIndx->decrRef();
-  mesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testConvertToPolyTypes()
-{
-  ////// 2D
-  MEDCouplingUMesh *mesh=build2DTargetMesh_1();
-  //
-  const int elts[2]={1,3};
-  std::vector<int> eltsV(elts,elts+2);
-  mesh->convertToPolyTypes(eltsV);
-  mesh->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(5,mesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(23,mesh->getNodalConnectivity()->getNumberOfTuples());
-  const int *pt=mesh->getNodalConnectivity()->getConstPointer();
-  const int expected1[23]={4, 0, 3, 4, 1, 5, 1, 4, 2, 3, 4, 5, 2, 5, 6, 7, 4, 3, 4, 7, 8, 5, 4};
-  CPPUNIT_ASSERT(std::equal(expected1,expected1+23,pt));
-  //
-  mesh->decrRef();
-  ////// 3D
-  mesh=build3DTargetMesh_1();
-  mesh->convertToPolyTypes(eltsV);
-  mesh->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(8,mesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(114,mesh->getNodalConnectivity()->getNumberOfTuples());
-  mesh->convertToPolyTypes(eltsV);
-  mesh->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(8,mesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(114,mesh->getNodalConnectivity()->getNumberOfTuples());
-  //
-  mesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testDescConn2D()
-{
-  MEDCouplingUMesh *mesh=build2DTargetMesh_1();
-  DataArrayInt *desc=DataArrayInt::New();
-  DataArrayInt *descIndx=DataArrayInt::New();
-  DataArrayInt *revDesc=DataArrayInt::New();
-  DataArrayInt *revDescIndx=DataArrayInt::New();
-  //
-  MEDCouplingUMesh *mesh2=mesh->buildDescendingConnectivity(desc,descIndx,revDesc,revDescIndx);
-  mesh2->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(1,mesh2->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(13,mesh2->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(14,revDescIndx->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(14,revDescIndx->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(6,descIndx->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(6,descIndx->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(18,desc->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(18,desc->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(18,revDesc->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(18,revDesc->getNumberOfTuples());
-  const int expected1[18]={0,1,2,3, 2,4,5, 6,7,4, 8,9,1,10, 11,12,6,9};
-  CPPUNIT_ASSERT(std::equal(expected1,expected1+18,desc->getConstPointer()));
-  const int expected2[6]={0,4,7,10,14,18};
-  CPPUNIT_ASSERT(std::equal(expected2,expected2+6,descIndx->getConstPointer()));
-  const int expected3[14]={0,1,3,5,6,8,9,11,12,13,15,16,17,18};
-  CPPUNIT_ASSERT(std::equal(expected3,expected3+14,revDescIndx->getConstPointer()));
-  const int expected4[18]={0, 0,3, 0,1, 0, 1,2, 1, 2,4, 2, 3, 3,4, 3, 4, 4};
-  CPPUNIT_ASSERT(std::equal(expected4,expected4+18,revDesc->getConstPointer()));
-  DataArrayInt *conn=mesh2->getNodalConnectivity();
-  DataArrayInt *connIndex=mesh2->getNodalConnectivityIndex();
-  const int expected5[14]={0,3,6,9,12,15,18,21,24,27,30,33,36,39};
-  CPPUNIT_ASSERT(std::equal(expected5,expected5+14,connIndex->getConstPointer()));
-  const int expected6[39]={1, 0, 3, 1, 3, 4, 1, 4, 1, 1, 1, 0, 1, 4, 2, 1, 2, 1, 1, 4, 5, 1, 5, 2, 1, 6, 7, 1, 7, 4, 1, 3, 6, 1, 7, 8, 1, 8, 5};
-  CPPUNIT_ASSERT(std::equal(expected6,expected6+39,conn->getConstPointer()));
-  //
-  desc->decrRef();
-  descIndx->decrRef();
-  revDesc->decrRef();
-  revDescIndx->decrRef();
-  mesh2->decrRef();
-  //
-  const int elts[2]={1,3};
-  std::vector<int> eltsV(elts,elts+2);
-  mesh->convertToPolyTypes(eltsV);
-  mesh->checkCoherency();
-  //
-  desc=DataArrayInt::New();
-  descIndx=DataArrayInt::New();
-  revDesc=DataArrayInt::New();
-  revDescIndx=DataArrayInt::New();
-  //
-  mesh2=mesh->buildDescendingConnectivity(desc,descIndx,revDesc,revDescIndx);
-  mesh2->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(1,mesh2->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(13,mesh2->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(14,revDescIndx->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(14,revDescIndx->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(6,descIndx->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(6,descIndx->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(18,desc->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(18,desc->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(18,revDesc->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(18,revDesc->getNumberOfTuples());
-  CPPUNIT_ASSERT(std::equal(expected1,expected1+18,desc->getConstPointer()));
-  CPPUNIT_ASSERT(std::equal(expected2,expected2+6,descIndx->getConstPointer()));
-  CPPUNIT_ASSERT(std::equal(expected3,expected3+14,revDescIndx->getConstPointer()));
-  CPPUNIT_ASSERT(std::equal(expected4,expected4+18,revDesc->getConstPointer()));
-  conn=mesh2->getNodalConnectivity();
-  connIndex=mesh2->getNodalConnectivityIndex();
-  CPPUNIT_ASSERT(std::equal(expected5,expected5+14,connIndex->getConstPointer()));
-  CPPUNIT_ASSERT(std::equal(expected6,expected6+39,conn->getConstPointer()));
-  //
-  desc->decrRef();
-  descIndx->decrRef();
-  revDesc->decrRef();
-  revDescIndx->decrRef();
-  mesh2->decrRef();
-  mesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testDescConn3D()
-{
-  MEDCouplingUMesh *mesh=build3DTargetMesh_1();
-  DataArrayInt *desc=DataArrayInt::New();
-  DataArrayInt *descIndx=DataArrayInt::New();
-  DataArrayInt *revDesc=DataArrayInt::New();
-  DataArrayInt *revDescIndx=DataArrayInt::New();
-  //
-  MEDCouplingUMesh *mesh2=mesh->buildDescendingConnectivity(desc,descIndx,revDesc,revDescIndx);
-  mesh2->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(2,mesh2->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(36,mesh2->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(37,revDescIndx->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(37,revDescIndx->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(9,descIndx->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(9,descIndx->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(48,desc->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(48,desc->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(48,revDesc->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(48,revDesc->getNumberOfTuples());
-  const int expected1[9]={0, 6, 12, 18, 24, 30, 36, 42, 48};
-  const int expected2[48]={0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 3, 11, 12, 4, 13, 14, 15, 16, 17, 10, 18, 19, 13, 1, 20, 21, 22, 23, 24, 7, 25, 26, 27, 28, 22, 12, 29, 23, 30, 31, 32, 17, 33, 28, 34, 35, 30};
-  const int expected3[37]={0, 1, 3, 4, 6, 8, 9, 10, 12, 13, 14, 16, 17, 19, 21, 22, 23, 24, 26, 27, 28, 29, 30, 32, 34, 35, 36, 37, 38, 40, 41, 43, 44, 45, 46, 47, 48};
-  const int expected4[48]={0, 0, 4, 0, 0, 1, 0, 2, 0, 1, 1, 5, 1, 1, 1, 3, 2, 2, 6, 2, 3, 2, 2, 3, 3, 7, 3, 3, 4, 4, 4, 5, 4, 6, 4, 5, 5, 5, 5, 7, 6, 6, 7, 6, 6, 7, 7, 7};
-  const int expected5[37]={0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100, 105, 110, 115, 120, 125, 130, 135, 140, 145, 150, 155, 160, 165, 170, 175, 180};
-  const int expected6[180]={4, 0, 1, 4, 3, 4, 9, 12, 13, 10, 4, 0, 9, 10, 1, 4, 1, 10, 13, 4, 4, 4, 13, 12, 3, 4, 3, 12, 9, 0, 4, 1, 2, 5, 4, 4, 10, 13, 14, 11, 4, 1, 10, 11, 2, 4, 2, 11, 14,
-                            5, 4, 5, 14, 13, 4, 4, 3, 4, 7, 6, 4, 12, 15, 16, 13, 4, 4, 13, 16, 7, 4, 7, 16, 15, 6, 4, 6, 15, 12, 3, 4, 4, 5, 8, 7, 4, 13, 16, 17, 14, 4, 5, 14, 17, 8, 4, 8,
-                            17, 16, 7, 4, 18, 21, 22, 19, 4, 9, 18, 19, 10, 4, 10, 19, 22, 13, 4, 13, 22, 21, 12, 4, 12, 21, 18, 9, 4, 19, 22, 23, 20, 4, 10, 19, 20, 11, 4, 11, 20, 23, 14, 4,
-                            14, 23, 22, 13, 4, 21, 24, 25, 22, 4, 13, 22, 25, 16, 4, 16, 25, 24, 15, 4, 15, 24, 21, 12, 4, 22, 25, 26, 23, 4, 14, 23, 26, 17, 4, 17, 26, 25, 16};
-  const int expected7[180]={4, 0, 1, 4, 3, 4, 9, 12, 13, 10, 4, 0, 9, 10, 1, 4, 1, 10, 13, 4, 4, 4, 13, 12, 3, 4, 3, 12, 9, 0, 5, 1, 2, 5, 4, 5, 10, 13, 14, 11, 5, 1, 10, 11, 2, 5, 2, 11, 14,
-                            5, 5, 5, 14, 13, 4, 4, 3, 4, 7, 6, 4, 12, 15, 16, 13, 4, 4, 13, 16, 7, 4, 7, 16, 15, 6, 4, 6, 15, 12, 3, 5, 4, 5, 8, 7, 5, 13, 16, 17, 14, 5, 5, 14, 17, 8, 5, 8,
-                            17, 16, 7, 4, 18, 21, 22, 19, 4, 9, 18, 19, 10, 4, 10, 19, 22, 13, 4, 13, 22, 21, 12, 4, 12, 21, 18, 9, 4, 19, 22, 23, 20, 4, 10, 19, 20, 11, 4, 11, 20, 23, 14, 4,
-                            14, 23, 22, 13, 4, 21, 24, 25, 22, 4, 13, 22, 25, 16, 4, 16, 25, 24, 15, 4, 15, 24, 21, 12, 4, 22, 25, 26, 23, 4, 14, 23, 26, 17, 4, 17, 26, 25, 16};
-
-  CPPUNIT_ASSERT(std::equal(expected1,expected1+9,descIndx->getConstPointer()));
-  CPPUNIT_ASSERT(std::equal(expected2,expected2+48,desc->getConstPointer()));
-  CPPUNIT_ASSERT(std::equal(expected3,expected3+37,revDescIndx->getConstPointer()));
-  CPPUNIT_ASSERT(std::equal(expected4,expected4+48,revDesc->getConstPointer()));
-  CPPUNIT_ASSERT(std::equal(expected5,expected5+37,mesh2->getNodalConnectivityIndex()->getConstPointer()));
-  CPPUNIT_ASSERT(std::equal(expected6,expected6+180,mesh2->getNodalConnectivity()->getConstPointer()));
-  //
-  desc->decrRef();
-  descIndx->decrRef();
-  revDesc->decrRef();
-  revDescIndx->decrRef();
-  mesh2->decrRef();
-  //
-  const int elts[2]={1,3};
-  std::vector<int> eltsV(elts,elts+2);
-  mesh->convertToPolyTypes(eltsV);
-  mesh->checkCoherency();
-  desc=DataArrayInt::New();
-  descIndx=DataArrayInt::New();
-  revDesc=DataArrayInt::New();
-  revDescIndx=DataArrayInt::New();
-  mesh2=mesh->buildDescendingConnectivity(desc,descIndx,revDesc,revDescIndx);
-  mesh2->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(2,mesh2->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(36,mesh2->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(37,revDescIndx->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(37,revDescIndx->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(9,descIndx->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(9,descIndx->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(48,desc->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(48,desc->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(48,revDesc->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(48,revDesc->getNumberOfTuples());
-  CPPUNIT_ASSERT(std::equal(expected1,expected1+9,descIndx->getConstPointer()));
-  CPPUNIT_ASSERT(std::equal(expected2,expected2+48,desc->getConstPointer()));
-  CPPUNIT_ASSERT(std::equal(expected3,expected3+37,revDescIndx->getConstPointer()));
-  CPPUNIT_ASSERT(std::equal(expected4,expected4+48,revDesc->getConstPointer()));
-  CPPUNIT_ASSERT(std::equal(expected5,expected5+37,mesh2->getNodalConnectivityIndex()->getConstPointer()));
-  CPPUNIT_ASSERT(std::equal(expected7,expected7+180,mesh2->getNodalConnectivity()->getConstPointer()));
-  //
-  desc->decrRef();
-  descIndx->decrRef();
-  revDesc->decrRef();
-  revDescIndx->decrRef();
-  mesh2->decrRef();
-  mesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testFindBoundaryNodes()
-{
-  MEDCouplingUMesh *mesh=build3DTargetMesh_1();
-  std::vector<int> boundaryNodes;
-  mesh->findBoundaryNodes(boundaryNodes);
-  CPPUNIT_ASSERT_EQUAL(26,(int)boundaryNodes.size());
-  const int expected1[26]={0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26};
-  CPPUNIT_ASSERT(std::equal(expected1,expected1+26,boundaryNodes.begin()));
-  mesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testBoundaryMesh()
-{
-  MEDCouplingUMesh *mesh=build3DTargetMesh_1();
-  MEDCouplingPointSet *mesh2=mesh->buildBoundaryMesh(false);
-  CPPUNIT_ASSERT_EQUAL(24,mesh2->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(26,mesh2->getNumberOfNodes());
-  mesh2->decrRef();
-  mesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testBuildPartOfMySelf()
-{
-  MEDCouplingUMesh *mesh=build2DTargetMesh_1();
-  mesh->setName("Toto");
-  const int tab1[2]={0,4};
-  const int tab2[3]={0,2,3};
-  //
-  MEDCouplingPointSet *subMeshSimple=mesh->buildPartOfMySelf(tab1,tab1+2,true);
-  MEDCouplingUMesh *subMesh=dynamic_cast<MEDCouplingUMesh *>(subMeshSimple);
-  CPPUNIT_ASSERT(subMesh);
-  std::string name(subMesh->getName());
-  CPPUNIT_ASSERT_EQUAL(2,(int)mesh->getAllTypes().size());
-  CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TRI3,*mesh->getAllTypes().begin());
-  CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_QUAD4,*(++(mesh->getAllTypes().begin())));
-  CPPUNIT_ASSERT_EQUAL(1,(int)subMesh->getAllTypes().size());
-  CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_QUAD4,*subMesh->getAllTypes().begin());
-  CPPUNIT_ASSERT(name=="PartOf_Toto");
-  CPPUNIT_ASSERT(mesh->getCoords()==subMesh->getCoords());
-  CPPUNIT_ASSERT_EQUAL(2,subMesh->getNumberOfCells());
-  const int subConn[10]={4,0,3,4,1,4,7,8,5,4};
-  const int subConnIndex[3]={0,5,10};
-  CPPUNIT_ASSERT_EQUAL(10,subMesh->getNodalConnectivity()->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(3,subMesh->getNodalConnectivityIndex()->getNbOfElems());
-  CPPUNIT_ASSERT(std::equal(subConn,subConn+10,subMesh->getNodalConnectivity()->getPointer()));
-  CPPUNIT_ASSERT(std::equal(subConnIndex,subConnIndex+3,subMesh->getNodalConnectivityIndex()->getPointer()));
-  subMesh->decrRef();
-  //
-  subMeshSimple=mesh->buildPartOfMySelf(tab2,tab2+3,true);
-  subMesh=dynamic_cast<MEDCouplingUMesh *>(subMeshSimple);
-  CPPUNIT_ASSERT(subMesh);
-  name=subMesh->getName();
-  CPPUNIT_ASSERT_EQUAL(2,(int)subMesh->getAllTypes().size());
-  CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TRI3,*subMesh->getAllTypes().begin());
-  CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_QUAD4,*(++(subMesh->getAllTypes().begin())));
-  CPPUNIT_ASSERT(name=="PartOf_Toto");
-  CPPUNIT_ASSERT(mesh->getCoords()==subMesh->getCoords());
-  CPPUNIT_ASSERT_EQUAL(3,subMesh->getNumberOfCells());
-  const int subConn2[14]={4,0,3,4,1,3,4,5,2,4,6,7,4,3};
-  const int subConnIndex2[4]={0,5,9,14};
-  CPPUNIT_ASSERT_EQUAL(14,subMesh->getNodalConnectivity()->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(4,subMesh->getNodalConnectivityIndex()->getNbOfElems());
-  CPPUNIT_ASSERT(std::equal(subConn2,subConn2+14,subMesh->getNodalConnectivity()->getPointer()));
-  CPPUNIT_ASSERT(std::equal(subConnIndex2,subConnIndex2+4,subMesh->getNodalConnectivityIndex()->getPointer()));
-  subMesh->decrRef();
-  //
-  mesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testBuildPartOfMySelfNode()
-{
-  MEDCouplingUMesh *mesh=build2DTargetMesh_1();
-  const int tab1[2]={5,7};
-  MEDCouplingPointSet *subMeshSimple=mesh->buildPartOfMySelfNode(tab1,tab1+2,true);
-  MEDCouplingUMesh *subMesh=dynamic_cast<MEDCouplingUMesh *>(subMeshSimple);
-  CPPUNIT_ASSERT(subMesh);
-  CPPUNIT_ASSERT_EQUAL(1,(int)subMesh->getAllTypes().size());
-  CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_QUAD4,*subMesh->getAllTypes().begin());
-  CPPUNIT_ASSERT_EQUAL(1,subMesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(5,subMesh->getNodalConnectivity()->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(2,subMesh->getNodalConnectivityIndex()->getNbOfElems());
-  const int subConn[5]={4,7,8,5,4};
-  const int subConnIndex[3]={0,5};
-  CPPUNIT_ASSERT(std::equal(subConn,subConn+5,subMesh->getNodalConnectivity()->getPointer()));
-  CPPUNIT_ASSERT(std::equal(subConnIndex,subConnIndex+2,subMesh->getNodalConnectivityIndex()->getPointer()));
-  CPPUNIT_ASSERT(subMesh->getCoords()==mesh->getCoords());
-  subMeshSimple->decrRef();
-  //
-  subMeshSimple=mesh->buildPartOfMySelfNode(tab1,tab1+2,false);
-  subMesh=dynamic_cast<MEDCouplingUMesh *>(subMeshSimple);
-  CPPUNIT_ASSERT(subMesh);
-  CPPUNIT_ASSERT_EQUAL(2,(int)subMesh->getAllTypes().size());
-  CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TRI3,*subMesh->getAllTypes().begin());
-  CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_QUAD4,*(++subMesh->getAllTypes().begin()));
-  CPPUNIT_ASSERT_EQUAL(3,subMesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(14,subMesh->getNodalConnectivity()->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(4,subMesh->getNodalConnectivityIndex()->getNbOfElems());
-  const int subConn2[14]={3,4,5,2,4,6,7,4,3,4,7,8,5,4};
-  const int subConnIndex2[4]={0,4,9,14};
-  CPPUNIT_ASSERT(std::equal(subConn2,subConn2+14,subMesh->getNodalConnectivity()->getPointer()));
-  CPPUNIT_ASSERT(std::equal(subConnIndex2,subConnIndex2+4,subMesh->getNodalConnectivityIndex()->getPointer()));
-  CPPUNIT_ASSERT(subMesh->getCoords()==mesh->getCoords());
-  subMeshSimple->decrRef();
-  //testing the case where length of tab2 is greater than max number of node per cell.
-  const int tab2[7]={0,3,2,1,4,5,6};
-  subMeshSimple=mesh->buildPartOfMySelfNode(tab2,tab2+7,true);
-  subMesh=dynamic_cast<MEDCouplingUMesh *>(subMeshSimple);
-  CPPUNIT_ASSERT(subMesh);
-  CPPUNIT_ASSERT_EQUAL(2,(int)subMesh->getAllTypes().size());
-  CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TRI3,*subMesh->getAllTypes().begin());
-  CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_QUAD4,*(++subMesh->getAllTypes().begin()));
-  CPPUNIT_ASSERT_EQUAL(3,subMesh->getNumberOfCells());
-  subMeshSimple->decrRef();
-  //
-  mesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testZipCoords()
-{
-  MEDCouplingUMesh *mesh=build2DTargetMesh_1();
-  CPPUNIT_ASSERT_EQUAL(2,(int)mesh->getAllTypes().size());
-  CPPUNIT_ASSERT_EQUAL(2,mesh->getSpaceDimension());
-  CPPUNIT_ASSERT_EQUAL(9,mesh->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(5,mesh->getNumberOfCells());
-  std::vector<int> oldConn(mesh->getNodalConnectivity()->getNbOfElems());
-  std::vector<int> oldConnIndex(mesh->getNumberOfCells()+1);
-  std::copy(mesh->getNodalConnectivity()->getPointer(),mesh->getNodalConnectivity()->getPointer()+oldConn.size(),oldConn.begin());
-  std::copy(mesh->getNodalConnectivityIndex()->getPointer(),mesh->getNodalConnectivityIndex()->getPointer()+mesh->getNumberOfCells()+1,oldConnIndex.begin());
-  DataArrayDouble *oldCoords=mesh->getCoords();
-  oldCoords->incrRef();
-  mesh->zipCoords();
-  CPPUNIT_ASSERT_EQUAL(2,(int)mesh->getAllTypes().size());
-  CPPUNIT_ASSERT_EQUAL(2,mesh->getSpaceDimension());
-  CPPUNIT_ASSERT_EQUAL(9,mesh->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(5,mesh->getNumberOfCells());
-  CPPUNIT_ASSERT(mesh->getCoords()!=oldCoords);
-  CPPUNIT_ASSERT(std::equal(mesh->getCoords()->getPointer(),mesh->getCoords()->getPointer()+2*9,oldCoords->getPointer()));
-  CPPUNIT_ASSERT(std::equal(oldConn.begin(),oldConn.end(),mesh->getNodalConnectivity()->getPointer()));
-  CPPUNIT_ASSERT(std::equal(oldConnIndex.begin(),oldConnIndex.end(),mesh->getNodalConnectivityIndex()->getPointer()));
-  oldCoords->decrRef();
-  //
-  const int tab1[2]={0,4};
-  MEDCouplingPointSet *subMeshPtSet=mesh->buildPartOfMySelf(tab1,tab1+2,true);
-  MEDCouplingUMesh *subMesh=dynamic_cast<MEDCouplingUMesh *>(subMeshPtSet);
-  CPPUNIT_ASSERT(subMesh);
-  DataArrayInt *traducer=subMesh->zipCoordsTraducer();
-  const int expectedTraducer[9]={0,1,-1,2,3,4,-1,5,6};
-  CPPUNIT_ASSERT(std::equal(expectedTraducer,expectedTraducer+9,traducer->getPointer()));
-  traducer->decrRef();
-  CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_QUAD4,*subMesh->getAllTypes().begin());
-  CPPUNIT_ASSERT_EQUAL(2,subMesh->getNumberOfCells());
-  const int subConn[10]={4,0,2,3,1,4,5,6,4,3};
-  const int subConnIndex[3]={0,5,10};
-  CPPUNIT_ASSERT_EQUAL(7,subMesh->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(10,subMesh->getNodalConnectivity()->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(3,subMesh->getNodalConnectivityIndex()->getNbOfElems());
-  CPPUNIT_ASSERT(std::equal(subConn,subConn+10,subMesh->getNodalConnectivity()->getPointer()));
-  CPPUNIT_ASSERT(std::equal(subConnIndex,subConnIndex+3,subMesh->getNodalConnectivityIndex()->getPointer()));
-  subMesh->decrRef();
-  //
-  subMeshPtSet=mesh->buildPartOfMySelf(tab1,tab1+2,false);
-  subMesh=dynamic_cast<MEDCouplingUMesh *>(subMeshPtSet);
-  CPPUNIT_ASSERT(subMesh);
-  CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_QUAD4,*subMesh->getAllTypes().begin());
-  CPPUNIT_ASSERT_EQUAL(2,subMesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(7,subMesh->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(10,subMesh->getNodalConnectivity()->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(3,subMesh->getNodalConnectivityIndex()->getNbOfElems());
-  CPPUNIT_ASSERT(std::equal(subConn,subConn+10,subMesh->getNodalConnectivity()->getPointer()));
-  CPPUNIT_ASSERT(std::equal(subConnIndex,subConnIndex+3,subMesh->getNodalConnectivityIndex()->getPointer()));
-  subMesh->decrRef();
-  //
-  mesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testEqualMesh()
-{
-  MEDCouplingUMesh *mesh1=build2DTargetMesh_1();
-  MEDCouplingUMesh *mesh2=build2DTargetMesh_1();
-  //
-  CPPUNIT_ASSERT(mesh1->isEqual(mesh1,1e-12));
-  //
-  CPPUNIT_ASSERT(mesh1->isEqual(mesh2,1e-12));
-  CPPUNIT_ASSERT(mesh2->isEqual(mesh1,1e-12));
-  double *pt=mesh2->getCoords()->getPointer();
-  double tmp=pt[1];
-  pt[1]=5.999;
-  CPPUNIT_ASSERT(!mesh1->isEqual(mesh2,1e-12));
-  CPPUNIT_ASSERT(!mesh2->isEqual(mesh1,1e-12));
-  pt[1]=tmp;
-  CPPUNIT_ASSERT(mesh1->isEqual(mesh2,1e-12));
-  CPPUNIT_ASSERT(mesh2->isEqual(mesh1,1e-12));
-  //
-  int *pt2=mesh1->getNodalConnectivity()->getPointer();
-  pt2[5]++;
-  CPPUNIT_ASSERT(!mesh1->isEqual(mesh2,1e-12));
-  CPPUNIT_ASSERT(!mesh2->isEqual(mesh1,1e-12));
-  pt2[5]--;
-  CPPUNIT_ASSERT(mesh1->isEqual(mesh2,1e-12));
-  CPPUNIT_ASSERT(mesh2->isEqual(mesh1,1e-12));
-  //
-  pt2=mesh1->getNodalConnectivityIndex()->getPointer();
-  pt2[1]++;
-  CPPUNIT_ASSERT(!mesh1->isEqual(mesh2,1e-12));
-  CPPUNIT_ASSERT(!mesh2->isEqual(mesh1,1e-12));
-  pt2[1]--;
-  CPPUNIT_ASSERT(mesh1->isEqual(mesh2,1e-12));
-  CPPUNIT_ASSERT(mesh2->isEqual(mesh1,1e-12));
-  //
-  std::string tmp3=mesh1->getName();
-  mesh1->setName("lllll");
-  CPPUNIT_ASSERT(!mesh1->isEqual(mesh2,1e-12));
-  CPPUNIT_ASSERT(!mesh2->isEqual(mesh1,1e-12));
-  mesh1->setName(tmp3.c_str());
-  CPPUNIT_ASSERT(mesh1->isEqual(mesh2,1e-12));
-  CPPUNIT_ASSERT(mesh2->isEqual(mesh1,1e-12));
-  //
-  tmp3=mesh2->getCoords()->getInfoOnComponent(1);
-  mesh2->getCoords()->setInfoOnComponent(1,"kkkkkk");
-  CPPUNIT_ASSERT(!mesh1->isEqual(mesh2,1e-12));
-  CPPUNIT_ASSERT(!mesh2->isEqual(mesh1,1e-12));
-  mesh2->getCoords()->setInfoOnComponent(1,tmp3.c_str());
-  CPPUNIT_ASSERT(mesh1->isEqual(mesh2,1e-12));
-  CPPUNIT_ASSERT(mesh2->isEqual(mesh1,1e-12));
-  //
-  mesh1->decrRef();
-  mesh2->decrRef();
-}
-
-void MEDCouplingBasicsTest::testEqualFieldDouble()
-{
-  MEDCouplingUMesh *mesh1=build2DTargetMesh_1();
-  MEDCouplingUMesh *mesh2=build2DTargetMesh_1();
-  //
-  MEDCouplingFieldDouble *fieldOnCells1=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
-  fieldOnCells1->setMesh(mesh1);
-  MEDCouplingFieldDouble *fieldOnCells2=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
-  fieldOnCells2->setMesh(mesh2);
-  //
-  CPPUNIT_ASSERT(fieldOnCells1->isEqual(fieldOnCells2,1e-12,1e-15));
-  CPPUNIT_ASSERT(fieldOnCells2->isEqual(fieldOnCells1,1e-12,1e-15));
-  fieldOnCells2->decrRef();
-  //
-  MEDCouplingFieldDouble *fieldOnNodes1=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
-  CPPUNIT_ASSERT(!fieldOnCells1->isEqual(fieldOnNodes1,1e-12,1e-15));
-  CPPUNIT_ASSERT(!fieldOnNodes1->isEqual(fieldOnCells1,1e-12,1e-15));
-  fieldOnNodes1->decrRef();
-  //
-  fieldOnCells2=MEDCouplingFieldDouble::New(ON_CELLS,ONE_TIME);
-  CPPUNIT_ASSERT(!fieldOnCells1->isEqual(fieldOnCells2,1e-12,1e-15));
-  CPPUNIT_ASSERT(!fieldOnCells2->isEqual(fieldOnCells1,1e-12,1e-15));
-  fieldOnCells1->decrRef();
-  fieldOnCells1=MEDCouplingFieldDouble::New(ON_CELLS,ONE_TIME);
-  CPPUNIT_ASSERT(fieldOnCells1->isEqual(fieldOnCells2,1e-12,1e-15));
-  CPPUNIT_ASSERT(fieldOnCells2->isEqual(fieldOnCells1,1e-12,1e-15));
-  fieldOnCells1->setTime(4.,6,7);
-  CPPUNIT_ASSERT(!fieldOnCells1->isEqual(fieldOnCells2,1e-12,1e-15));
-  CPPUNIT_ASSERT(!fieldOnCells2->isEqual(fieldOnCells1,1e-12,1e-15));
-  fieldOnCells2->setTime(4.,6,7);
-  CPPUNIT_ASSERT(fieldOnCells1->isEqual(fieldOnCells2,1e-12,1e-15));
-  CPPUNIT_ASSERT(fieldOnCells2->isEqual(fieldOnCells1,1e-12,1e-15));
-  fieldOnCells1->setName("Power");
-  CPPUNIT_ASSERT(!fieldOnCells1->isEqual(fieldOnCells2,1e-12,1e-15));
-  CPPUNIT_ASSERT(!fieldOnCells2->isEqual(fieldOnCells1,1e-12,1e-15));
-  fieldOnCells2->setName("Power");
-  CPPUNIT_ASSERT(fieldOnCells1->isEqual(fieldOnCells2,1e-12,1e-15));
-  CPPUNIT_ASSERT(fieldOnCells2->isEqual(fieldOnCells1,1e-12,1e-15));
-  //
-  fieldOnCells1->setMesh(mesh1);
-  CPPUNIT_ASSERT(!fieldOnCells1->isEqual(fieldOnCells2,1e-12,1e-15));
-  CPPUNIT_ASSERT(!fieldOnCells2->isEqual(fieldOnCells1,1e-12,1e-15));
-  fieldOnCells2->setMesh(mesh1);
-  CPPUNIT_ASSERT(fieldOnCells1->isEqual(fieldOnCells2,1e-12,1e-15));
-  CPPUNIT_ASSERT(fieldOnCells2->isEqual(fieldOnCells1,1e-12,1e-15));
-  DataArrayDouble *arr=DataArrayDouble::New();
-  arr->setName("popo");
-  arr->alloc(mesh1->getNumberOfCells(),3);
-  double *pt=arr->getPointer();
-  std::fill(pt,pt+mesh1->getNumberOfCells()*3,6.);
-  fieldOnCells1->setArray(arr);
-  CPPUNIT_ASSERT(!fieldOnCells1->isEqual(fieldOnCells2,1e-12,1e-15));
-  CPPUNIT_ASSERT(!fieldOnCells2->isEqual(fieldOnCells1,1e-12,1e-15));
-  fieldOnCells2->setArray(arr);
-  arr->decrRef();
-  CPPUNIT_ASSERT(fieldOnCells1->isEqual(fieldOnCells2,1e-12,1e-15));
-  CPPUNIT_ASSERT(fieldOnCells2->isEqual(fieldOnCells1,1e-12,1e-15));
-  //
-  DataArrayDouble *arr2=arr->deepCopy();
-  fieldOnCells2->setArray(arr2);
-  arr2->decrRef();
-  CPPUNIT_ASSERT(fieldOnCells1->isEqual(fieldOnCells2,1e-12,1e-15));
-  CPPUNIT_ASSERT(fieldOnCells2->isEqual(fieldOnCells1,1e-12,1e-15));
-  pt[4]=6.1;
-  CPPUNIT_ASSERT(!fieldOnCells1->isEqual(fieldOnCells2,1e-12,1e-15));
-  CPPUNIT_ASSERT(!fieldOnCells2->isEqual(fieldOnCells1,1e-12,1e-15));
-  pt[4]=6.;
-  CPPUNIT_ASSERT(fieldOnCells1->isEqual(fieldOnCells2,1e-12,1e-15));
-  CPPUNIT_ASSERT(fieldOnCells2->isEqual(fieldOnCells1,1e-12,1e-15));
-  arr2->setName("popo2");
-  CPPUNIT_ASSERT(!fieldOnCells1->isEqual(fieldOnCells2,1e-12,1e-15));
-  CPPUNIT_ASSERT(!fieldOnCells2->isEqual(fieldOnCells1,1e-12,1e-15));
-  //
-  arr2->setName("popo");
-  CPPUNIT_ASSERT(fieldOnCells1->isEqual(fieldOnCells2,1e-12,1e-15));
-  CPPUNIT_ASSERT(fieldOnCells2->isEqual(fieldOnCells1,1e-12,1e-15));
-  //
-  arr2->setInfoOnComponent(2,"jjj");
-  CPPUNIT_ASSERT(!fieldOnCells1->isEqual(fieldOnCells2,1e-12,1e-15));
-  CPPUNIT_ASSERT(!fieldOnCells2->isEqual(fieldOnCells1,1e-12,1e-15));
-  arr->setInfoOnComponent(2,"jjj");
-  CPPUNIT_ASSERT(fieldOnCells1->isEqual(fieldOnCells2,1e-12,1e-15));
-  CPPUNIT_ASSERT(fieldOnCells2->isEqual(fieldOnCells1,1e-12,1e-15));
-  //
-  fieldOnCells1->decrRef();
-  fieldOnCells2->decrRef();
-  //
-  mesh1->decrRef();
-  mesh2->decrRef();
-}
-
-void MEDCouplingBasicsTest::testNatureChecking()
-{
-  MEDCouplingFieldDouble *field=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
-  field->setNature(Integral);
-  field->setNature(ConservativeVolumic);
-  field->setNature(IntegralGlobConstraint);
-  field->decrRef();
-  field=MEDCouplingFieldDouble::New(ON_NODES,NO_TIME);
-  field->setNature(ConservativeVolumic);
-  CPPUNIT_ASSERT_THROW(field->setNature(Integral),INTERP_KERNEL::Exception);
-  CPPUNIT_ASSERT_THROW(field->setNature(IntegralGlobConstraint),INTERP_KERNEL::Exception);
-  field->decrRef();
-}
-
-void MEDCouplingBasicsTest::testBuildSubMeshData()
-{
-  MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
-  //check buildSubMesh on field on cells
-  MEDCouplingFieldDouble *fieldCells=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
-  fieldCells->setMesh(targetMesh);
-  const int elts[3]={1,2,4};
-  DataArrayInt *di;
-  MEDCouplingMesh *ret1=fieldCells->buildSubMeshData(elts,elts+3,di);
-  CPPUNIT_ASSERT_EQUAL(3,ret1->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(6,ret1->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(3,di->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,di->getNumberOfComponents());
-  const int *toCheck=di->getConstPointer();
-  CPPUNIT_ASSERT(std::equal(elts,elts+3,toCheck));
-  MEDCouplingUMesh *ret1DC=dynamic_cast<MEDCouplingUMesh *>(ret1);
-  CPPUNIT_ASSERT(ret1DC);
-  ret1->decrRef();
-  di->decrRef();
-  fieldCells->decrRef();
-  //check buildSubMesh on field on nodes
-  MEDCouplingFieldDouble *fieldNodes=MEDCouplingFieldDouble::New(ON_NODES,NO_TIME);
-  fieldNodes->setMesh(targetMesh);
-  MEDCouplingMesh *ret2=fieldNodes->buildSubMeshData(elts,elts+3,di);
-  MEDCouplingUMesh *ret2DC=dynamic_cast<MEDCouplingUMesh *>(ret2);
-  CPPUNIT_ASSERT(ret2DC);
-  CPPUNIT_ASSERT_EQUAL(3,ret2->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(6,ret2->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(6,di->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,di->getNumberOfComponents());
-  toCheck=di->getConstPointer();
-  const int expected[6]={1,2,4,5,7,8};
-  CPPUNIT_ASSERT(std::equal(expected,expected+6,toCheck));
-  ret2->decrRef();
-  di->decrRef();
-  fieldNodes->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testExtrudedMesh1()
-{
-  MEDCouplingUMesh *mesh2D=0;
-  MEDCouplingUMesh *mesh3D=build3DExtrudedUMesh_1(mesh2D);
-  MEDCouplingExtrudedMesh *ext=MEDCouplingExtrudedMesh::New(mesh3D,mesh2D,1);
-  CPPUNIT_ASSERT_EQUAL(18,ext->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(60,ext->getNumberOfNodes());
-  DataArrayInt *ids3D=ext->getMesh3DIds();
-  const int ids3DExpected[18]={5,4,3,2,1,0, 11,10,9,8,7,6, 17,16,15,14,13,12};
-  CPPUNIT_ASSERT_EQUAL(18,ids3D->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,ids3D->getNumberOfComponents());
-  CPPUNIT_ASSERT(std::equal(ids3DExpected,ids3DExpected+18,ids3D->getConstPointer()));
-  MEDCouplingUMesh *mesh1D=ext->getMesh1D();
-  CPPUNIT_ASSERT_EQUAL(4,mesh1D->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(3,mesh1D->getNumberOfCells());
-  const double mesh1DExpected[12]={0.66666666666666663, 1.4583333333333333, 0, 0.66666666666666663, 1.4583333333333333, 1, 0.66666666666666663, 1.4583333333333333, 2, 0.66666666666666663, 1.4583333333333333, 3};
-  DataArrayDouble *mesh1DCoords=mesh1D->getCoords();
-  CPPUNIT_ASSERT_EQUAL(4,mesh1DCoords->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(3,mesh1DCoords->getNumberOfComponents());
-  CPPUNIT_ASSERT(std::equal(mesh1DExpected,mesh1DExpected+12,mesh1DCoords->getConstPointer()));
-  DataArrayInt *conn1D=mesh1D->getNodalConnectivity();
-  CPPUNIT_ASSERT_EQUAL(9,conn1D->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,conn1D->getNumberOfComponents());
-  const int conn1DExpected[9]={1,0,1,1,1,2,1,2,3};
-  CPPUNIT_ASSERT(std::equal(conn1DExpected,conn1DExpected+9,conn1D->getConstPointer()));
-  ext->decrRef();
-  mesh3D->decrRef();
-  mesh2D->decrRef();
-}
-
-void MEDCouplingBasicsTest::testExtrudedMesh2()
-{
-  MEDCouplingUMesh *mN,*mTT,*mTF;
-  build3DExtrudedUMesh_2(mN,mTT,mTF);
-  //
-  bool b=false;
-  DataArrayInt *da=mTT->mergeNodes(1e-12,b);
-  CPPUNIT_ASSERT(b);
-  da->decrRef();
-  std::vector<int> n;
-  double pt[3]={300.,300.,0.};
-  double v[3]={0.,0.,2.};
-  mTT->findNodesOnPlane(pt,v,1e-12,n);
-  CPPUNIT_ASSERT_EQUAL(43,(int)n.size());
-  MEDCouplingUMesh *mTT3dSurf=(MEDCouplingUMesh *)mTT->buildFacePartOfMySelfNode(&n[0],&n[0]+n.size(),true);
-  MEDCouplingExtrudedMesh *meTT=MEDCouplingExtrudedMesh::New(mTT,mTT3dSurf,0);
-  CPPUNIT_ASSERT_EQUAL(200,meTT->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(10,meTT->getMesh2D()->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(20,meTT->getMesh1D()->getNumberOfCells());
-  mTT3dSurf->decrRef();
-  //
-  b=false;
-  da=mN->mergeNodes(1e-12,b);
-  da->decrRef();
-  CPPUNIT_ASSERT(!b);
-  n.clear();
-  mN->findNodesOnPlane(pt,v,1e-12,n);
-  CPPUNIT_ASSERT_EQUAL(30,(int)n.size());
-  MEDCouplingUMesh *mN3dSurf=(MEDCouplingUMesh *)mN->buildFacePartOfMySelfNode(&n[0],&n[0]+n.size(),true);
-  MEDCouplingExtrudedMesh *meN=MEDCouplingExtrudedMesh::New(mN,mN3dSurf,0);
-  CPPUNIT_ASSERT_EQUAL(40,meN->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(20,meN->getMesh2D()->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(2,meN->getMesh1D()->getNumberOfCells());
-  mN3dSurf->decrRef();
-  //
-  b=false;
-  da=mTF->mergeNodes(1e-12,b);
-  da->decrRef();
-  CPPUNIT_ASSERT(!b);
-  n.clear();
-  mTF->findNodesOnPlane(pt,v,1e-12,n);
-  CPPUNIT_ASSERT_EQUAL(27,(int)n.size());
-  MEDCouplingUMesh *mTF3dSurf=(MEDCouplingUMesh *)mTF->buildFacePartOfMySelfNode(&n[0],&n[0]+n.size(),true);
-  MEDCouplingExtrudedMesh *meTF=MEDCouplingExtrudedMesh::New(mTF,mTF3dSurf,0);
-  CPPUNIT_ASSERT_EQUAL(340,meTF->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(17,meTF->getMesh2D()->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(20,meTF->getMesh1D()->getNumberOfCells());
-  mTF3dSurf->decrRef();
-  //
-  meTT->decrRef();
-  meN->decrRef();
-  meTF->decrRef();
-  //
-  mN->decrRef();
-  mTT->decrRef();
-  mTF->decrRef();
-}
-
-void MEDCouplingBasicsTest::testFindCommonNodes()
-{
-  DataArrayInt *comm,*commI;
-  MEDCouplingUMesh *targetMesh=build3DTargetMesh_1();
-  targetMesh->findCommonNodes(comm,commI,1e-10);
-  CPPUNIT_ASSERT_EQUAL(1,commI->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(0,comm->getNumberOfTuples());
-  int newNbOfNodes;
-  DataArrayInt *o2n=targetMesh->buildNewNumberingFromCommNodesFrmt(comm,commI,newNbOfNodes);
-  CPPUNIT_ASSERT_EQUAL(27,newNbOfNodes);
-  CPPUNIT_ASSERT_EQUAL(27,o2n->getNumberOfTuples());
-  const int o2nExp1[27]=
-    {
-      0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,
-      21,22,23,24,25,26
-    };
-  CPPUNIT_ASSERT(std::equal(o2nExp1,o2nExp1+27,o2n->getConstPointer()));
-  o2n->decrRef();
-  comm->decrRef();
-  commI->decrRef();
-  targetMesh->decrRef();
-  //
-  targetMesh=build3DTargetMeshMergeNode_1();
-  CPPUNIT_ASSERT_EQUAL(31,targetMesh->getNumberOfNodes());
-  targetMesh->findCommonNodes(comm,commI,1e-10);
-  CPPUNIT_ASSERT_EQUAL(3,commI->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(6,comm->getNumberOfTuples());
-  const int commExpected[6]={1,27,28,29,23,30};
-  const int commIExpected[3]={0,4,6};
-  CPPUNIT_ASSERT(std::equal(commExpected,commExpected+6,comm->getConstPointer()));
-  CPPUNIT_ASSERT(std::equal(commIExpected,commIExpected+3,commI->getConstPointer()));
-  o2n=targetMesh->buildNewNumberingFromCommNodesFrmt(comm,commI,newNbOfNodes);
-  CPPUNIT_ASSERT_EQUAL(31,o2n->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(27,newNbOfNodes);
-  const int o2nExp2[31]=
-    {
-      0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,
-      21,22,23,24,25,26,1,1,1,23
-    };
-  CPPUNIT_ASSERT(std::equal(o2nExp2,o2nExp2+31,o2n->getConstPointer()));
-  o2n->decrRef();
-  comm->decrRef();
-  commI->decrRef();
-  targetMesh->decrRef();
-  //
-  targetMesh=build3DTargetMesh_1();
-  bool areNodesMerged;
-  unsigned int time=targetMesh->getTimeOfThis();
-  o2n=targetMesh->mergeNodes(1e-10,areNodesMerged);
-  targetMesh->updateTime();
-  CPPUNIT_ASSERT(time==targetMesh->getTimeOfThis());
-  CPPUNIT_ASSERT(!areNodesMerged);
-  targetMesh->decrRef();
-  o2n->decrRef();
-  //
-  targetMesh=build3DTargetMeshMergeNode_1();
-  time=targetMesh->getTimeOfThis();
-  o2n=targetMesh->mergeNodes(1e-10,areNodesMerged);
-  targetMesh->updateTime();
-  CPPUNIT_ASSERT(time!=targetMesh->getTimeOfThis());
-  CPPUNIT_ASSERT(areNodesMerged);
-  int connExp[72]={18,0,1,4,3,9,10,13,12, 18,1,2,5,4,10,11,14,13, 18,3,4,7,6,12,13,16,15,
-                   18,4,5,8,7,13,14,17,16,
-                   18,9,10,13,12,18,19,22,21, 18,10,11,14,13,19,20,23,22, 18,12,13,16,15,21,22,25,24,
-                   18,13,14,17,16,22,23,26,25};
-  CPPUNIT_ASSERT_EQUAL(72,targetMesh->getNodalConnectivity()->getNumberOfTuples());
-  CPPUNIT_ASSERT(std::equal(connExp,connExp+72,targetMesh->getNodalConnectivity()->getConstPointer()));
-  CPPUNIT_ASSERT_EQUAL(27,targetMesh->getCoords()->getNumberOfTuples());
-  double coordsExp[81]={ 0., 0., 0., 50., 0., 0. , 200., 0., 0.  , 0., 50., 0., 50., 50., 0. ,
-                         200., 50., 0.,   0., 200., 0., 50., 200., 0. , 200., 200., 0. ,
-                         0., 0., 50., 50., 0., 50. , 200., 0., 50.  , 0., 50., 50., 50.,
-                         50., 50. , 200., 50., 50.,   0., 200., 50., 50., 200., 50. ,
-                         200., 200., 50. , 0., 0., 200., 50., 0., 200. , 200., 0., 200.  
-                         , 0., 50., 200., 50., 50., 200. , 200., 50., 200., 
-                         0., 200., 200., 50., 200., 200. , 200., 200., 200. };
-  CPPUNIT_ASSERT(std::equal(coordsExp,coordsExp+81,targetMesh->getCoords()->getConstPointer()));
-  targetMesh->decrRef();
-  o2n->decrRef();
-  //2D
-  targetMesh=build2DTargetMeshMergeNode_1();
-  CPPUNIT_ASSERT_EQUAL(18,targetMesh->getNumberOfNodes());
-  time=targetMesh->getTimeOfThis();
-  o2n=targetMesh->mergeNodes(1e-10,areNodesMerged);
-  CPPUNIT_ASSERT(time!=targetMesh->getTimeOfThis());
-  CPPUNIT_ASSERT(areNodesMerged);
-  CPPUNIT_ASSERT_EQUAL(9,targetMesh->getNumberOfNodes());
-  int connExp2[23]={4,0,4,3,1, 3,1,3,2, 3,3,5,2, 4,4,6,7,3, 4,7,8,5,3};
-  CPPUNIT_ASSERT_EQUAL(23,targetMesh->getNodalConnectivity()->getNumberOfTuples());
-  CPPUNIT_ASSERT(std::equal(connExp2,connExp2+23,targetMesh->getNodalConnectivity()->getConstPointer()));
-  double coordsExp2[18]={-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, 0.2,0.2, -0.3,0.2, 0.7,0.2, -0.3,0.7, 0.2,0.7, 0.7,0.7};
-  CPPUNIT_ASSERT_EQUAL(9,targetMesh->getCoords()->getNumberOfTuples());
-  CPPUNIT_ASSERT(std::equal(coordsExp2,coordsExp2+18,targetMesh->getCoords()->getConstPointer()));
-  targetMesh->decrRef();
-  o2n->decrRef();
-}
-
-void MEDCouplingBasicsTest::testCheckButterflyCells()
-{
-  std::vector<int> cells;
-  MEDCouplingUMesh *sourceMesh=build2DTargetMesh_1();
-  sourceMesh->checkButterflyCells(cells);
-  CPPUNIT_ASSERT(cells.empty());
-  int *pt=sourceMesh->getNodalConnectivity()->getPointer();
-  std::swap(pt[15],pt[16]);
-  sourceMesh->checkButterflyCells(cells);
-  CPPUNIT_ASSERT_EQUAL(1,(int)cells.size());
-  CPPUNIT_ASSERT_EQUAL(3,cells[0]);
-  cells.clear();
-  std::swap(pt[15],pt[16]);
-  sourceMesh->checkButterflyCells(cells);
-  CPPUNIT_ASSERT(cells.empty());
-  sourceMesh->decrRef();
-  // 3D surf
-  sourceMesh=build3DSurfTargetMesh_1();
-  sourceMesh->checkButterflyCells(cells);
-  CPPUNIT_ASSERT(cells.empty());
-  pt=sourceMesh->getNodalConnectivity()->getPointer();
-  std::swap(pt[15],pt[16]);
-  sourceMesh->checkButterflyCells(cells);
-  CPPUNIT_ASSERT_EQUAL(1,(int)cells.size());
-  CPPUNIT_ASSERT_EQUAL(3,cells[0]);
-  cells.clear();
-  std::swap(pt[15],pt[16]);
-  sourceMesh->checkButterflyCells(cells);
-  CPPUNIT_ASSERT(cells.empty());
-  sourceMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testMergeMesh1()
-{
-  MEDCouplingUMesh *m1=build2DTargetMesh_1();
-  MEDCouplingUMesh *m2=build2DSourceMesh_1();
-  const double vec[2]={1.,0.};
-  m2->translate(vec);
-  MEDCouplingMesh *m3=m1->mergeMyselfWith(m2);
-  MEDCouplingUMesh *m3C=dynamic_cast<MEDCouplingUMesh *>(m3);
-  CPPUNIT_ASSERT(m3C);
-  m3->checkCoherency();
-  MEDCouplingUMesh *m4=build2DTargetMeshMerged_1();
-  CPPUNIT_ASSERT(m3->isEqual(m4,1.e-12));
-  m4->decrRef();
-  bool isMerged;
-  DataArrayInt *da=m3C->mergeNodes(1.e-12,isMerged);
-  CPPUNIT_ASSERT_EQUAL(11,m3C->getNumberOfNodes());
-  CPPUNIT_ASSERT(isMerged);
-  da->decrRef();
-  m3->decrRef();
-  m1->decrRef();
-  m2->decrRef();
-}
-
-void MEDCouplingBasicsTest::testMergeField1()
-{
-  MEDCouplingUMesh *m1=build2DTargetMesh_1();
-  MEDCouplingUMesh *m2=build2DSourceMesh_1();
-  const double vec[2]={1.,0.};
-  m2->translate(vec);
-  MEDCouplingFieldDouble *f1=m1->getMeasureField(true);
-  MEDCouplingFieldDouble *f2=m2->getMeasureField(true);
-  MEDCouplingFieldDouble *f3=MEDCouplingFieldDouble::mergeFields(f1,f2);
-  f3->checkCoherency();
-  MEDCouplingUMesh *m4=build2DTargetMeshMerged_1();
-  CPPUNIT_ASSERT(f3->getMesh()->isEqual(m4,1.e-12));
-  std::string name=f3->getName();
-  CPPUNIT_ASSERT(name=="MeasureOfMesh_");
-  CPPUNIT_ASSERT(f3->getTypeOfField()==ON_CELLS);
-  CPPUNIT_ASSERT(f3->getTimeDiscretization()==NO_TIME);
-  CPPUNIT_ASSERT_EQUAL(1,f3->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(7,f3->getNumberOfTuples());
-  double values[7]={0.25,0.125,0.125,0.25,0.25,0.5,0.5};
-  const double *tmp=f3->getArray()->getConstPointer();
-  std::transform(tmp,tmp+7,values,values,std::minus<double>());
-  std::transform(values,values+7,values,std::ptr_fun<double,double>(fabs));
-  double max=*std::max_element(values,values+7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,max,1.e-12);
-  m4->decrRef();
-  f3->decrRef();
-  f1->decrRef();
-  f2->decrRef();
-  m1->decrRef();
-  m2->decrRef();
-}
-
-bool func1(const double *pt, double *res);
-bool func2(const double *pt, double *res);
-bool func3(const double *pt, double *res);
-bool func4(const double *pt, double *res);
-
-bool func1(const double *pt, double *res)
-{
-  res[0]=pt[0]+pt[1];
-  return true;
-}
-
-bool func2(const double *pt, double *res)
-{
-  res[0]=pt[0]+pt[1];
-  res[1]=2.*(pt[0]+pt[1]);
-  return true;
-}
-
-bool func3(const double *pt, double *res)
-{
-  if(fabs(pt[0]-0.2)<1e-12)
-    return false;
-  res[0]=1./(pt[0]-0.2);
-  return true;
-}
-
-void MEDCouplingBasicsTest::testFillFromAnalytic()
-{
-  MEDCouplingUMesh *m=build2DTargetMesh_1();
-  MEDCouplingFieldDouble *f1=m->fillFromAnalytic(ON_CELLS,1,func1);
-  f1->checkCoherency();
-  CPPUNIT_ASSERT(f1->getTypeOfField()==ON_CELLS);
-  CPPUNIT_ASSERT(f1->getTimeDiscretization()==NO_TIME);
-  CPPUNIT_ASSERT_EQUAL(1,f1->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(5,f1->getNumberOfTuples());
-  double values1[5]={-0.1,0.23333333333333336,0.56666666666666665,0.4,0.9};
-  const double *tmp=f1->getArray()->getConstPointer();
-  std::transform(tmp,tmp+5,values1,values1,std::minus<double>());
-  std::transform(values1,values1+5,values1,std::ptr_fun<double,double>(fabs));
-  double max=*std::max_element(values1,values1+5);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,max,1.e-12);
-  f1->decrRef();
-  //
-  f1=m->fillFromAnalytic(ON_NODES,1,func1);
-  f1->checkCoherency();
-  CPPUNIT_ASSERT(f1->getTypeOfField()==ON_NODES);
-  CPPUNIT_ASSERT(f1->getTimeDiscretization()==NO_TIME);
-  CPPUNIT_ASSERT_EQUAL(1,f1->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(9,f1->getNumberOfTuples());
-  double values2[9]={-0.6,-0.1,0.4,-0.1,0.4,0.9,0.4,0.9,1.4};
-  tmp=f1->getArray()->getConstPointer();
-  std::transform(tmp,tmp+9,values2,values2,std::minus<double>());
-  std::transform(values2,values2+9,values2,std::ptr_fun<double,double>(fabs));
-  max=*std::max_element(values2,values2+9);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,max,1.e-12);
-  f1->decrRef();
-  //
-  f1=m->fillFromAnalytic(ON_NODES,2,func2);
-  f1->checkCoherency();
-  CPPUNIT_ASSERT(f1->getTypeOfField()==ON_NODES);
-  CPPUNIT_ASSERT(f1->getTimeDiscretization()==NO_TIME);
-  CPPUNIT_ASSERT_EQUAL(2,f1->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(9,f1->getNumberOfTuples());
-  double values3[18]={-0.6,-1.2,-0.1,-0.2,0.4,0.8,-0.1,-0.2,0.4,0.8,0.9,1.8,0.4,0.8,0.9,1.8,1.4,2.8};
-  tmp=f1->getArray()->getConstPointer();
-  std::transform(tmp,tmp+18,values3,values3,std::minus<double>());
-  std::transform(values3,values3+18,values3,std::ptr_fun<double,double>(fabs));
-  max=*std::max_element(values3,values3+18);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,max,1.e-12);
-  double values4[2];
-  f1->accumulate(values4);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(3.6,values4[0],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(7.2,values4[1],1.e-12);
-  f1->measureAccumulate(true,values4);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,values4[0],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,values4[1],1.e-12);
-  f1->decrRef();
-  //
-  CPPUNIT_ASSERT_THROW(f1=m->fillFromAnalytic(ON_NODES,1,func3),INTERP_KERNEL::Exception);
-  //
-  m->decrRef();
-}
-
-void MEDCouplingBasicsTest::testFillFromAnalytic2()
-{
-  MEDCouplingUMesh *m=build2DTargetMesh_1();
-  MEDCouplingFieldDouble *f1=m->fillFromAnalytic(ON_CELLS,1,"y+x");
-  f1->checkCoherency();
-  CPPUNIT_ASSERT(f1->getTypeOfField()==ON_CELLS);
-  CPPUNIT_ASSERT(f1->getTimeDiscretization()==NO_TIME);
-  CPPUNIT_ASSERT_EQUAL(1,f1->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(5,f1->getNumberOfTuples());
-  double values1[5]={-0.1,0.23333333333333336,0.56666666666666665,0.4,0.9};
-  const double *tmp=f1->getArray()->getConstPointer();
-  std::transform(tmp,tmp+5,values1,values1,std::minus<double>());
-  std::transform(values1,values1+5,values1,std::ptr_fun<double,double>(fabs));
-  double max=*std::max_element(values1,values1+5);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,max,1.e-12);
-  f1->decrRef();
-  //
-  f1=m->fillFromAnalytic(ON_NODES,1,"y+2*x");
-  f1->checkCoherency();
-  CPPUNIT_ASSERT(f1->getTypeOfField()==ON_NODES);
-  CPPUNIT_ASSERT(f1->getTimeDiscretization()==NO_TIME);
-  CPPUNIT_ASSERT_EQUAL(1,f1->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(9,f1->getNumberOfTuples());
-  double values2[9]={-0.9,0.1,1.1,-0.4,0.6,1.6,0.1,1.1,2.1};
-  tmp=f1->getArray()->getConstPointer();
-  std::transform(tmp,tmp+9,values2,values2,std::minus<double>());
-  std::transform(values2,values2+9,values2,std::ptr_fun<double,double>(fabs));
-  max=*std::max_element(values2,values2+9);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,max,1.e-12);
-  f1->decrRef();
-  f1=m->fillFromAnalytic(ON_NODES,1,"2.*x+y");
-  f1->checkCoherency();
-  CPPUNIT_ASSERT(f1->getTypeOfField()==ON_NODES);
-  CPPUNIT_ASSERT(f1->getTimeDiscretization()==NO_TIME);
-  CPPUNIT_ASSERT_EQUAL(1,f1->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(9,f1->getNumberOfTuples());
-  tmp=f1->getArray()->getConstPointer();
-  double values2Bis[9]={-0.9,0.1,1.1,-0.4,0.6,1.6,0.1,1.1,2.1};
-  std::transform(tmp,tmp+9,values2Bis,values2Bis,std::minus<double>());
-  std::transform(values2,values2+9,values2Bis,std::ptr_fun<double,double>(fabs));
-  max=*std::max_element(values2Bis,values2Bis+9);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,max,1.e-12);
-  f1->decrRef();
-  //
-  f1=m->fillFromAnalytic(ON_NODES,2,"(x+y)*IVec+2*(x+y)*JVec");
-  f1->checkCoherency();
-  CPPUNIT_ASSERT(f1->getTypeOfField()==ON_NODES);
-  CPPUNIT_ASSERT(f1->getTimeDiscretization()==NO_TIME);
-  CPPUNIT_ASSERT_EQUAL(2,f1->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(9,f1->getNumberOfTuples());
-  double values3[18]={-0.6,-1.2,-0.1,-0.2,0.4,0.8,-0.1,-0.2,0.4,0.8,0.9,1.8,0.4,0.8,0.9,1.8,1.4,2.8};
-  tmp=f1->getArray()->getConstPointer();
-  std::transform(tmp,tmp+18,values3,values3,std::minus<double>());
-  std::transform(values3,values3+18,values3,std::ptr_fun<double,double>(fabs));
-  max=*std::max_element(values3,values3+18);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,max,1.e-12);
-  double values4[2];
-  f1->accumulate(values4);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(3.6,values4[0],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(7.2,values4[1],1.e-12);
-  f1->measureAccumulate(true,values4);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,values4[0],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,values4[1],1.e-12);
-  f1->decrRef();
-  //
-  CPPUNIT_ASSERT_THROW(f1=m->fillFromAnalytic(ON_NODES,1,"1./(x-0.2)"),INTERP_KERNEL::Exception);
-  //
-  m->decrRef();
-}
-
-void MEDCouplingBasicsTest::testApplyFunc()
-{
-  MEDCouplingUMesh *m=build2DTargetMesh_1();
-  MEDCouplingFieldDouble *f1=m->fillFromAnalytic(ON_NODES,2,func2);
-  f1->checkCoherency();
-  CPPUNIT_ASSERT(f1->getTypeOfField()==ON_NODES);
-  CPPUNIT_ASSERT(f1->getTimeDiscretization()==NO_TIME);
-  CPPUNIT_ASSERT_EQUAL(2,f1->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(9,f1->getNumberOfTuples());
-  f1->applyFunc(1,func1);
-  CPPUNIT_ASSERT(f1->getTypeOfField()==ON_NODES);
-  CPPUNIT_ASSERT(f1->getTimeDiscretization()==NO_TIME);
-  CPPUNIT_ASSERT_EQUAL(1,f1->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(9,f1->getNumberOfTuples());
-  double values1[9]={-1.8,-0.3,1.2,-0.3,1.2,2.7,1.2,2.7,4.2};
-  const double *tmp=f1->getArray()->getConstPointer();
-  std::transform(tmp,tmp+9,values1,values1,std::minus<double>());
-  std::transform(values1,values1+9,values1,std::ptr_fun<double,double>(fabs));
-  double max=*std::max_element(values1,values1+9);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,max,1.e-12);
-  f1->decrRef();
-  m->decrRef();
-}
-
-void MEDCouplingBasicsTest::testApplyFunc2()
-{
-  MEDCouplingUMesh *m=build2DTargetMesh_1();
-  MEDCouplingFieldDouble *f1=m->fillFromAnalytic(ON_NODES,2,func2);
-  f1->checkCoherency();
-  CPPUNIT_ASSERT(f1->getTypeOfField()==ON_NODES);
-  CPPUNIT_ASSERT(f1->getTimeDiscretization()==NO_TIME);
-  CPPUNIT_ASSERT_EQUAL(2,f1->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(9,f1->getNumberOfTuples());
-  //
-  MEDCouplingFieldDouble *f2=f1->clone(true);
-  f2->applyFunc("abs(u)^2.4+2*u");
-  CPPUNIT_ASSERT(f1->getTypeOfField()==ON_NODES);
-  CPPUNIT_ASSERT(f1->getTimeDiscretization()==NO_TIME);
-  CPPUNIT_ASSERT_EQUAL(2,f1->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(9,f1->getNumberOfTuples());
-  double values2[18]={-0.9065304805418678, -0.85105859001709905, -0.19601892829446504, -0.37898777756476987,
-                      0.91090317490482353, 2.1853504664669781, -0.19601892829446504, -0.37898777756476987,
-                      0.91090317490482353, 2.1853504664669781, 2.5765725275664879, 7.6987743736515295,
-                      0.91090317490482353, 2.1853504664669781, 2.5765725275664879, 7.6987743736515295,
-                      5.0423700574830965, 17.435300118916864};
-  const double *tmp=f2->getArray()->getConstPointer();
-  std::transform(tmp,tmp+18,values2,values2,std::minus<double>());
-  std::transform(values2,values2+18,values2,std::ptr_fun<double,double>(fabs));
-  double max=*std::max_element(values2,values2+18);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,max,1.e-12);
-  f2->decrRef();
-  //
-  f1->applyFunc(1,"x+y");
-  CPPUNIT_ASSERT(f1->getTypeOfField()==ON_NODES);
-  CPPUNIT_ASSERT(f1->getTimeDiscretization()==NO_TIME);
-  CPPUNIT_ASSERT_EQUAL(1,f1->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(9,f1->getNumberOfTuples());
-  double values1[9]={-1.8,-0.3,1.2,-0.3,1.2,2.7,1.2,2.7,4.2};
-  tmp=f1->getArray()->getConstPointer();
-  std::transform(tmp,tmp+9,values1,values1,std::minus<double>());
-  std::transform(values1,values1+9,values1,std::ptr_fun<double,double>(fabs));
-  max=*std::max_element(values1,values1+9);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,max,1.e-12);
-  f1->decrRef();
-  m->decrRef();
-}
-
-void MEDCouplingBasicsTest::testOperationsOnFields()
-{
-  MEDCouplingUMesh *m=build2DTargetMesh_1();
-  MEDCouplingFieldDouble *f1=m->fillFromAnalytic(ON_NODES,1,func1);
-  MEDCouplingFieldDouble *f2=m->fillFromAnalytic(ON_NODES,1,func1);
-  f1->checkCoherency();
-  f2->checkCoherency();
-  MEDCouplingFieldDouble *f3=(*f1)+(*f2);
-  f3->checkCoherency();
-  CPPUNIT_ASSERT(f3->getTypeOfField()==ON_NODES);
-  CPPUNIT_ASSERT(f3->getTimeDiscretization()==NO_TIME);
-  double values1[9]={-1.2,-0.2,0.8,-0.2,0.8,1.8,0.8,1.8,2.8};
-  const double *tmp=f3->getArray()->getConstPointer();
-  std::transform(tmp,tmp+9,values1,values1,std::minus<double>());
-  std::transform(values1,values1+9,values1,std::ptr_fun<double,double>(fabs));
-  double max=*std::max_element(values1,values1+9);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,max,1.e-12);
-  f3->decrRef();
-  //
-  f3=(*f1)*(*f2);
-  f3->checkCoherency();
-  CPPUNIT_ASSERT(f3->getTypeOfField()==ON_NODES);
-  CPPUNIT_ASSERT(f3->getTimeDiscretization()==NO_TIME);
-  double values2[9]={0.36,0.01,0.16,0.01,0.16,0.81,0.16,0.81,1.96};
-  tmp=f3->getArray()->getConstPointer();
-  std::transform(tmp,tmp+9,values2,values2,std::minus<double>());
-  std::transform(values2,values2+9,values2,std::ptr_fun<double,double>(fabs));
-  max=*std::max_element(values2,values2+9);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,max,1.e-12);
-  f3->decrRef();
-  //
-  f3=(*f1)+(*f2);
-  MEDCouplingFieldDouble *f4=(*f1)-(*f3);
-  f4->checkCoherency();
-  CPPUNIT_ASSERT(f4->getTypeOfField()==ON_NODES);
-  CPPUNIT_ASSERT(f4->getTimeDiscretization()==NO_TIME);
-  double values3[9]={0.6,0.1,-0.4,0.1,-0.4,-0.9,-0.4,-0.9,-1.4};
-  tmp=f4->getArray()->getConstPointer();
-  std::transform(tmp,tmp+9,values3,values3,std::minus<double>());
-  std::transform(values3,values3+9,values3,std::ptr_fun<double,double>(fabs));
-  max=*std::max_element(values3,values3+9);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,max,1.e-12);
-  f3->decrRef();
-  f4->decrRef();
-  //
-  f3=(*f1)+(*f2);
-  f4=(*f3)/(*f2);
-  f4->checkCoherency();
-  CPPUNIT_ASSERT(f4->getTypeOfField()==ON_NODES);
-  CPPUNIT_ASSERT(f4->getTimeDiscretization()==NO_TIME);
-  tmp=f4->getArray()->getConstPointer();
-  for(int i=0;i<9;i++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(2.,tmp[i],1.e-12);
-  f3->decrRef();
-  f4->decrRef();
-  //
-  f4=f2->buildNewTimeReprFromThis(ONE_TIME,false);
-  f4->checkCoherency();
-  CPPUNIT_ASSERT(f4->getArray()==f2->getArray());
-  CPPUNIT_ASSERT(f4->getTypeOfField()==ON_NODES);
-  CPPUNIT_ASSERT(f4->getTimeDiscretization()==ONE_TIME);
-  CPPUNIT_ASSERT_THROW(f3=(*f1)+(*f4),INTERP_KERNEL::Exception);
-  MEDCouplingFieldDouble *f5=f4->buildNewTimeReprFromThis(NO_TIME,false);
-  CPPUNIT_ASSERT(f4->getArray()==f5->getArray());
-  CPPUNIT_ASSERT(f5->getTypeOfField()==ON_NODES);
-  CPPUNIT_ASSERT(f5->getTimeDiscretization()==NO_TIME);
-  f3=(*f1)+(*f5);
-  tmp=f3->getArray()->getConstPointer();
-  double values4[9]={-1.2,-0.2,0.8,-0.2,0.8,1.8,0.8,1.8,2.8};
-  std::transform(tmp,tmp+9,values4,values4,std::minus<double>());
-  std::transform(values4,values4+9,values4,std::ptr_fun<double,double>(fabs));
-  max=*std::max_element(values4,values4+9);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,max,1.e-12);
-  f5->decrRef();
-  f4->decrRef();
-  f3->decrRef();
-  //
-  f4=f2->buildNewTimeReprFromThis(ONE_TIME,true);
-  f4->checkCoherency();
-  CPPUNIT_ASSERT(f4->getArray()!=f2->getArray());
-  CPPUNIT_ASSERT(f4->getTypeOfField()==ON_NODES);
-  CPPUNIT_ASSERT(f4->getTimeDiscretization()==ONE_TIME);
-  CPPUNIT_ASSERT_THROW(f3=(*f1)+(*f4),INTERP_KERNEL::Exception);
-  f5=f4->buildNewTimeReprFromThis(NO_TIME,true);
-  CPPUNIT_ASSERT(f4->getArray()!=f5->getArray());
-  CPPUNIT_ASSERT(f2->getArray()!=f5->getArray());
-  CPPUNIT_ASSERT(f5->getTypeOfField()==ON_NODES);
-  CPPUNIT_ASSERT(f5->getTimeDiscretization()==NO_TIME);
-  f3=(*f1)+(*f5);
-  tmp=f3->getArray()->getConstPointer();
-  double values5[9]={-1.2,-0.2,0.8,-0.2,0.8,1.8,0.8,1.8,2.8};
-  std::transform(tmp,tmp+9,values5,values5,std::minus<double>());
-  std::transform(values5,values5+9,values5,std::ptr_fun<double,double>(fabs));
-  max=*std::max_element(values5,values5+9);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,max,1.e-12);
-  f5->decrRef();
-  f4->decrRef();
-  f3->decrRef();
-  //
-  f1->decrRef();
-  f2->decrRef();
-  m->decrRef();
-}
-
-void MEDCouplingBasicsTest::testOperationsOnFields2()
-{
-  MEDCouplingUMesh *m=build3DSurfTargetMesh_1();
-  MEDCouplingFieldDouble *f1=m->fillFromAnalytic(ON_NODES,1,"x+y+z");
-  MEDCouplingFieldDouble *f2=m->fillFromAnalytic(ON_NODES,1,"a*a+b+c*c");
-  MEDCouplingFieldDouble *f3=(*f1)/(*f2);
-  f3->checkCoherency();
-  CPPUNIT_ASSERT(f3->getTypeOfField()==ON_NODES);
-  CPPUNIT_ASSERT(f3->getTimeDiscretization()==NO_TIME);
-  const double expected1[9]={-2.4999999999999991, 1.2162162162162162, 0.77868852459016391,
-                             0.7407407407407407, 1.129032258064516, 0.81632653061224492,
-                             0.86538461538461531, 1.0919540229885056, 0.84302325581395343};
-  CPPUNIT_ASSERT_EQUAL(1,f3->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(9,f3->getNumberOfTuples());
-  const double *val=f3->getArray()->getConstPointer();
-  for(int i=0;i<9;i++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],val[i],1.e-12);
-  f3->decrRef();
-  f1->decrRef();
-  f2->decrRef();
-  //
-  f1=m->buildOrthogonalField();
-  f2=m->fillFromAnalytic(ON_CELLS,1,"x");
-  f3=(*f1)*(*f2);
-  const double expected2[15]={-0.035355339059327376,0.,0.035355339059327376, 0.2592724864350674,0.,-0.2592724864350674, 0.37712361663282529,0.,-0.37712361663282529, -0.035355339059327376,0.,0.035355339059327376, 0.31819805153394637,0.,-0.31819805153394637};
-  val=f3->getArray()->getConstPointer();
-  for(int i=0;i<15;i++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(expected2[i],val[i],1.e-12);
-  f3->decrRef();
-  //
-  f3=(*f2)*(*f1);
-  val=f3->getArray()->getConstPointer();
-  for(int i=0;i<15;i++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(expected2[i],val[i],1.e-12);
-  f3->decrRef();
-  //
-  f1->decrRef();
-  f2->decrRef();
-  //
-  m->decrRef();
-}
-
-void MEDCouplingBasicsTest::testOperationsOnFields3()
-{
-  MEDCouplingUMesh *m=build3DSurfTargetMesh_1();
-  MEDCouplingFieldDouble *f1=m->fillFromAnalytic(ON_NODES,1,"x+y+z");
-  MEDCouplingFieldDouble *f2=m->fillFromAnalytic(ON_NODES,1,"a*a+b+c*c");
-  (*f1)/=(*f2);
-  f1->checkCoherency();
-  CPPUNIT_ASSERT(f1->getTypeOfField()==ON_NODES);
-  CPPUNIT_ASSERT(f1->getTimeDiscretization()==NO_TIME);
-  const double expected1[9]={-2.4999999999999991, 1.2162162162162162, 0.77868852459016391,
-                             0.7407407407407407, 1.129032258064516, 0.81632653061224492,
-                             0.86538461538461531, 1.0919540229885056, 0.84302325581395343};
-  CPPUNIT_ASSERT_EQUAL(1,f1->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(9,f1->getNumberOfTuples());
-  const double *val=f1->getArray()->getConstPointer();
-  for(int i=0;i<9;i++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],val[i],1.e-12);
-  f1->decrRef();
-  f2->decrRef();
-  //
-  f1=m->buildOrthogonalField();
-  f2=m->fillFromAnalytic(ON_CELLS,1,"x");
-  (*f1)*=(*f2);
-  const double expected2[15]={-0.035355339059327376,0.,0.035355339059327376, 0.2592724864350674,0.,-0.2592724864350674, 0.37712361663282529,0.,-0.37712361663282529, -0.035355339059327376,0.,0.035355339059327376, 0.31819805153394637,0.,-0.31819805153394637};
-  val=f1->getArray()->getConstPointer();
-  for(int i=0;i<15;i++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(expected2[i],val[i],1.e-12);
-  f1->decrRef();
-  //
-  f1=m->buildOrthogonalField();
-  CPPUNIT_ASSERT_THROW((*f2)*=(*f1),INTERP_KERNEL::Exception);
-  f1->decrRef();
-  f2->decrRef();
-  //
-  m->decrRef();
-}
-
-bool func4(const double *pt, double *res)
-{
-  res[0]=pt[0]+pt[1]+pt[2];
-  return true;
-}
-
-void MEDCouplingBasicsTest::testMergeNodesOnField()
-{
-  double *tmp;
-  MEDCouplingUMesh *targetMesh=build3DTargetMeshMergeNode_1();
-  MEDCouplingFieldDouble *f1=targetMesh->fillFromAnalytic(ON_NODES,1,func4);
-  f1->mergeNodes(1e-10);
-  f1->decrRef();
-  targetMesh->decrRef();
-  //
-  targetMesh=build3DTargetMeshMergeNode_1();
-  f1=targetMesh->fillFromAnalytic(ON_NODES,1,func4);
-  tmp=f1->getArray()->getPointer();
-  tmp[0]=1000.;
-  f1->mergeNodes(1e-10);
-  f1->decrRef();
-  targetMesh->decrRef();
-  //
-  targetMesh=build3DTargetMeshMergeNode_1();
-  f1=targetMesh->fillFromAnalytic(ON_NODES,1,func4);
-  tmp=f1->getArray()->getPointer();
-  tmp[1]=1000.;
-  CPPUNIT_ASSERT_THROW(f1->mergeNodes(1e-10),INTERP_KERNEL::Exception);
-  f1->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testCheckConsecutiveCellTypes()
-{
-  MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
-  CPPUNIT_ASSERT(sourceMesh->checkConsecutiveCellTypes());
-  CPPUNIT_ASSERT(!targetMesh->checkConsecutiveCellTypes());
-  targetMesh->decrRef();
-  sourceMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testBuildOrthogonalField()
-{
-  MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_1();
-  MEDCouplingFieldDouble *field=targetMesh->buildOrthogonalField();
-  double expected[3]={0.70710678118654746,0.,-0.70710678118654746};
-  CPPUNIT_ASSERT_EQUAL(5,field->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(3,field->getNumberOfComponents());
-  const double *vals=field->getArray()->getConstPointer();
-  for(int i=0;i<15;i++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[i%3],vals[i],1e-12);
-  field->decrRef();
-  targetMesh->decrRef();
-  // testing 
-  double targetCoords[12]={0.,0.,0.,0.5,0.,0.5,1.,0.,1.,0.,1.,0.};
-  int targetConn[4]={0,1,2,3};
-  targetMesh=MEDCouplingUMesh::New();
-  targetMesh->setMeshDimension(2);
-  targetMesh->allocateCells(1);
-  targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn);
-  targetMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(4,3);
-  std::copy(targetCoords,targetCoords+12,myCoords->getPointer());
-  targetMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  field=targetMesh->buildOrthogonalField();
-  CPPUNIT_ASSERT_EQUAL(1,field->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(3,field->getNumberOfComponents());
-  vals=field->getArray()->getConstPointer();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.70710678118654746,vals[0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,vals[1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.70710678118654746,vals[2],1e-12);
-  field->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testGetCellsContainingPoint()
-{
-  MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
-  double pos[12]={0.,0.,0.4,0.4,0.,0.4,0.1,0.1,0.25,0.,0.65,0.};
-  std::vector<int> t1,t2;
-  //2D basic
-  targetMesh->getCellsContainingPoints(pos,6,1e-12,t1,t2);
-  CPPUNIT_ASSERT_EQUAL(6,(int)t1.size());
-  CPPUNIT_ASSERT_EQUAL(7,(int)t2.size());
-  const int expectedValues1[6]={0,4,3,0,1,2};
-  const int expectedValues2[7]={0,1,2,3,4,5,6};
-  CPPUNIT_ASSERT(std::equal(t1.begin(),t1.end(),expectedValues1));
-  CPPUNIT_ASSERT(std::equal(t2.begin(),t2.end(),expectedValues2));
-  //2D with no help of bounding box.
-  double center[2]={0.2,0.2};
-  MEDCouplingPointSet::rotate2DAlg(center,0.78539816339744830962,6,pos);
-  targetMesh->rotate(center,0,0.78539816339744830962);
-  t1.clear(); t2.clear();
-  targetMesh->getCellsContainingPoints(pos,6,1e-12,t1,t2);
-  CPPUNIT_ASSERT_EQUAL(6,(int)t1.size());
-  CPPUNIT_ASSERT_EQUAL(7,(int)t2.size());
-  CPPUNIT_ASSERT(std::equal(t1.begin(),t1.end(),expectedValues1));
-  CPPUNIT_ASSERT(std::equal(t2.begin(),t2.end(),expectedValues2));
-  //2D outside
-  const double pos1bis[2]={-0.3303300858899107,-0.11819805153394641};
-  CPPUNIT_ASSERT_EQUAL(-1,targetMesh->getCellContainingPoint(pos1bis,1e-12));
-  targetMesh->decrRef();
-  //test limits 2D
-  targetMesh=build2DTargetMesh_1();
-  const double pos2[2]={0.2,-0.05};
-  t1.clear();
-  targetMesh->getCellsContainingPoint(pos2,1e-12,t1);
-  CPPUNIT_ASSERT_EQUAL(2,(int)t1.size());
-  const int expectedValues3[2]={0,1};
-  CPPUNIT_ASSERT(std::equal(t1.begin(),t1.end(),expectedValues3));
-  const double pos3[2]={0.2,0.2};
-  t1.clear();
-  targetMesh->getCellsContainingPoint(pos3,1e-12,t1);
-  CPPUNIT_ASSERT_EQUAL(5,(int)t1.size());
-  const int expectedValues4[5]={0,1,2,3,4};
-  CPPUNIT_ASSERT(std::equal(t1.begin(),t1.end(),expectedValues4));
-  CPPUNIT_ASSERT_EQUAL(0,targetMesh->getCellContainingPoint(pos3,1e-12));
-  targetMesh->decrRef();
-  //3D
-  targetMesh=build3DTargetMesh_1();
-  const double pos4[3]={25.,25.,25.};
-  CPPUNIT_ASSERT_EQUAL(0,targetMesh->getCellContainingPoint(pos4,1e-12));
-  const double pos5[3]={50.,50.,50.};
-  t1.clear();
-  targetMesh->getCellsContainingPoint(pos5,1e-12,t1);
-  CPPUNIT_ASSERT_EQUAL(8,(int)t1.size());
-  const int expectedValues5[8]={0,1,2,3,4,5,6,7};
-  CPPUNIT_ASSERT(std::equal(t1.begin(),t1.end(),expectedValues5));
-  const double pos6[3]={0., 50., 0.};
-  t1.clear();
-  targetMesh->getCellsContainingPoint(pos6,1e-12,t1);
-  CPPUNIT_ASSERT_EQUAL(2,(int)t1.size());
-  const int expectedValues6[2]={0,2};
-  CPPUNIT_ASSERT(std::equal(t1.begin(),t1.end(),expectedValues6));
-  //3D outside
-  const double pos7[3]={-1.0,-1.0,0.};
-  CPPUNIT_ASSERT_EQUAL(-1,targetMesh->getCellContainingPoint(pos7,1e-12));
-  //3D outside 2
-  const double center2[3]={0.,0.,0.};
-  const double vec2[3]={0.,-1.,0.};
-  targetMesh->rotate(center2,vec2,0.78539816339744830962);
-  const double pos8[3]={-25,25.,12.};
-  CPPUNIT_ASSERT_EQUAL(-1,targetMesh->getCellContainingPoint(pos8,1e-12));
-  //
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testGetValueOn1()
-{
-  MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
-  MEDCouplingFieldDouble *fieldOnCells=MEDCouplingFieldDouble::New(ON_CELLS);
-  int nbOfCells=targetMesh->getNumberOfCells();
-  fieldOnCells->setMesh(targetMesh);
-  DataArrayDouble *array=DataArrayDouble::New();
-  array->alloc(nbOfCells,2);
-  fieldOnCells->setArray(array);
-  double *tmp=array->getPointer();
-  for(int i=0;i<nbOfCells;i++)
-    { tmp[2*i]=7.+(double)i; tmp[2*i+1]=17.+(double)i; }
-  array->decrRef();
-  //
-  const double pos1[2]={0.25,0.};
-  double res[2];
-  fieldOnCells->getValueOn(pos1,res);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(8.,res[0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(18.,res[1],1e-12);
-  //
-  fieldOnCells->decrRef();
-  targetMesh->decrRef();
-  //
-  targetMesh=build2DSourceMesh_1();
-  MEDCouplingFieldDouble *fieldOnNodes=MEDCouplingFieldDouble::New(ON_NODES);
-  int nbOfNodes=targetMesh->getNumberOfNodes();
-  fieldOnNodes->setMesh(targetMesh);
-  array=DataArrayDouble::New();
-  array->alloc(nbOfNodes,2);
-  fieldOnNodes->setArray(array);
-  tmp=array->getPointer();
-  for(int i=0;i<nbOfNodes;i++)
-    { tmp[2*i]=17.+(double)i; tmp[2*i+1]=27.+(double)i; }
-  array->decrRef();
-  //
-  const double pos2[2]={-0.13333333333333333,-0.13333333333333333};
-  fieldOnNodes->getValueOn(pos2,res);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(17.5,res[0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(27.5,res[1],1e-12);
-  const double pos3[2]={0.033333333333333326,0.36666666666666664};
-  fieldOnNodes->getValueOn(pos3,res);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(18.666666666666667,res[0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(28.666666666666667,res[1],1e-12);
-  //
-  fieldOnNodes->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testCMesh0()
-{
-  MEDCouplingCMesh* mesh=MEDCouplingCMesh::New();
-  DataArrayDouble* coordsX=DataArrayDouble::New();
-  double arrX[4] = { -1., 1., 2., 4. };
-  coordsX->useArray(arrX,false, CPP_DEALLOC,4,1);
-  DataArrayDouble* coordsY=DataArrayDouble::New();
-  double arrY[4] = { -2., 2., 4., 8. };
-  coordsY->useArray(arrY,false, CPP_DEALLOC,4,1);
-  DataArrayDouble* coordsZ=DataArrayDouble::New();
-  double arrZ[4] = { -3., 3., 6., 12. };
-  coordsZ->useArray(arrZ,false, CPP_DEALLOC,4,1);
-  mesh->setCoords(coordsX,coordsY,coordsZ);
-  coordsX->decrRef();
-  coordsY->decrRef();
-  coordsZ->decrRef();
-  //
-  MEDCouplingFieldDouble *fieldOnNodes=mesh->fillFromAnalytic(ON_NODES,1,"x+y/2.+z/3.");
-  CPPUNIT_ASSERT_EQUAL(1,fieldOnNodes->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(64,fieldOnNodes->getNumberOfTuples());
-  const double expected1[64]={-3., -1., 0., 2., -1., 1., 2., 4., 0., 2., 3., 5., 2., 4., 5., 7., -1., 1., 2.,
-                              4., 1., 3., 4., 6., 2., 4., 5., 7., 4., 6., 7., 9., 0., 2., 3., 5., 2., 4., 5.,
-                              7., 3., 5., 6., 8., 5., 7., 8., 10., 2., 4., 5.,
-                              7., 4., 6., 7., 9., 5., 7., 8., 10., 7., 9., 10., 12.};
-  const double *val=fieldOnNodes->getArray()->getConstPointer();
-  for(int i=0;i<64;i++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],val[i],1e-12);
-  double res;
-  fieldOnNodes->getValueOnPos(1,3,2,&res);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(7.,res,1e-12);
-  fieldOnNodes->decrRef();
-  //
-  MEDCouplingFieldDouble *fieldOnCells=mesh->fillFromAnalytic(ON_CELLS,1,"x+y/2.+z/3.");
-  CPPUNIT_ASSERT_EQUAL(1,fieldOnCells->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(27,fieldOnCells->getNumberOfTuples());
-  val=fieldOnCells->getArray()->getConstPointer();
-  const double expected2[27]={0, 1.5, 3, 1.5, 3, 4.5, 3, 4.5, 6, 1.5, 3, 4.5, 3, 4.5,
-                              6, 4.5, 6, 7.5, 3, 4.5, 6, 4.5, 6, 7.5, 6, 7.5, 9};
-  for(int i=0;i<27;i++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(expected2[i],val[i],1e-12);
-  fieldOnCells->getValueOnPos(1,2,1,&res);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(6.,res,1e-12);
-  fieldOnCells->decrRef();
-  //
-  mesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testScale()
-{
-  MEDCouplingUMesh *mesh=build2DTargetMesh_1();
-  const double pos[2]={0.2,0.2};
-  mesh->scale(pos,0.5);
-  const double expected1[18]={-0.05,-0.05, 0.2,-0.05, 0.45,-0.05, -0.05,0.2, 0.2,0.2, 0.45,0.2,
-                              -0.05,0.45, 0.2,0.45, 0.45,0.45};
-  const double *val=mesh->getCoords()->getConstPointer();
-  for(int i=0;i<18;i++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],val[i],1e-12);
-  //
-  mesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testTryToShareSameCoords()
-{
-  MEDCouplingUMesh *m1=build2DTargetMesh_1();
-  MEDCouplingUMesh *m2=build2DTargetMesh_1();
-  CPPUNIT_ASSERT(m1->getCoords()!=m2->getCoords());
-  m1->tryToShareSameCoords(*m2,1e-12);
-  CPPUNIT_ASSERT(m1->getCoords()==m2->getCoords());
-  m1->tryToShareSameCoords(*m2,1e-12);
-  CPPUNIT_ASSERT(m1->getCoords()==m2->getCoords());
-  m2->tryToShareSameCoords(*m1,1e-12);
-  CPPUNIT_ASSERT(m1->getCoords()==m2->getCoords());
-  m1->decrRef();
-  m2->decrRef();
-  //
-  m1=build2DTargetMesh_1();
-  m2=build2DTargetMesh_2();
-  CPPUNIT_ASSERT(m1->getCoords()!=m2->getCoords());
-  m1->tryToShareSameCoords(*m2,1e-12);
-  CPPUNIT_ASSERT(m1->getCoords()==m2->getCoords());
-  m1->tryToShareSameCoords(*m2,1e-12);
-  CPPUNIT_ASSERT(m1->getCoords()==m2->getCoords());
-  m2->tryToShareSameCoords(*m1,1e-12);
-  CPPUNIT_ASSERT(m1->getCoords()==m2->getCoords());
-  m1->decrRef();
-  m2->decrRef();
-  //
-  m1=build2DTargetMesh_1();
-  m2=build2DSourceMesh_1();
-  CPPUNIT_ASSERT(m1->getCoords()!=m2->getCoords());
-  CPPUNIT_ASSERT_THROW(m1->tryToShareSameCoords(*m2,1e-12),INTERP_KERNEL::Exception);
-  m1->decrRef();
-  m2->decrRef();
-}
-
-void MEDCouplingBasicsTest::testFindNodeOnPlane()
-{
-  MEDCouplingUMesh *mesh=build3DTargetMesh_1();
-  std::vector<int> n;
-  double pt[3]={300.,300.,0.};
-  double v[3]={0.,0.,2.};
-  mesh->findNodesOnPlane(pt,v,1e-12,n);
-  CPPUNIT_ASSERT_EQUAL(9,(int)n.size());
-  MEDCouplingUMesh *m3dSurf=(MEDCouplingUMesh *)mesh->buildFacePartOfMySelfNode(&n[0],&n[0]+n.size(),true);
-  MEDCouplingExtrudedMesh *me=MEDCouplingExtrudedMesh::New(mesh,m3dSurf,0);
-  const DataArrayInt *da=me->getMesh3DIds();
-  CPPUNIT_ASSERT_EQUAL(8,me->getNumberOfCells());
-  const int expected[8]={0,1,2,3,4,5,6,7};
-  const int *val=da->getConstPointer();
-  for(int i=0;i<8;i++)
-    CPPUNIT_ASSERT_EQUAL(expected[i],val[i]);
-  me->decrRef();
-  m3dSurf->decrRef();
-  mesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testRenumberCells()
-{
-  MEDCouplingUMesh *m=build3DSurfTargetMesh_1();
-  MEDCouplingUMesh *m2=build3DSurfTargetMesh_1();
-  CPPUNIT_ASSERT(m->isEqual(m2,0));
-  const int arr[5]={12,3,25,2,26};
-  m->renumberCells(arr,arr+5,true);
-  CPPUNIT_ASSERT(!m->isEqual(m2,0));
-  CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_QUAD4,m->getTypeOfCell(0));
-  CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TRI3,m->getTypeOfCell(1));
-  CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_QUAD4,m->getTypeOfCell(2));
-  CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TRI3,m->getTypeOfCell(3));
-  CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_QUAD4,m->getTypeOfCell(4));
-  const int arr2[5]={5,-1,-5,4,8};
-  m->renumberCells(arr2,arr2+5,true);
-  CPPUNIT_ASSERT(m->isEqual(m2,0));
-  m->decrRef();
-  m2->decrRef();
-}
-
-void MEDCouplingBasicsTest::testChangeSpaceDimension()
-{
-  MEDCouplingUMesh *m1=build3DSurfTargetMesh_1();
-  MEDCouplingUMesh *m2=build2DTargetMesh_1();
-  //
-  CPPUNIT_ASSERT_EQUAL(3,m1->getSpaceDimension());
-  m1->changeSpaceDimension(2);
-  CPPUNIT_ASSERT_EQUAL(2,m1->getSpaceDimension());
-  m1->setName(m2->getName());
-  CPPUNIT_ASSERT(m1->isEqual(m2,1e-12));
-  m1->changeSpaceDimension(3);
-  CPPUNIT_ASSERT_EQUAL(3,m1->getSpaceDimension());
-  const double expected[27]={-0.3,-0.3,0., 0.2,-0.3,0., 0.7,-0.3,0., -0.3,0.2,0., 0.2,0.2,0., 0.7,0.2,0., -0.3,0.7,0., 0.2,0.7,0., 0.7,0.7,0.};
-  const double *val=m1->getCoords()->getConstPointer();
-  for(int i=0;i<27;i++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[i],val[i],1e-14);
-  //
-  m1->decrRef();
-  m2->decrRef();
-}
diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTestData1.hxx b/src/MEDCoupling/Test/MEDCouplingBasicsTestData1.hxx
deleted file mode 100644
index 2f9cc17cf..000000000
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTestData1.hxx
+++ /dev/null
@@ -1,1166 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-int connITT[201]={0, 50, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 600, 650, 700, 750, 800, 850, 900, 950, 1000, 1029, 1058, 1087, 1116, 1145, 1174, 1203,
-                    1232, 1261, 1290, 1319, 1348, 1377, 1406, 1435, 1464, 1493, 1522, 1551, 1580, 1609, 1638, 1667, 1696, 1725, 1754, 1783, 1812, 1841, 1870, 1899,
-                    1928, 1957, 1986, 2015, 2044, 2073, 2102, 2131, 2160, 2189, 2218, 2247, 2276, 2305, 2334, 2363, 2392, 2421, 2450, 2479, 2508, 2537, 2566, 2595,
-                    2624, 2653, 2682, 2711, 2740, 2769, 2798, 2827, 2856, 2885, 2914, 2943, 2972, 3001, 3030, 3059, 3088, 3117, 3146, 3175, 3204, 3233, 3262, 3291,
-                    3320, 3349, 3378, 3407, 3436, 3465, 3494, 3523, 3552, 3581, 3610, 3639, 3668, 3697, 3726, 3755, 3784, 3813, 3842, 3871, 3900, 3929, 3958, 3987,
-                    4016, 4045, 4074, 4103, 4132, 4161, 4190, 4219, 4248, 4277, 4306, 4335, 4364, 4393, 4422, 4451, 4480, 4509, 4538, 4567, 4596, 4625, 4654, 4683,
-                    4712, 4741, 4770, 4799, 4828, 4857, 4886, 4915, 4944, 4973, 5002, 5031, 5060, 5089, 5118, 5147, 5176, 5205, 5234, 5263, 5292, 5321, 5350, 5379,
-                    5408, 5437, 5466, 5495, 5524, 5553, 5582, 5611, 5640, 5669, 5698, 5727, 5756, 5785, 5814, 5843, 5872, 5901, 5930, 5959, 5988, 6017, 6046, 6075,
-                    6104, 6133, 6162, 6191, 6220};
-  int connTT[6220]={0, 1, 2, 3, 4, 5, 6, -1, 0, 7, 8, 1, -1, 1, 8, 9, 2, -1, 2, 9, 10, 3, -1, 3, 10, 11, 4, -1, 4, 11, 12, 5, -1, 5, 12, 13, 6, -1, 6, 13, 7, 0, -1, 7, 13, 12, 11, 10, 9, 8, 14, 15, 16, 17, 18, 19,
-                    20, -1, 14, 21, 22, 15, -1, 15, 22, 23, 16, -1, 16, 23, 24, 17, -1, 17, 24, 25, 18, -1, 18, 25, 26, 19, -1, 19, 26, 27, 20, -1, 20, 27, 21, 14, -1, 21, 27, 26, 25, 24, 23, 22, 28, 29, 30, 31, 32,
-                    33, 34, -1, 28, 35, 36, 29, -1, 29, 36, 37, 30, -1, 30, 37, 38, 31, -1, 31, 38, 39, 32, -1, 32, 39, 40, 33, -1, 33, 40, 41, 34, -1, 34, 41, 35, 28, -1, 35, 41, 40, 39, 38, 37, 36, 42, 43, 44, 45,
-                    46, 47, 48, -1, 42, 49, 50, 43, -1, 43, 50, 51, 44, -1, 44, 51, 52, 45, -1, 45, 52, 53, 46, -1, 46, 53, 54, 47, -1, 47, 54, 55, 48, -1, 48, 55, 49, 42, -1, 49, 55, 54, 53, 52, 51, 50, 56, 57, 58,
-                    59, 60, 61, 62, -1, 56, 63, 64, 57, -1, 57, 64, 65, 58, -1, 58, 65, 66, 59, -1, 59, 66, 67, 60, -1, 60, 67, 68, 61, -1, 61, 68, 69, 62, -1, 62, 69, 63, 56, -1, 63, 69, 68, 67, 66, 65, 64, 70, 71,
-                    72, 73, 74, 75, 76, -1, 70, 77, 78, 71, -1, 71, 78, 79, 72, -1, 72, 79, 80, 73, -1, 73, 80, 81, 74, -1, 74, 81, 82, 75, -1, 75, 82, 83, 76, -1, 76, 83, 77, 70, -1, 77, 83, 82, 81, 80, 79, 78, 84,
-                    85, 86, 87, 88, 89, 90, -1, 84, 91, 92, 85, -1, 85, 92, 93, 86, -1, 86, 93, 94, 87, -1, 87, 94, 95, 88, -1, 88, 95, 96, 89, -1, 89, 96, 97, 90, -1, 90, 97, 91, 84, -1, 91, 97, 96, 95, 94, 93, 92,
-                    98, 99, 100, 101, 102, 103, 104, -1, 98, 105, 106, 99, -1, 99, 106, 107, 100, -1, 100, 107, 108, 101, -1, 101, 108, 109, 102, -1, 102, 109, 110, 103, -1, 103, 110, 111, 104, -1, 104, 111, 105, 98,
-                    -1, 105, 111, 110, 109, 108, 107, 106, 112, 113, 114, 115, 116, 117, 118, -1, 112, 119, 120, 113, -1, 113, 120, 121, 114, -1, 114, 121, 122, 115, -1, 115, 122, 123, 116, -1, 116, 123, 124, 117, -1,
-                    117, 124, 125, 118, -1, 118, 125, 119, 112, -1, 119, 125, 124, 123, 122, 121, 120, 126, 127, 128, 129, 130, 131, 132, -1, 126, 133, 134, 127, -1, 127, 134, 135, 128, -1, 128, 135, 136, 129, -1, 129,
-                    136, 137, 130, -1, 130, 137, 138, 131, -1, 131, 138, 139, 132, -1, 132, 139, 133, 126, -1, 133, 139, 138, 137, 136, 135, 134, 140, 141, 142, 143, 144, 145, 146, -1, 140, 147, 148, 141, -1, 141, 148,
-                    149, 142, -1, 142, 149, 150, 143, -1, 143, 150, 151, 144, -1, 144, 151, 152, 145, -1, 145, 152, 153, 146, -1, 146, 153, 147, 140, -1, 147, 153, 152, 151, 150, 149, 148, 154, 155, 156, 157, 158, 159,
-                    160, -1, 154, 161, 162, 155, -1, 155, 162, 163, 156, -1, 156, 163, 164, 157, -1, 157, 164, 165, 158, -1, 158, 165, 166, 159, -1, 159, 166, 167, 160, -1, 160, 167, 161, 154, -1, 161, 167, 166, 165, 
-                    164, 163, 162, 168, 169, 170, 171, 172, 173, 174, -1, 168, 175, 176, 169, -1, 169, 176, 177, 170, -1, 170, 177, 178, 171, -1, 171, 178, 179, 172, -1, 172, 179, 180, 173, -1, 173, 180, 181, 174, -1, 
-                    174, 181, 175, 168, -1, 175, 181, 180, 179, 178, 177, 176, 182, 183, 184, 185, 186, 187, 188, -1, 182, 189, 190, 183, -1, 183, 190, 191, 184, -1, 184, 191, 192, 185, -1, 185, 192, 193, 186, -1, 186,
-                    193, 194, 187, -1, 187, 194, 195, 188, -1, 188, 195, 189, 182, -1, 189, 195, 194, 193, 192, 191, 190, 196, 197, 198, 199, 200, 201, 202, -1, 196, 203, 204, 197, -1, 197, 204, 205, 198, -1, 198, 205,
-                    206, 199, -1, 199, 206, 207, 200, -1, 200, 207, 208, 201, -1, 201, 208, 209, 202, -1, 202, 209, 203, 196, -1, 203, 209, 208, 207, 206, 205, 204, 210, 211, 212, 213, 214, 215, 216, -1, 210, 217, 218,
-                    211, -1, 211, 218, 219, 212, -1, 212, 219, 220, 213, -1, 213, 220, 221, 214, -1, 214, 221, 222, 215, -1, 215, 222, 223, 216, -1, 216, 223, 217, 210, -1, 217, 223, 222, 221, 220, 219, 218, 224, 225,
-                    226, 227, 228, 229, 230, -1, 224, 231, 232, 225, -1, 225, 232, 233, 226, -1, 226, 233, 234, 227, -1, 227, 234, 235, 228, -1, 228, 235, 236, 229, -1, 229, 236, 237, 230, -1, 230, 237, 231, 224, -1,
-                    231, 237, 236, 235, 234, 233, 232, 238, 239, 240, 241, 242, 243, 244, -1, 238, 245, 246, 239, -1, 239, 246, 247, 240, -1, 240, 247, 248, 241, -1, 241, 248, 249, 242, -1, 242, 249, 250, 243, -1, 243,
-                    250, 251, 244, -1, 244, 251, 245, 238, -1, 245, 251, 250, 249, 248, 247, 246, 252, 253, 254, 255, 256, 257, 258, -1, 252, 259, 260, 253, -1, 253, 260, 261, 254, -1, 254, 261, 262, 255, -1, 255, 262,
-                    263, 256, -1, 256, 263, 264, 257, -1, 257, 264, 265, 258, -1, 258, 265, 259, 252, -1, 259, 265, 264, 263, 262, 261, 260, 266, 267, 268, 269, 270, 271, 272, -1, 266, 273, 274, 267, -1, 267, 274, 275,
-                    268, -1, 268, 275, 276, 269, -1, 269, 276, 277, 270, -1, 270, 277, 278, 271, -1, 271, 278, 279, 272, -1, 272, 279, 273, 266, -1, 273, 279, 278, 277, 276, 275, 274, 280, 281, 282, 283, -1, 280, 284,
-                    285, 281, -1, 281, 285, 286, 282, -1, 282, 286, 287, 283, -1, 283, 287, 284, 280, -1, 284, 287, 286, 285, 288, 289, 290, 291, -1, 288, 292, 293, 289, -1, 289, 293, 294, 290, -1, 290, 294, 295, 291,
-                    -1, 291, 295, 292, 288, -1, 292, 295, 294, 293, 296, 297, 298, 299, -1, 296, 300, 301, 297, -1, 297, 301, 302, 298, -1, 298, 302, 303, 299, -1, 299, 303, 300, 296, -1, 300, 303, 302, 301, 304, 305,
-                    306, 307, -1, 304, 308, 309, 305, -1, 305, 309, 310, 306, -1, 306, 310, 311, 307, -1, 307, 311, 308, 304, -1, 308, 311, 310, 309, 312, 313, 314, 315, -1, 312, 316, 317, 313, -1, 313, 317, 318, 314,
-                    -1, 314, 318, 319, 315, -1, 315, 319, 316, 312, -1, 316, 319, 318, 317, 320, 321, 322, 323, -1, 320, 324, 325, 321, -1, 321, 325, 326, 322, -1, 322, 326, 327, 323, -1, 323, 327, 324, 320, -1, 324,
-                    327, 326, 325, 328, 329, 330, 331, -1, 328, 332, 333, 329, -1, 329, 333, 334, 330, -1, 330, 334, 335, 331, -1, 331, 335, 332, 328, -1, 332, 335, 334, 333, 336, 337, 338, 339, -1, 336, 340, 341, 337,
-                    -1, 337, 341, 342, 338, -1, 338, 342, 343, 339, -1, 339, 343, 340, 336, -1, 340, 343, 342, 341, 344, 345, 346, 347, -1, 344, 348, 349, 345, -1, 345, 349, 350, 346, -1, 346, 350, 351, 347, -1, 347,
-                    351, 348, 344, -1, 348, 351, 350, 349, 352, 353, 354, 355, -1, 352, 356, 357, 353, -1, 353, 357, 358, 354, -1, 354, 358, 359, 355, -1, 355, 359, 356, 352, -1, 356, 359, 358, 357, 360, 361, 362, 363,
-                    -1, 360, 364, 365, 361, -1, 361, 365, 366, 362, -1, 362, 366, 367, 363, -1, 363, 367, 364, 360, -1, 364, 367, 366, 365, 368, 369, 370, 371, -1, 368, 372, 373, 369, -1, 369, 373, 374, 370, -1, 370,
-                    374, 375, 371, -1, 371, 375, 372, 368, -1, 372, 375, 374, 373, 376, 377, 378, 379, -1, 376, 380, 381, 377, -1, 377, 381, 382, 378, -1, 378, 382, 383, 379, -1, 379, 383, 380, 376, -1, 380, 383, 382,
-                    381, 384, 385, 386, 387, -1, 384, 388, 389, 385, -1, 385, 389, 390, 386, -1, 386, 390, 391, 387, -1, 387, 391, 388, 384, -1, 388, 391, 390, 389, 392, 393, 394, 395, -1, 392, 396, 397, 393, -1, 393,
-                    397, 398, 394, -1, 394, 398, 399, 395, -1, 395, 399, 396, 392, -1, 396, 399, 398, 397, 400, 401, 402, 403, -1, 400, 404, 405, 401, -1, 401, 405, 406, 402, -1, 402, 406, 407, 403, -1, 403, 407, 404,
-                    400, -1, 404, 407, 406, 405, 408, 409, 410, 411, -1, 408, 412, 413, 409, -1, 409, 413, 414, 410, -1, 410, 414, 415, 411, -1, 411, 415, 412, 408, -1, 412, 415, 414, 413, 416, 417, 418, 419, -1, 416,
-                    420, 421, 417, -1, 417, 421, 422, 418, -1, 418, 422, 423, 419, -1, 419, 423, 420, 416, -1, 420, 423, 422, 421, 424, 425, 426, 427, -1, 424, 428, 429, 425, -1, 425, 429, 430, 426, -1, 426, 430, 431,
-                    427, -1, 427, 431, 428, 424, -1, 428, 431, 430, 429, 432, 433, 434, 435, -1, 432, 436, 437, 433, -1, 433, 437, 438, 434, -1, 434, 438, 439, 435, -1, 435, 439, 436, 432, -1, 436, 439, 438, 437, 440,
-                    441, 442, 443, -1, 440, 444, 445, 441, -1, 441, 445, 446, 442, -1, 442, 446, 447, 443, -1, 443, 447, 444, 440, -1, 444, 447, 446, 445, 448, 449, 450, 451, -1, 448, 452, 453, 449, -1, 449, 453, 454,
-                    450, -1, 450, 454, 455, 451, -1, 451, 455, 452, 448, -1, 452, 455, 454, 453, 456, 457, 458, 459, -1, 456, 460, 461, 457, -1, 457, 461, 462, 458, -1, 458, 462, 463, 459, -1, 459, 463, 460, 456, -1,
-                    460, 463, 462, 461, 464, 465, 466, 467, -1, 464, 468, 469, 465, -1, 465, 469, 470, 466, -1, 466, 470, 471, 467, -1, 467, 471, 468, 464, -1, 468, 471, 470, 469, 472, 473, 474, 475, -1, 472, 476, 477,
-                    473, -1, 473, 477, 478, 474, -1, 474, 478, 479, 475, -1, 475, 479, 476, 472, -1, 476, 479, 478, 477, 480, 481, 482, 483, -1, 480, 484, 485, 481, -1, 481, 485, 486, 482, -1, 482, 486, 487, 483, -1,
-                    483, 487, 484, 480, -1, 484, 487, 486, 485, 488, 489, 490, 491, -1, 488, 492, 493, 489, -1, 489, 493, 494, 490, -1, 490, 494, 495, 491, -1, 491, 495, 492, 488, -1, 492, 495, 494, 493, 496, 497, 498,
-                    499, -1, 496, 500, 501, 497, -1, 497, 501, 502, 498, -1, 498, 502, 503, 499, -1, 499, 503, 500, 496, -1, 500, 503, 502, 501, 504, 505, 506, 507, -1, 504, 508, 509, 505, -1, 505, 509, 510, 506, -1, 506,
-                    510, 511, 507, -1, 507, 511, 508, 504, -1, 508, 511, 510, 509, 512, 513, 514, 515, -1, 512, 516, 517, 513, -1, 513, 517, 518, 514, -1, 514, 518, 519, 515, -1, 515, 519, 516, 512, -1, 516, 519, 518, 517,
-                    520, 521, 522, 523, -1, 520, 524, 525, 521, -1, 521, 525, 526, 522, -1, 522, 526, 527, 523, -1, 523, 527, 524, 520, -1, 524, 527, 526, 525, 528, 529, 530, 531, -1, 528, 532, 533, 529, -1, 529, 533,
-                    534, 530, -1, 530, 534, 535, 531, -1, 531, 535, 532, 528, -1, 532, 535, 534, 533, 536, 537, 538, 539, -1, 536, 540, 541, 537, -1, 537, 541, 542, 538, -1, 538, 542, 543, 539, -1, 539, 543, 540, 536,
-                    -1, 540, 543, 542, 541, 544, 545, 546, 547, -1, 544, 548, 549, 545, -1, 545, 549, 550, 546, -1, 546, 550, 551, 547, -1, 547, 551, 548, 544, -1, 548, 551, 550, 549, 552, 553, 554, 555, -1, 552, 556,
-                    557, 553, -1, 553, 557, 558, 554, -1, 554, 558, 559, 555, -1, 555, 559, 556, 552, -1, 556, 559, 558, 557, 560, 561, 562, 563, -1, 560, 564, 565, 561, -1, 561, 565, 566, 562, -1, 562, 566, 567, 563,
-                    -1, 563, 567, 564, 560, -1, 564, 567, 566, 565, 568, 569, 570, 571, -1, 568, 572, 573, 569, -1, 569, 573, 574, 570, -1, 570, 574, 575, 571, -1, 571, 575, 572, 568, -1, 572, 575, 574, 573, 576, 577,
-                    578, 579, -1, 576, 580, 581, 577, -1, 577, 581, 582, 578, -1, 578, 582, 583, 579, -1, 579, 583, 580, 576, -1, 580, 583, 582, 581, 584, 585, 586, 587, -1, 584, 588, 589, 585, -1, 585, 589, 590, 586,
-                    -1, 586, 590, 591, 587, -1, 587, 591, 588, 584, -1, 588, 591, 590, 589, 592, 593, 594, 595, -1, 592, 596, 597, 593, -1, 593, 597, 598, 594, -1, 594, 598, 599, 595, -1, 595, 599, 596, 592, -1, 596,
-                    599, 598, 597, 600, 601, 602, 603, -1, 600, 604, 605, 601, -1, 601, 605, 606, 602, -1, 602, 606, 607, 603, -1, 603, 607, 604, 600, -1, 604, 607, 606, 605, 608, 609, 610, 611, -1, 608, 612, 613, 609,
-                    -1, 609, 613, 614, 610, -1, 610, 614, 615, 611, -1, 611, 615, 612, 608, -1, 612, 615, 614, 613, 616, 617, 618, 619, -1, 616, 620, 621, 617, -1, 617, 621, 622, 618, -1, 618, 622, 623, 619, -1, 619,
-                    623, 620, 616, -1, 620, 623, 622, 621, 624, 625, 626, 627, -1, 624, 628, 629, 625, -1, 625, 629, 630, 626, -1, 626, 630, 631, 627, -1, 627, 631, 628, 624, -1, 628, 631, 630, 629, 632, 633, 634, 635,
-                    -1, 632, 636, 637, 633, -1, 633, 637, 638, 634, -1, 634, 638, 639, 635, -1, 635, 639, 636, 632, -1, 636, 639, 638, 637, 640, 641, 642, 643, -1, 640, 644, 645, 641, -1, 641, 645, 646, 642, -1, 642,
-                    646, 647, 643, -1, 643, 647, 644, 640, -1, 644, 647, 646, 645, 648, 649, 650, 651, -1, 648, 652, 653, 649, -1, 649, 653, 654, 650, -1, 650, 654, 655, 651, -1, 651, 655, 652, 648, -1, 652, 655, 654,
-                    653, 656, 657, 658, 659, -1, 656, 660, 661, 657, -1, 657, 661, 662, 658, -1, 658, 662, 663, 659, -1, 659, 663, 660, 656, -1, 660, 663, 662, 661, 664, 665, 666, 667, -1, 664, 668, 669, 665, -1, 665,
-                    669, 670, 666, -1, 666, 670, 671, 667, -1, 667, 671, 668, 664, -1, 668, 671, 670, 669, 672, 673, 674, 675, -1, 672, 676, 677, 673, -1, 673, 677, 678, 674, -1, 674, 678, 679, 675, -1, 675, 679, 676,
-                    672, -1, 676, 679, 678, 677, 680, 681, 682, 683, -1, 680, 684, 685, 681, -1, 681, 685, 686, 682, -1, 682, 686, 687, 683, -1, 683, 687, 684, 680, -1, 684, 687, 686, 685, 688, 689, 690, 691, -1, 688,
-                    692, 693, 689, -1, 689, 693, 694, 690, -1, 690, 694, 695, 691, -1, 691, 695, 692, 688, -1, 692, 695, 694, 693, 696, 697, 698, 699, -1, 696, 700, 701, 697, -1, 697, 701, 702, 698, -1, 698, 702, 703,
-                    699, -1, 699, 703, 700, 696, -1, 700, 703, 702, 701, 704, 705, 706, 707, -1, 704, 708, 709, 705, -1, 705, 709, 710, 706, -1, 706, 710, 711, 707, -1, 707, 711, 708, 704, -1, 708, 711, 710, 709, 712,
-                    713, 714, 715, -1, 712, 716, 717, 713, -1, 713, 717, 718, 714, -1, 714, 718, 719, 715, -1, 715, 719, 716, 712, -1, 716, 719, 718, 717, 720, 721, 722, 723, -1, 720, 724, 725, 721, -1, 721, 725, 726,
-                    722, -1, 722, 726, 727, 723, -1, 723, 727, 724, 720, -1, 724, 727, 726, 725, 728, 729, 730, 731, -1, 728, 732, 733, 729, -1, 729, 733, 734, 730, -1, 730, 734, 735, 731, -1, 731, 735, 732, 728, -1,
-                    732, 735, 734, 733, 736, 737, 738, 739, -1, 736, 740, 741, 737, -1, 737, 741, 742, 738, -1, 738, 742, 743, 739, -1, 739, 743, 740, 736, -1, 740, 743, 742, 741, 744, 745, 746, 747, -1, 744, 748, 749,
-                    745, -1, 745, 749, 750, 746, -1, 746, 750, 751, 747, -1, 747, 751, 748, 744, -1, 748, 751, 750, 749, 752, 753, 754, 755, -1, 752, 756, 757, 753, -1, 753, 757, 758, 754, -1, 754, 758, 759, 755, -1,
-                    755, 759, 756, 752, -1, 756, 759, 758, 757, 760, 761, 762, 763, -1, 760, 764, 765, 761, -1, 761, 765, 766, 762, -1, 762, 766, 767, 763, -1, 763, 767, 764, 760, -1, 764, 767, 766, 765, 768, 769, 770,
-                    771, -1, 768, 772, 773, 769, -1, 769, 773, 774, 770, -1, 770, 774, 775, 771, -1, 771, 775, 772, 768, -1, 772, 775, 774, 773, 776, 777, 778, 779, -1, 776, 780, 781, 777, -1, 777, 781, 782, 778, -1,
-                    778, 782, 783, 779, -1, 779, 783, 780, 776, -1, 780, 783, 782, 781, 784, 785, 786, 787, -1, 784, 788, 789, 785, -1, 785, 789, 790, 786, -1, 786, 790, 791, 787, -1, 787, 791, 788, 784, -1, 788, 791,
-                    790, 789, 792, 793, 794, 795, -1, 792, 796, 797, 793, -1, 793, 797, 798, 794, -1, 794, 798, 799, 795, -1, 795, 799, 796, 792, -1, 796, 799, 798, 797, 800, 801, 802, 803, -1, 800, 804, 805, 801, -1,
-                    801, 805, 806, 802, -1, 802, 806, 807, 803, -1, 803, 807, 804, 800, -1, 804, 807, 806, 805, 808, 809, 810, 811, -1, 808, 812, 813, 809, -1, 809, 813, 814, 810, -1, 810, 814, 815, 811, -1, 811, 815,
-                    812, 808, -1, 812, 815, 814, 813, 816, 817, 818, 819, -1, 816, 820, 821, 817, -1, 817, 821, 822, 818, -1, 818, 822, 823, 819, -1, 819, 823, 820, 816, -1, 820, 823, 822, 821, 824, 825, 826, 827, -1,
-                    824, 828, 829, 825, -1, 825, 829, 830, 826, -1, 826, 830, 831, 827, -1, 827, 831, 828, 824, -1, 828, 831, 830, 829, 832, 833, 834, 835, -1, 832, 836, 837, 833, -1, 833, 837, 838, 834, -1, 834, 838,
-                    839, 835, -1, 835, 839, 836, 832, -1, 836, 839, 838, 837, 840, 841, 842, 843, -1, 840, 844, 845, 841, -1, 841, 845, 846, 842, -1, 842, 846, 847, 843, -1, 843, 847, 844, 840, -1, 844, 847, 846, 845,
-                    848, 849, 850, 851, -1, 848, 852, 853, 849, -1, 849, 853, 854, 850, -1, 850, 854, 855, 851, -1, 851, 855, 852, 848, -1, 852, 855, 854, 853, 856, 857, 858, 859, -1, 856, 860, 861, 857, -1, 857, 861,
-                    862, 858, -1, 858, 862, 863, 859, -1, 859, 863, 860, 856, -1, 860, 863, 862, 861, 864, 865, 866, 867, -1, 864, 868, 869, 865, -1, 865, 869, 870, 866, -1, 866, 870, 871, 867, -1, 867, 871, 868, 864,
-                    -1, 868, 871, 870, 869, 872, 873, 874, 875, -1, 872, 876, 877, 873, -1, 873, 877, 878, 874, -1, 874, 878, 879, 875, -1, 875, 879, 876, 872, -1, 876, 879, 878, 877, 880, 881, 882, 883, -1, 880, 884,
-                    885, 881, -1, 881, 885, 886, 882, -1, 882, 886, 887, 883, -1, 883, 887, 884, 880, -1, 884, 887, 886, 885, 888, 889, 890, 891, -1, 888, 892, 893, 889, -1, 889, 893, 894, 890, -1, 890, 894, 895, 891,
-                    -1, 891, 895, 892, 888, -1, 892, 895, 894, 893, 896, 897, 898, 899, -1, 896, 900, 901, 897, -1, 897, 901, 902, 898, -1, 898, 902, 903, 899, -1, 899, 903, 900, 896, -1, 900, 903, 902, 901, 904, 905,
-                    906, 907, -1, 904, 908, 909, 905, -1, 905, 909, 910, 906, -1, 906, 910, 911, 907, -1, 907, 911, 908, 904, -1, 908, 911, 910, 909, 912, 913, 914, 915, -1, 912, 916, 917, 913, -1, 913, 917, 918, 914,
-                    -1, 914, 918, 919, 915, -1, 915, 919, 916, 912, -1, 916, 919, 918, 917, 920, 921, 922, 923, -1, 920, 924, 925, 921, -1, 921, 925, 926, 922, -1, 922, 926, 927, 923, -1, 923, 927, 924, 920, -1, 924,
-                    927, 926, 925, 928, 929, 930, 931, -1, 928, 932, 933, 929, -1, 929, 933, 934, 930, -1, 930, 934, 935, 931, -1, 931, 935, 932, 928, -1, 932, 935, 934, 933, 936, 937, 938, 939, -1, 936, 940, 941, 937,
-                    -1, 937, 941, 942, 938, -1, 938, 942, 943, 939, -1, 939, 943, 940, 936, -1, 940, 943, 942, 941, 944, 945, 946, 947, -1, 944, 948, 949, 945, -1, 945, 949, 950, 946, -1, 946, 950, 951, 947, -1, 947,
-                    951, 948, 944, -1, 948, 951, 950, 949, 952, 953, 954, 955, -1, 952, 956, 957, 953, -1, 953, 957, 958, 954, -1, 954, 958, 959, 955, -1, 955, 959, 956, 952, -1, 956, 959, 958, 957, 960, 961, 962, 963,
-                    -1, 960, 964, 965, 961, -1, 961, 965, 966, 962, -1, 962, 966, 967, 963, -1, 963, 967, 964, 960, -1, 964, 967, 966, 965, 968, 969, 970, 971, -1, 968, 972, 973, 969, -1, 969, 973, 974, 970, -1, 970,
-                    974, 975, 971, -1, 971, 975, 972, 968, -1, 972, 975, 974, 973, 976, 977, 978, 979, -1, 976, 980, 981, 977, -1, 977, 981, 982, 978, -1, 978, 982, 983, 979, -1, 979, 983, 980, 976, -1, 980, 983, 982,
-                    981, 984, 985, 986, 987, -1, 984, 988, 989, 985, -1, 985, 989, 990, 986, -1, 986, 990, 991, 987, -1, 987, 991, 988, 984, -1, 988, 991, 990, 989, 992, 993, 994, 995, -1, 992, 996, 997, 993, -1, 993,
-                    997, 998, 994, -1, 994, 998, 999, 995, -1, 995, 999, 996, 992, -1, 996, 999, 998, 997, 1000, 1001, 1002, 1003, -1, 1000, 1004, 1005, 1001, -1, 1001, 1005, 1006, 1002, -1, 1002, 1006, 1007, 1003,
-                    -1, 1003, 1007, 1004, 1000, -1, 1004, 1007, 1006, 1005, 1008, 1009, 1010, 1011, -1, 1008, 1012, 1013, 1009, -1, 1009, 1013, 1014, 1010, -1, 1010, 1014, 1015, 1011, -1, 1011, 1015, 1012, 1008, -1,
-                    1012, 1015, 1014, 1013, 1016, 1017, 1018, 1019, -1, 1016, 1020, 1021, 1017, -1, 1017, 1021, 1022, 1018, -1, 1018, 1022, 1023, 1019, -1, 1019, 1023, 1020, 1016, -1, 1020, 1023, 1022, 1021, 1024,
-                    1025, 1026, 1027, -1, 1024, 1028, 1029, 1025, -1, 1025, 1029, 1030, 1026, -1, 1026, 1030, 1031, 1027, -1, 1027, 1031, 1028, 1024, -1, 1028, 1031, 1030, 1029, 1032, 1033, 1034, 1035, -1, 1032,
-                    1036, 1037, 1033, -1, 1033, 1037, 1038, 1034, -1, 1034, 1038, 1039, 1035, -1, 1035, 1039, 1036, 1032, -1, 1036, 1039, 1038, 1037, 1040, 1041, 1042, 1043, -1, 1040, 1044, 1045, 1041, -1, 1041,
-                    1045, 1046, 1042, -1, 1042, 1046, 1047, 1043, -1, 1043, 1047, 1044, 1040, -1, 1044, 1047, 1046, 1045, 1048, 1049, 1050, 1051, -1, 1048, 1052, 1053, 1049, -1, 1049, 1053, 1054, 1050, -1, 1050,
-                    1054, 1055, 1051, -1, 1051, 1055, 1052, 1048, -1, 1052, 1055, 1054, 1053, 1056, 1057, 1058, 1059, -1, 1056, 1060, 1061, 1057, -1, 1057, 1061, 1062, 1058, -1, 1058, 1062, 1063, 1059, -1, 1059,
-                    1063, 1060, 1056, -1, 1060, 1063, 1062, 1061, 1064, 1065, 1066, 1067, -1, 1064, 1068, 1069, 1065, -1, 1065, 1069, 1070, 1066, -1, 1066, 1070, 1071, 1067, -1, 1067, 1071, 1068, 1064, -1, 1068,
-                    1071, 1070, 1069, 1072, 1073, 1074, 1075, -1, 1072, 1076, 1077, 1073, -1, 1073, 1077, 1078, 1074, -1, 1074, 1078, 1079, 1075, -1, 1075, 1079, 1076, 1072, -1, 1076, 1079, 1078, 1077, 1080, 1081,
-                    1082, 1083, -1, 1080, 1084, 1085, 1081, -1, 1081, 1085, 1086, 1082, -1, 1082, 1086, 1087, 1083, -1, 1083, 1087, 1084, 1080, -1, 1084, 1087, 1086, 1085, 1088, 1089, 1090, 1091, -1, 1088, 1092,
-                    1093, 1089, -1, 1089, 1093, 1094, 1090, -1, 1090, 1094, 1095, 1091, -1, 1091, 1095, 1092, 1088, -1, 1092, 1095, 1094, 1093, 1096, 1097, 1098, 1099, -1, 1096, 1100, 1101, 1097, -1, 1097, 1101,
-                    1102, 1098, -1, 1098, 1102, 1103, 1099, -1, 1099, 1103, 1100, 1096, -1, 1100, 1103, 1102, 1101, 1104, 1105, 1106, 1107, -1, 1104, 1108, 1109, 1105, -1, 1105, 1109, 1110, 1106, -1, 1106, 1110,
-                    1111, 1107, -1, 1107, 1111, 1108, 1104, -1, 1108, 1111, 1110, 1109, 1112, 1113, 1114, 1115, -1, 1112, 1116, 1117, 1113, -1, 1113, 1117, 1118, 1114, -1, 1114, 1118, 1119, 1115, -1, 1115, 1119,
-                    1116, 1112, -1, 1116, 1119, 1118, 1117, 1120, 1121, 1122, 1123, -1, 1120, 1124, 1125, 1121, -1, 1121, 1125, 1126, 1122, -1, 1122, 1126, 1127, 1123, -1, 1123, 1127, 1124, 1120, -1, 1124, 1127,
-                    1126, 1125, 1128, 1129, 1130, 1131, -1, 1128, 1132, 1133, 1129, -1, 1129, 1133, 1134, 1130, -1, 1130, 1134, 1135, 1131, -1, 1131, 1135, 1132, 1128, -1, 1132, 1135, 1134, 1133, 1136, 1137, 1138,
-                    1139, -1, 1136, 1140, 1141, 1137, -1, 1137, 1141, 1142, 1138, -1, 1138, 1142, 1143, 1139, -1, 1139, 1143, 1140, 1136, -1, 1140, 1143, 1142, 1141, 1144, 1145, 1146, 1147, -1, 1144, 1148, 1149,
-                    1145, -1, 1145, 1149, 1150, 1146, -1, 1146, 1150, 1151, 1147, -1, 1147, 1151, 1148, 1144, -1, 1148, 1151, 1150, 1149, 1152, 1153, 1154, 1155, -1, 1152, 1156, 1157, 1153, -1, 1153, 1157, 1158,
-                    1154, -1, 1154, 1158, 1159, 1155, -1, 1155, 1159, 1156, 1152, -1, 1156, 1159, 1158, 1157, 1160, 1161, 1162, 1163, -1, 1160, 1164, 1165, 1161, -1, 1161, 1165, 1166, 1162, -1, 1162, 1166, 1167,
-                    1163, -1, 1163, 1167, 1164, 1160, -1, 1164, 1167, 1166, 1165, 1168, 1169, 1170, 1171, -1, 1168, 1172, 1173, 1169, -1, 1169, 1173, 1174, 1170, -1, 1170, 1174, 1175, 1171, -1, 1171, 1175, 1172,
-                    1168, -1, 1172, 1175, 1174, 1173, 1176, 1177, 1178, 1179, -1, 1176, 1180, 1181, 1177, -1, 1177, 1181, 1182, 1178, -1, 1178, 1182, 1183, 1179, -1, 1179, 1183, 1180, 1176, -1, 1180, 1183, 1182,
-                    1181, 1184, 1185, 1186, 1187, -1, 1184, 1188, 1189, 1185, -1, 1185, 1189, 1190, 1186, -1, 1186, 1190, 1191, 1187, -1, 1187, 1191, 1188, 1184, -1, 1188, 1191, 1190, 1189, 1192, 1193, 1194, 1195,
-                    -1, 1192, 1196, 1197, 1193, -1, 1193, 1197, 1198, 1194, -1, 1194, 1198, 1199, 1195, -1, 1195, 1199, 1196, 1192, -1, 1196, 1199, 1198, 1197, 1200, 1201, 1202, 1203, -1, 1200, 1204, 1205, 1201,
-                    -1, 1201, 1205, 1206, 1202, -1, 1202, 1206, 1207, 1203, -1, 1203, 1207, 1204, 1200, -1, 1204, 1207, 1206, 1205, 1208, 1209, 1210, 1211, -1, 1208, 1212, 1213, 1209, -1, 1209, 1213, 1214, 1210,
-                    -1, 1210, 1214, 1215, 1211, -1, 1211, 1215, 1212, 1208, -1, 1212, 1215, 1214, 1213, 1216, 1217, 1218, 1219, -1, 1216, 1220, 1221, 1217, -1, 1217, 1221, 1222, 1218, -1, 1218, 1222, 1223, 1219,
-                    -1, 1219, 1223, 1220, 1216, -1, 1220, 1223, 1222, 1221, 1224, 1225, 1226, 1227, -1, 1224, 1228, 1229, 1225, -1, 1225, 1229, 1230, 1226, -1, 1226, 1230, 1231, 1227, -1, 1227, 1231, 1228, 1224,
-                    -1, 1228, 1231, 1230, 1229, 1232, 1233, 1234, 1235, -1, 1232, 1236, 1237, 1233, -1, 1233, 1237, 1238, 1234, -1, 1234, 1238, 1239, 1235, -1, 1235, 1239, 1236, 1232, -1, 1236, 1239, 1238, 1237,
-                    1240, 1241, 1242, 1243, -1, 1240, 1244, 1245, 1241, -1, 1241, 1245, 1246, 1242, -1, 1242, 1246, 1247, 1243, -1, 1243, 1247, 1244, 1240, -1, 1244, 1247, 1246, 1245, 1248, 1249, 1250, 1251, -1,
-                    1248, 1252, 1253, 1249, -1, 1249, 1253, 1254, 1250, -1, 1250, 1254, 1255, 1251, -1, 1251, 1255, 1252, 1248, -1, 1252, 1255, 1254, 1253, 1256, 1257, 1258, 1259, -1, 1256, 1260, 1261, 1257, -1,
-                    1257, 1261, 1262, 1258, -1, 1258, 1262, 1263, 1259, -1, 1259, 1263, 1260, 1256, -1, 1260, 1263, 1262, 1261, 1264, 1265, 1266, 1267, -1, 1264, 1268, 1269, 1265, -1, 1265, 1269, 1270, 1266, -1,
-                    1266, 1270, 1271, 1267, -1, 1267, 1271, 1268, 1264, -1, 1268, 1271, 1270, 1269, 1272, 1273, 1274, 1275, -1, 1272, 1276, 1277, 1273, -1, 1273, 1277, 1278, 1274, -1, 1274, 1278, 1279, 1275, -1,
-                    1275, 1279, 1276, 1272, -1, 1276, 1279, 1278, 1277, 1280, 1281, 1282, 1283, -1, 1280, 1284, 1285, 1281, -1, 1281, 1285, 1286, 1282, -1, 1282, 1286, 1287, 1283, -1, 1283, 1287, 1284, 1280, -1,
-                    1284, 1287, 1286, 1285, 1288, 1289, 1290, 1291, -1, 1288, 1292, 1293, 1289, -1, 1289, 1293, 1294, 1290, -1, 1290, 1294, 1295, 1291, -1, 1291, 1295, 1292, 1288, -1, 1292, 1295, 1294, 1293, 1296,
-                    1297, 1298, 1299, -1, 1296, 1300, 1301, 1297, -1, 1297, 1301, 1302, 1298, -1, 1298, 1302, 1303, 1299, -1, 1299, 1303, 1300, 1296, -1, 1300, 1303, 1302, 1301, 1304, 1305, 1306, 1307, -1, 1304,
-                    1308, 1309, 1305, -1, 1305, 1309, 1310, 1306, -1, 1306, 1310, 1311, 1307, -1, 1307, 1311, 1308, 1304, -1, 1308, 1311, 1310, 1309, 1312, 1313, 1314, 1315, -1, 1312, 1316, 1317, 1313, -1, 1313,
-                    1317, 1318, 1314, -1, 1314, 1318, 1319, 1315, -1, 1315, 1319, 1316, 1312, -1, 1316, 1319, 1318, 1317, 1320, 1321, 1322, 1323, -1, 1320, 1324, 1325, 1321, -1, 1321, 1325, 1326, 1322, -1, 1322,
-                    1326, 1327, 1323, -1, 1323, 1327, 1324, 1320, -1, 1324, 1327, 1326, 1325, 1328, 1329, 1330, 1331, -1, 1328, 1332, 1333, 1329, -1, 1329, 1333, 1334, 1330, -1, 1330, 1334, 1335, 1331, -1, 1331,
-                    1335, 1332, 1328, -1, 1332, 1335, 1334, 1333, 1336, 1337, 1338, 1339, -1, 1336, 1340, 1341, 1337, -1, 1337, 1341, 1342, 1338, -1, 1338, 1342, 1343, 1339, -1, 1339, 1343, 1340, 1336, -1, 1340,
-                    1343, 1342, 1341, 1344, 1345, 1346, 1347, -1, 1344, 1348, 1349, 1345, -1, 1345, 1349, 1350, 1346, -1, 1346, 1350, 1351, 1347, -1, 1347, 1351, 1348, 1344, -1, 1348, 1351, 1350, 1349, 1352, 1353,
-                    1354, 1355, -1, 1352, 1356, 1357, 1353, -1, 1353, 1357, 1358, 1354, -1, 1354, 1358, 1359, 1355, -1, 1355, 1359, 1356, 1352, -1, 1356, 1359, 1358, 1357, 1360, 1361, 1362, 1363, -1, 1360, 1364,
-                    1365, 1361, -1, 1361, 1365, 1366, 1362, -1, 1362, 1366, 1367, 1363, -1, 1363, 1367, 1364, 1360, -1, 1364, 1367, 1366, 1365, 1368, 1369, 1370, 1371, -1, 1368, 1372, 1373, 1369, -1, 1369, 1373,
-                    1374, 1370, -1, 1370, 1374, 1375, 1371, -1, 1371, 1375, 1372, 1368, -1, 1372, 1375, 1374, 1373, 1376, 1377, 1378, 1379, -1, 1376, 1380, 1381, 1377, -1, 1377, 1381, 1382, 1378, -1, 1378, 1382,
-                    1383, 1379, -1, 1379, 1383, 1380, 1376, -1, 1380, 1383, 1382, 1381, 1384, 1385, 1386, 1387, -1, 1384, 1388, 1389, 1385, -1, 1385, 1389, 1390, 1386, -1, 1386, 1390, 1391, 1387, -1, 1387, 1391,
-                    1388, 1384, -1, 1388, 1391, 1390, 1389, 1392, 1393, 1394, 1395, -1, 1392, 1396, 1397, 1393, -1, 1393, 1397, 1398, 1394, -1, 1394, 1398, 1399, 1395, -1, 1395, 1399, 1396, 1392, -1, 1396, 1399,
-                    1398, 1397, 1400, 1401, 1402, 1403, -1, 1400, 1404, 1405, 1401, -1, 1401, 1405, 1406, 1402, -1, 1402, 1406, 1407, 1403, -1, 1403, 1407, 1404, 1400, -1, 1404, 1407, 1406, 1405, 1408, 1409,
-                    1410, 1411, -1, 1408, 1412, 1413, 1409, -1, 1409, 1413, 1414, 1410, -1, 1410, 1414, 1415, 1411, -1, 1411, 1415, 1412, 1408, -1, 1412, 1415, 1414, 1413, 1416, 1417, 1418, 1419, -1, 1416,
-                    1420, 1421, 1417, -1, 1417, 1421, 1422, 1418, -1, 1418, 1422, 1423, 1419, -1, 1419, 1423, 1420, 1416, -1, 1420, 1423, 1422, 1421, 1424, 1425, 1426, 1427, -1, 1424, 1428, 1429, 1425, -1,
-                    1425, 1429, 1430, 1426, -1, 1426, 1430, 1431, 1427, -1, 1427, 1431, 1428, 1424, -1, 1428, 1431, 1430, 1429, 1432, 1433, 1434, 1435, -1, 1432, 1436, 1437, 1433, -1, 1433, 1437, 1438, 1434,
-                    -1, 1434, 1438, 1439, 1435, -1, 1435, 1439, 1436, 1432, -1, 1436, 1439, 1438, 1437, 1440, 1441, 1442, 1443, -1, 1440, 1444, 1445, 1441, -1, 1441, 1445, 1446, 1442, -1, 1442, 1446, 1447, 1443,
-                    -1, 1443, 1447, 1444, 1440, -1, 1444, 1447, 1446, 1445, 1448, 1449, 1450, 1451, -1, 1448, 1452, 1453, 1449, -1, 1449, 1453, 1454, 1450, -1, 1450, 1454, 1455, 1451, -1, 1451, 1455, 1452, 1448,
-                    -1, 1452, 1455, 1454, 1453, 1456, 1457, 1458, 1459, -1, 1456, 1460, 1461, 1457, -1, 1457, 1461, 1462, 1458, -1, 1458, 1462, 1463, 1459, -1, 1459, 1463, 1460, 1456, -1, 1460, 1463, 1462, 1461,
-                    1464, 1465, 1466, 1467, -1, 1464, 1468, 1469, 1465, -1, 1465, 1469, 1470, 1466, -1, 1466, 1470, 1471, 1467, -1, 1467, 1471, 1468, 1464, -1, 1468, 1471, 1470, 1469, 1472, 1473, 1474, 1475, -1,
-                    1472, 1476, 1477, 1473, -1, 1473, 1477, 1478, 1474, -1, 1474, 1478, 1479, 1475, -1, 1475, 1479, 1476, 1472, -1, 1476, 1479, 1478, 1477, 1480, 1481, 1482, 1483, -1, 1480, 1484, 1485, 1481, -1,
-                    1481, 1485, 1486, 1482, -1, 1482, 1486, 1487, 1483, -1, 1483, 1487, 1484, 1480, -1, 1484, 1487, 1486, 1485, 1488, 1489, 1490, 1491, -1, 1488, 1492, 1493, 1489, -1, 1489, 1493, 1494, 1490, -1,
-                    1490, 1494, 1495, 1491, -1, 1491, 1495, 1492, 1488, -1, 1492, 1495, 1494, 1493, 1496, 1497, 1498, 1499, -1, 1496, 1500, 1501, 1497, -1, 1497, 1501, 1502, 1498, -1, 1498, 1502, 1503, 1499, -1,
-                    1499, 1503, 1500, 1496, -1, 1500, 1503, 1502, 1501, 1504, 1505, 1506, 1507, -1, 1504, 1508, 1509, 1505, -1, 1505, 1509, 1510, 1506, -1, 1506, 1510, 1511, 1507, -1, 1507, 1511, 1508, 1504, -1,
-                    1508, 1511, 1510, 1509, 1512, 1513, 1514, 1515, -1, 1512, 1516, 1517, 1513, -1, 1513, 1517, 1518, 1514, -1, 1514, 1518, 1519, 1515, -1, 1515, 1519, 1516, 1512, -1, 1516, 1519, 1518, 1517, 1520,
-                    1521, 1522, 1523, -1, 1520, 1524, 1525, 1521, -1, 1521, 1525, 1526, 1522, -1, 1522, 1526, 1527, 1523, -1, 1523, 1527, 1524, 1520, -1, 1524, 1527, 1526, 1525, 1528, 1529, 1530, 1531, -1, 1528, 1532,
-                    1533, 1529, -1, 1529, 1533, 1534, 1530, -1, 1530, 1534, 1535, 1531, -1, 1531, 1535, 1532, 1528, -1, 1532, 1535, 1534, 1533, 1536, 1537, 1538, 1539, -1, 1536, 1540, 1541, 1537, -1, 1537, 1541, 1542,
-                    1538, -1, 1538, 1542, 1543, 1539, -1, 1539, 1543, 1540, 1536, -1, 1540, 1543, 1542, 1541, 1544, 1545, 1546, 1547, -1, 1544, 1548, 1549, 1545, -1, 1545, 1549, 1550, 1546, -1, 1546, 1550, 1551, 1547,
-                    -1, 1547, 1551, 1548, 1544, -1, 1548, 1551, 1550, 1549, 1552, 1553, 1554, 1555, -1, 1552, 1556, 1557, 1553, -1, 1553, 1557, 1558, 1554, -1, 1554, 1558, 1559, 1555, -1, 1555, 1559, 1556, 1552, -1, 1556,
-                    1559, 1558, 1557, 1560, 1561, 1562, 1563, -1, 1560, 1564, 1565, 1561, -1, 1561, 1565, 1566, 1562, -1, 1562, 1566, 1567, 1563, -1, 1563, 1567, 1564, 1560, -1, 1564, 1567, 1566, 1565, 1568, 1569, 1570, 1571,
-                    -1, 1568, 1572, 1573, 1569, -1, 1569, 1573, 1574, 1570, -1, 1570, 1574, 1575, 1571, -1, 1571, 1575, 1572, 1568, -1, 1572, 1575, 1574, 1573, 1576, 1577, 1578, 1579, -1, 1576, 1580, 1581, 1577, -1,
-                    1577, 1581, 1582, 1578, -1, 1578, 1582, 1583, 1579, -1, 1579, 1583, 1580, 1576, -1, 1580, 1583, 1582, 1581, 1584, 1585, 1586, 1587, -1, 1584, 1588, 1589, 1585, -1, 1585, 1589, 1590, 1586, -1,
-                    1586, 1590, 1591, 1587, -1, 1587, 1591, 1588, 1584, -1, 1588, 1591, 1590, 1589, 1592, 1593, 1594, 1595, -1, 1592, 1596, 1597, 1593, -1, 1593, 1597, 1598, 1594, -1, 1594, 1598, 1599, 1595, -1,
-                    1595, 1599, 1596, 1592, -1, 1596, 1599, 1598, 1597, 1600, 1601, 1602, 1603, -1, 1600, 1604, 1605, 1601, -1, 1601, 1605, 1606, 1602, -1, 1602, 1606, 1607, 1603, -1, 1603, 1607, 1604, 1600, -1,
-                    1604, 1607, 1606, 1605, 1608, 1609, 1610, 1611, -1, 1608, 1612, 1613, 1609, -1, 1609, 1613, 1614, 1610, -1, 1610, 1614, 1615, 1611, -1, 1611, 1615, 1612, 1608, -1, 1612, 1615, 1614, 1613, 1616,
-                    1617, 1618, 1619, -1, 1616, 1620, 1621, 1617, -1, 1617, 1621, 1622, 1618, -1, 1618, 1622, 1623, 1619, -1, 1619, 1623, 1620, 1616, -1, 1620, 1623, 1622, 1621, 1624, 1625, 1626, 1627, -1, 1624,
-                    1628, 1629, 1625, -1, 1625, 1629, 1630, 1626, -1, 1626, 1630, 1631, 1627, -1, 1627, 1631, 1628, 1624, -1, 1628, 1631, 1630, 1629, 1632, 1633, 1634, 1635, -1, 1632, 1636, 1637, 1633, -1, 1633,
-                    1637, 1638, 1634, -1, 1634, 1638, 1639, 1635, -1, 1635, 1639, 1636, 1632, -1, 1636, 1639, 1638, 1637, 1640, 1641, 1642, 1643, -1, 1640, 1644, 1645, 1641, -1, 1641, 1645, 1646, 1642, -1, 1642,
-                    1646, 1647, 1643, -1, 1643, 1647, 1644, 1640, -1, 1644, 1647, 1646, 1645, 1648, 1649, 1650, 1651, -1, 1648, 1652, 1653, 1649, -1, 1649, 1653, 1654, 1650, -1, 1650, 1654, 1655, 1651, -1, 1651,
-                    1655, 1652, 1648, -1, 1652, 1655, 1654, 1653, 1656, 1657, 1658, 1659, -1, 1656, 1660, 1661, 1657, -1, 1657, 1661, 1662, 1658, -1, 1658, 1662, 1663, 1659, -1, 1659, 1663, 1660, 1656, -1, 1660,
-                    1663, 1662, 1661, 1664, 1665, 1666, 1667, -1, 1664, 1668, 1669, 1665, -1, 1665, 1669, 1670, 1666, -1, 1666, 1670, 1671, 1667, -1, 1667, 1671, 1668, 1664, -1, 1668, 1671, 1670, 1669, 1672, 1673,
-                    1674, 1675, -1, 1672, 1676, 1677, 1673, -1, 1673, 1677, 1678, 1674, -1, 1674, 1678, 1679, 1675, -1, 1675, 1679, 1676, 1672, -1, 1676, 1679, 1678, 1677, 1680, 1681, 1682, 1683, -1, 1680, 1684,
-                    1685, 1681, -1, 1681, 1685, 1686, 1682, -1, 1682, 1686, 1687, 1683, -1, 1683, 1687, 1684, 1680, -1, 1684, 1687, 1686, 1685, 1688, 1689, 1690, 1691, -1, 1688, 1692, 1693, 1689, -1, 1689, 1693,
-                    1694, 1690, -1, 1690, 1694, 1695, 1691, -1, 1691, 1695, 1692, 1688, -1, 1692, 1695, 1694, 1693, 1696, 1697, 1698, 1699, -1, 1696, 1700, 1701, 1697, -1, 1697, 1701, 1702, 1698, -1, 1698, 1702,
-                    1703, 1699, -1, 1699, 1703, 1700, 1696, -1, 1700, 1703, 1702, 1701, 1704, 1705, 1706, 1707, -1, 1704, 1708, 1709, 1705, -1, 1705, 1709, 1710, 1706, -1, 1706, 1710, 1711, 1707, -1, 1707, 1711,
-                    1708, 1704, -1, 1708, 1711, 1710, 1709, 1712, 1713, 1714, 1715, -1, 1712, 1716, 1717, 1713, -1, 1713, 1717, 1718, 1714, -1, 1714, 1718, 1719, 1715, -1, 1715, 1719, 1716, 1712, -1, 1716, 1719, 1718, 1717};
-
-double coordsTT[5160]={
-    0.0054015000000000044, 0.0054015000000000053, 0, 0.2106585, 0.0054015000000000053, 0, 0.2106585, 0.039611, 0, 0.2106585, 0.10803, 0, 0.2106585,
-    0.17644899999999999, 0, 0.2106585, 0.2106585, 0, 0.0054015000000000044, 0.2106585, 0, 0.0054015000000000044, 0.0054015000000000053, 0.21364999999999998,
-    0.2106585, 0.0054015000000000053, 0.21364999999999998, 0.2106585, 0.039611, 0.21364999999999998, 0.2106585, 0.10803, 0.21364999999999998, 0.2106585,
-    0.17644899999999999, 0.21364999999999998, 0.2106585, 0.2106585, 0.21364999999999998, 0.0054015000000000044, 0.2106585, 0.21364999999999998,
-    0.0054015000000000044, 0.0054015000000000053, 0.21364999999999998, 0.2106585, 0.0054015000000000053, 0.21364999999999998, 0.2106585, 0.039611,
-    0.21364999999999998, 0.2106585, 0.10803, 0.21364999999999998, 0.2106585, 0.17644899999999999, 0.21364999999999998, 0.2106585, 0.2106585, 0.21364999999999998,
-    0.0054015000000000044, 0.2106585, 0.21364999999999998, 0.0054015000000000044, 0.0054015000000000053, 0.42729999999999996, 0.2106585, 0.0054015000000000053,
-    0.42729999999999996, 0.2106585, 0.039611, 0.42729999999999996, 0.2106585, 0.10803, 0.42729999999999996, 0.2106585, 0.17644899999999999, 0.42729999999999996,
-    0.2106585, 0.2106585, 0.42729999999999996, 0.0054015000000000044, 0.2106585, 0.42729999999999996, 0.0054015000000000044, 0.0054015000000000053,
-    0.42729999999999996, 0.2106585, 0.0054015000000000053, 0.42729999999999996, 0.2106585, 0.039611, 0.42729999999999996, 0.2106585, 0.10803, 0.42729999999999996,
-    0.2106585, 0.17644899999999999, 0.42729999999999996, 0.2106585, 0.2106585, 0.42729999999999996, 0.0054015000000000044, 0.2106585, 0.42729999999999996,
-    0.0054015000000000044, 0.0054015000000000053, 0.64094999999999991, 0.2106585, 0.0054015000000000053, 0.64094999999999991, 0.2106585, 0.039611,
-    0.64094999999999991, 0.2106585, 0.10803, 0.64094999999999991, 0.2106585, 0.17644899999999999, 0.64094999999999991, 0.2106585, 0.2106585, 0.64094999999999991,
-    0.0054015000000000044, 0.2106585, 0.64094999999999991, 0.0054015000000000044, 0.0054015000000000053, 0.64094999999999991, 0.2106585, 0.0054015000000000053,
-    0.64094999999999991, 0.2106585, 0.039611, 0.64094999999999991, 0.2106585, 0.10803, 0.64094999999999991, 0.2106585, 0.17644899999999999, 0.64094999999999991,
-    0.2106585, 0.2106585, 0.64094999999999991, 0.0054015000000000044, 0.2106585, 0.64094999999999991, 0.0054015000000000044, 0.0054015000000000053,
-    0.85459999999999992, 0.2106585, 0.0054015000000000053, 0.85459999999999992, 0.2106585, 0.039611, 0.85459999999999992, 0.2106585, 0.10803, 0.85459999999999992,
-    0.2106585, 0.17644899999999999, 0.85459999999999992, 0.2106585, 0.2106585, 0.85459999999999992, 0.0054015000000000044, 0.2106585, 0.85459999999999992,
-    0.0054015000000000044, 0.0054015000000000053, 0.85459999999999992, 0.2106585, 0.0054015000000000053, 0.85459999999999992, 0.2106585, 0.039611,
-    0.85459999999999992, 0.2106585, 0.10803, 0.85459999999999992, 0.2106585, 0.17644899999999999, 0.85459999999999992, 0.2106585, 0.2106585, 0.85459999999999992,
-    0.0054015000000000044, 0.2106585, 0.85459999999999992, 0.0054015000000000044, 0.0054015000000000053, 1.0682499999999999, 0.2106585, 0.0054015000000000053,
-    1.0682499999999999, 0.2106585, 0.039611, 1.0682499999999999, 0.2106585, 0.10803,
-    1.0682499999999999, 0.2106585, 0.17644899999999999, 1.0682499999999999, 0.2106585, 0.2106585, 1.0682499999999999, 0.0054015000000000044, 0.2106585,
-    1.0682499999999999, 0.0054015000000000044, 0.0054015000000000053, 1.0682499999999999, 0.2106585, 0.0054015000000000053, 1.0682499999999999, 0.2106585, 0.039611,
-    1.0682499999999999, 0.2106585, 0.10803, 1.0682499999999999, 0.2106585, 0.17644899999999999, 1.0682499999999999, 0.2106585, 0.2106585, 1.0682499999999999,
-    0.0054015000000000044, 0.2106585, 1.0682499999999999, 0.0054015000000000044, 0.0054015000000000053, 1.2818999999999998, 0.2106585, 0.0054015000000000053,
-    1.2818999999999998, 0.2106585, 0.039611, 1.2818999999999998, 0.2106585, 0.10803, 1.2818999999999998, 0.2106585, 0.17644899999999999, 1.2818999999999998,
-    0.2106585, 0.2106585, 1.2818999999999998, 0.0054015000000000044, 0.2106585, 1.2818999999999998, 0.0054015000000000044, 0.0054015000000000053, 1.2818999999999998,
-    0.2106585, 0.0054015000000000053, 1.2818999999999998, 0.2106585, 0.039611, 1.2818999999999998, 0.2106585, 0.10803, 1.2818999999999998, 0.2106585,
-    0.17644899999999999, 1.2818999999999998, 0.2106585, 0.2106585, 1.2818999999999998, 0.0054015000000000044, 0.2106585, 1.2818999999999998, 0.0054015000000000044,
-    0.0054015000000000053, 1.4955499999999999, 0.2106585, 0.0054015000000000053, 1.4955499999999999, 0.2106585, 0.039611, 1.4955499999999999, 0.2106585, 0.10803,
-    1.4955499999999999, 0.2106585, 0.17644899999999999, 1.4955499999999999, 0.2106585, 0.2106585, 1.4955499999999999, 0.0054015000000000044, 0.2106585,
-    1.4955499999999999, 0.0054015000000000044, 0.0054015000000000053, 1.4955499999999999, 0.2106585, 0.0054015000000000053, 1.4955499999999999, 0.2106585, 0.039611,
-    1.4955499999999999, 0.2106585, 0.10803, 1.4955499999999999, 0.2106585, 0.17644899999999999, 1.4955499999999999, 0.2106585, 0.2106585, 1.4955499999999999,
-    0.0054015000000000044, 0.2106585, 1.4955499999999999, 0.0054015000000000044, 0.0054015000000000053, 1.7091999999999998, 0.2106585, 0.0054015000000000053,
-    1.7091999999999998, 0.2106585, 0.039611, 1.7091999999999998, 0.2106585, 0.10803, 1.7091999999999998, 0.2106585, 0.17644899999999999, 1.7091999999999998,
-    0.2106585, 0.2106585, 1.7091999999999998, 0.0054015000000000044, 0.2106585, 1.7091999999999998, 0.0054015000000000044, 0.0054015000000000053, 1.7091999999999998,
-    0.2106585, 0.0054015000000000053, 1.7091999999999998, 0.2106585, 0.039611, 1.7091999999999998, 0.2106585, 0.10803, 1.7091999999999998, 0.2106585,
-    0.17644899999999999, 1.7091999999999998, 0.2106585, 0.2106585, 1.7091999999999998, 0.0054015000000000044, 0.2106585, 1.7091999999999998, 0.0054015000000000044,
-    0.0054015000000000053, 1.9228499999999997, 0.2106585, 0.0054015000000000053, 1.9228499999999997, 0.2106585, 0.039611, 1.9228499999999997, 0.2106585, 0.10803,
-    1.9228499999999997, 0.2106585, 0.17644899999999999, 1.9228499999999997, 0.2106585, 0.2106585, 1.9228499999999997, 0.0054015000000000044, 0.2106585,
-    1.9228499999999997, 0.0054015000000000044, 0.0054015000000000053, 1.9228499999999997, 0.2106585, 0.0054015000000000053, 1.9228499999999997, 0.2106585, 0.039611,
-    1.9228499999999997, 0.2106585, 0.10803, 1.9228499999999997, 0.2106585, 0.17644899999999999, 1.9228499999999997, 0.2106585, 0.2106585, 1.9228499999999997,
-    0.0054015000000000044, 0.2106585, 1.9228499999999997, 0.0054015000000000044,
-    0.0054015000000000053, 2.1364999999999998, 0.2106585, 0.0054015000000000053, 2.1364999999999998, 0.2106585, 0.039611, 2.1364999999999998, 0.2106585,
-    0.10803, 2.1364999999999998, 0.2106585, 0.17644899999999999, 2.1364999999999998, 0.2106585, 0.2106585, 2.1364999999999998, 0.0054015000000000044, 0.2106585,
-    2.1364999999999998, 0.0054015000000000044, 0.0054015000000000053, 2.1364999999999998, 0.2106585, 0.0054015000000000053, 2.1364999999999998, 0.2106585, 0.039611,
-    2.1364999999999998, 0.2106585, 0.10803, 2.1364999999999998, 0.2106585, 0.17644899999999999, 2.1364999999999998, 0.2106585, 0.2106585, 2.1364999999999998,
-    0.0054015000000000044, 0.2106585, 2.1364999999999998, 0.0054015000000000044, 0.0054015000000000053, 2.3501499999999997, 0.2106585, 0.0054015000000000053,
-    2.3501499999999997, 0.2106585, 0.039611, 2.3501499999999997, 0.2106585, 0.10803, 2.3501499999999997, 0.2106585, 0.17644899999999999, 2.3501499999999997,
-    0.2106585, 0.2106585, 2.3501499999999997, 0.0054015000000000044, 0.2106585, 2.3501499999999997, 0.0054015000000000044, 0.0054015000000000053, 2.3501499999999997,
-    0.2106585, 0.0054015000000000053, 2.3501499999999997, 0.2106585, 0.039611, 2.3501499999999997, 0.2106585, 0.10803, 2.3501499999999997, 0.2106585,
-    0.17644899999999999, 2.3501499999999997, 0.2106585, 0.2106585, 2.3501499999999997, 0.0054015000000000044, 0.2106585, 2.3501499999999997, 0.0054015000000000044,
-    0.0054015000000000053, 2.5637999999999996, 0.2106585, 0.0054015000000000053, 2.5637999999999996, 0.2106585, 0.039611, 2.5637999999999996, 0.2106585, 0.10803,
-    2.5637999999999996, 0.2106585, 0.17644899999999999, 2.5637999999999996, 0.2106585, 0.2106585, 2.5637999999999996, 0.0054015000000000044, 0.2106585,
-    2.5637999999999996, 0.0054015000000000044, 0.0054015000000000053, 2.5637999999999996, 0.2106585, 0.0054015000000000053, 2.5637999999999996, 0.2106585, 0.039611,
-    2.5637999999999996, 0.2106585, 0.10803, 2.5637999999999996, 0.2106585, 0.17644899999999999, 2.5637999999999996, 0.2106585, 0.2106585, 2.5637999999999996,
-    0.0054015000000000044, 0.2106585, 2.5637999999999996, 0.0054015000000000044, 0.0054015000000000053, 2.7774499999999995, 0.2106585, 0.0054015000000000053,
-    2.7774499999999995, 0.2106585, 0.039611, 2.7774499999999995, 0.2106585, 0.10803, 2.7774499999999995, 0.2106585, 0.17644899999999999, 2.7774499999999995,
-    0.2106585, 0.2106585, 2.7774499999999995, 0.0054015000000000044, 0.2106585, 2.7774499999999995, 0.0054015000000000044, 0.0054015000000000053, 2.7774499999999995,
-    0.2106585, 0.0054015000000000053, 2.7774499999999995, 0.2106585, 0.039611, 2.7774499999999995, 0.2106585, 0.10803, 2.7774499999999995, 0.2106585,
-    0.17644899999999999, 2.7774499999999995, 0.2106585, 0.2106585, 2.7774499999999995, 0.0054015000000000044, 0.2106585, 2.7774499999999995, 0.0054015000000000044,
-    0.0054015000000000053, 2.9910999999999999, 0.2106585, 0.0054015000000000053, 2.9910999999999999, 0.2106585, 0.039611, 2.9910999999999999, 0.2106585, 0.10803,
-    2.9910999999999999, 0.2106585, 0.17644899999999999, 2.9910999999999999, 0.2106585, 0.2106585, 2.9910999999999999, 0.0054015000000000044, 0.2106585,
-    2.9910999999999999, 0.0054015000000000044, 0.0054015000000000053, 2.9910999999999999, 0.2106585, 0.0054015000000000053, 2.9910999999999999, 0.2106585, 0.039611,
-    2.9910999999999999, 0.2106585, 0.10803, 2.9910999999999999,
-    0.2106585, 0.17644899999999999, 2.9910999999999999, 0.2106585, 0.2106585, 2.9910999999999999, 0.0054015000000000044, 0.2106585, 2.9910999999999999,
-    0.0054015000000000044, 0.0054015000000000053, 3.2047499999999998, 0.2106585, 0.0054015000000000053, 3.2047499999999998, 0.2106585, 0.039611, 3.2047499999999998,
-    0.2106585, 0.10803, 3.2047499999999998, 0.2106585, 0.17644899999999999, 3.2047499999999998, 0.2106585, 0.2106585, 3.2047499999999998, 0.0054015000000000044,
-    0.2106585, 3.2047499999999998, 0.0054015000000000044, 0.0054015000000000053, 3.2047499999999998, 0.2106585, 0.0054015000000000053, 3.2047499999999998, 0.2106585,
-    0.039611, 3.2047499999999998, 0.2106585, 0.10803, 3.2047499999999998, 0.2106585, 0.17644899999999999, 3.2047499999999998, 0.2106585, 0.2106585,
-    3.2047499999999998, 0.0054015000000000044, 0.2106585, 3.2047499999999998, 0.0054015000000000044, 0.0054015000000000053, 3.4183999999999997, 0.2106585,
-    0.0054015000000000053, 3.4183999999999997, 0.2106585, 0.039611, 3.4183999999999997, 0.2106585, 0.10803, 3.4183999999999997, 0.2106585, 0.17644899999999999,
-    3.4183999999999997, 0.2106585, 0.2106585, 3.4183999999999997, 0.0054015000000000044, 0.2106585, 3.4183999999999997, 0.0054015000000000044, 0.0054015000000000053,
-    3.4183999999999997, 0.2106585, 0.0054015000000000053, 3.4183999999999997, 0.2106585, 0.039611, 3.4183999999999997, 0.2106585, 0.10803, 3.4183999999999997,
-    0.2106585, 0.17644899999999999, 3.4183999999999997, 0.2106585, 0.2106585, 3.4183999999999997, 0.0054015000000000044, 0.2106585, 3.4183999999999997,
-    0.0054015000000000044, 0.0054015000000000053, 3.6320499999999996, 0.2106585, 0.0054015000000000053, 3.6320499999999996, 0.2106585, 0.039611, 3.6320499999999996,
-    0.2106585, 0.10803, 3.6320499999999996, 0.2106585, 0.17644899999999999, 3.6320499999999996, 0.2106585, 0.2106585, 3.6320499999999996, 0.0054015000000000044,
-    0.2106585, 3.6320499999999996, 0.0054015000000000044, 0.0054015000000000053, 3.6320499999999996, 0.2106585, 0.0054015000000000053, 3.6320499999999996, 0.2106585,
-    0.039611, 3.6320499999999996, 0.2106585, 0.10803, 3.6320499999999996, 0.2106585, 0.17644899999999999, 3.6320499999999996, 0.2106585, 0.2106585,
-    3.6320499999999996, 0.0054015000000000044, 0.2106585, 3.6320499999999996, 0.0054015000000000044, 0.0054015000000000053, 3.8456999999999995, 0.2106585,
-    0.0054015000000000053, 3.8456999999999995, 0.2106585, 0.039611, 3.8456999999999995, 0.2106585, 0.10803, 3.8456999999999995, 0.2106585, 0.17644899999999999,
-    3.8456999999999995, 0.2106585, 0.2106585, 3.8456999999999995, 0.0054015000000000044, 0.2106585, 3.8456999999999995, 0.0054015000000000044, 0.0054015000000000053,
-    3.8456999999999995, 0.2106585, 0.0054015000000000053, 3.8456999999999995, 0.2106585, 0.039611, 3.8456999999999995, 0.2106585, 0.10803, 3.8456999999999995,
-    0.2106585, 0.17644899999999999, 3.8456999999999995, 0.2106585, 0.2106585, 3.8456999999999995, 0.0054015000000000044, 0.2106585, 3.8456999999999995,
-    0.0054015000000000044, 0.0054015000000000053, 4.0593499999999993, 0.2106585, 0.0054015000000000053, 4.0593499999999993, 0.2106585, 0.039611, 4.0593499999999993,
-    0.2106585, 0.10803, 4.0593499999999993, 0.2106585, 0.17644899999999999, 4.0593499999999993, 0.2106585, 0.2106585, 4.0593499999999993, 0.0054015000000000044,
-    0.2106585, 4.0593499999999993, 0.0054015000000000044, 0.0054015000000000053,
-    4.0593499999999993, 0.2106585, 0.0054015000000000053, 4.0593499999999993, 0.2106585, 0.039611, 4.0593499999999993, 0.2106585, 0.10803, 4.0593499999999993,
-    0.2106585, 0.17644899999999999, 4.0593499999999993, 0.2106585, 0.2106585, 4.0593499999999993, 0.0054015000000000044, 0.2106585, 4.0593499999999993,
-    0.0054015000000000044, 0.0054015000000000053, 4.2729999999999997, 0.2106585, 0.0054015000000000053, 4.2729999999999997, 0.2106585, 0.039611, 4.2729999999999997,
-    0.2106585, 0.10803, 4.2729999999999997, 0.2106585, 0.17644899999999999, 4.2729999999999997, 0.2106585, 0.2106585, 4.2729999999999997, 0.0054015000000000044,
-    0.2106585, 4.2729999999999997, 0.24197569714517145, 0.025915697145171439, 0, 0.26483839536511933, 0.025915697145171439, 0, 0.26483839536511933,
-    0.048778395365119298, 0, 0.24197569714517145, 0.048778395365119298, 0, 0.24197569714517145, 0.025915697145171439, 0.21364999999999998, 0.26483839536511933,
-    0.025915697145171439, 0.21364999999999998, 0.26483839536511933, 0.048778395365119298, 0.21364999999999998, 0.24197569714517145, 0.048778395365119298,
-    0.21364999999999998, 0.24197569714517145, 0.025915697145171439, 0.21364999999999998, 0.26483839536511933, 0.025915697145171439, 0.21364999999999998,
-    0.26483839536511933, 0.048778395365119298, 0.21364999999999998, 0.24197569714517145, 0.048778395365119298, 0.21364999999999998, 0.24197569714517145,
-    0.025915697145171439, 0.42729999999999996, 0.26483839536511933, 0.025915697145171439, 0.42729999999999996, 0.26483839536511933, 0.048778395365119298,
-    0.42729999999999996, 0.24197569714517145, 0.048778395365119298, 0.42729999999999996, 0.24197569714517145, 0.025915697145171439, 0.42729999999999996,
-    0.26483839536511933, 0.025915697145171439, 0.42729999999999996, 0.26483839536511933, 0.048778395365119298, 0.42729999999999996, 0.24197569714517145,
-    0.048778395365119298, 0.42729999999999996, 0.24197569714517145, 0.025915697145171439, 0.64094999999999991, 0.26483839536511933, 0.025915697145171439,
-    0.64094999999999991, 0.26483839536511933, 0.048778395365119298, 0.64094999999999991, 0.24197569714517145, 0.048778395365119298, 0.64094999999999991,
-    0.24197569714517145, 0.025915697145171439, 0.64094999999999991, 0.26483839536511933, 0.025915697145171439, 0.64094999999999991, 0.26483839536511933,
-    0.048778395365119298, 0.64094999999999991, 0.24197569714517145, 0.048778395365119298, 0.64094999999999991, 0.24197569714517145, 0.025915697145171439,
-    0.85459999999999992, 0.26483839536511933, 0.025915697145171439, 0.85459999999999992, 0.26483839536511933, 0.048778395365119298, 0.85459999999999992,
-    0.24197569714517145, 0.048778395365119298, 0.85459999999999992, 0.24197569714517145, 0.025915697145171439, 0.85459999999999992, 0.26483839536511933,
-    0.025915697145171439, 0.85459999999999992, 0.26483839536511933, 0.048778395365119298, 0.85459999999999992, 0.24197569714517145, 0.048778395365119298,
-    0.85459999999999992, 0.24197569714517145, 0.025915697145171439, 1.0682499999999999, 0.26483839536511933, 0.025915697145171439, 1.0682499999999999,
-    0.26483839536511933, 0.048778395365119298, 1.0682499999999999, 0.24197569714517145, 0.048778395365119298, 1.0682499999999999, 0.24197569714517145,
-    0.025915697145171439, 1.0682499999999999, 0.26483839536511933, 0.025915697145171439, 1.0682499999999999, 0.26483839536511933, 0.048778395365119298,
-    1.0682499999999999, 0.24197569714517145, 0.048778395365119298, 1.0682499999999999, 0.24197569714517145, 0.025915697145171439, 1.2818999999999998,
-    0.26483839536511933, 0.025915697145171439, 1.2818999999999998, 0.26483839536511933, 0.048778395365119298, 1.2818999999999998, 0.24197569714517145,
-    0.048778395365119298, 1.2818999999999998, 0.24197569714517145, 0.025915697145171439, 1.2818999999999998, 0.26483839536511933, 0.025915697145171439,
-    1.2818999999999998, 0.26483839536511933, 0.048778395365119298, 1.2818999999999998, 0.24197569714517145, 0.048778395365119298, 1.2818999999999998,
-    0.24197569714517145, 0.025915697145171439, 1.4955499999999999, 0.26483839536511933,0.025915697145171439, 1.4955499999999999, 0.26483839536511933,
-    0.048778395365119298, 1.4955499999999999, 0.24197569714517145, 0.048778395365119298,
-    1.4955499999999999, 0.24197569714517145, 0.025915697145171439, 1.4955499999999999, 0.26483839536511933, 0.025915697145171439, 1.4955499999999999,
-    0.26483839536511933, 0.048778395365119298, 1.4955499999999999, 0.24197569714517145, 0.048778395365119298, 1.4955499999999999, 0.24197569714517145,
-    0.025915697145171439, 1.7091999999999998, 0.26483839536511933, 0.025915697145171439, 1.7091999999999998, 0.26483839536511933, 0.048778395365119298,
-    1.7091999999999998, 0.24197569714517145, 0.048778395365119298, 1.7091999999999998, 0.24197569714517145, 0.025915697145171439, 1.7091999999999998,
-    0.26483839536511933, 0.025915697145171439, 1.7091999999999998, 0.26483839536511933, 0.048778395365119298, 1.7091999999999998, 0.24197569714517145,
-    0.048778395365119298, 1.7091999999999998, 0.24197569714517145, 0.025915697145171439, 1.9228499999999997, 0.26483839536511933, 0.025915697145171439,
-    1.9228499999999997, 0.26483839536511933, 0.048778395365119298, 1.9228499999999997, 0.24197569714517145, 0.048778395365119298, 1.9228499999999997,
-    0.24197569714517145, 0.025915697145171439, 1.9228499999999997, 0.26483839536511933, 0.025915697145171439, 1.9228499999999997, 0.26483839536511933,
-    0.048778395365119298, 1.9228499999999997, 0.24197569714517145, 0.048778395365119298, 1.9228499999999997, 0.24197569714517145, 0.025915697145171439,
-    2.1364999999999998, 0.26483839536511933, 0.025915697145171439, 2.1364999999999998, 0.26483839536511933, 0.048778395365119298, 2.1364999999999998,
-    0.24197569714517145, 0.048778395365119298, 2.1364999999999998, 0.24197569714517145, 0.025915697145171439, 2.1364999999999998, 0.26483839536511933,
-    0.025915697145171439, 2.1364999999999998, 0.26483839536511933, 0.048778395365119298, 2.1364999999999998, 0.24197569714517145, 0.048778395365119298,
-    2.1364999999999998, 0.24197569714517145, 0.025915697145171439, 2.3501499999999997, 0.26483839536511933, 0.025915697145171439, 2.3501499999999997,
-    0.26483839536511933, 0.048778395365119298, 2.3501499999999997, 0.24197569714517145, 0.048778395365119298, 2.3501499999999997, 0.24197569714517145,
-    0.025915697145171439, 2.3501499999999997, 0.26483839536511933, 0.025915697145171439, 2.3501499999999997, 0.26483839536511933, 0.048778395365119298,
-    2.3501499999999997, 0.24197569714517145, 0.048778395365119298, 2.3501499999999997, 0.24197569714517145, 0.025915697145171439, 2.5637999999999996,
-    0.26483839536511933, 0.025915697145171439, 2.5637999999999996, 0.26483839536511933, 0.048778395365119298, 2.5637999999999996, 0.24197569714517145,
-    0.048778395365119298, 2.5637999999999996, 0.24197569714517145, 0.025915697145171439, 2.5637999999999996, 0.26483839536511933, 0.025915697145171439,
-    2.5637999999999996, 0.26483839536511933, 0.048778395365119298, 2.5637999999999996, 0.24197569714517145, 0.048778395365119298, 2.5637999999999996,
-    0.24197569714517145, 0.025915697145171439, 2.7774499999999995, 0.26483839536511933, 0.025915697145171439, 2.7774499999999995, 0.26483839536511933,
-    0.048778395365119298, 2.7774499999999995, 0.24197569714517145, 0.048778395365119298, 2.7774499999999995, 0.24197569714517145, 0.025915697145171439,
-    2.7774499999999995, 0.26483839536511933, 0.025915697145171439, 2.7774499999999995, 0.26483839536511933, 0.048778395365119298, 2.7774499999999995,
-    0.24197569714517145, 0.048778395365119298, 2.7774499999999995, 0.24197569714517145, 0.025915697145171439, 2.9910999999999999, 0.26483839536511933,
-    0.025915697145171439, 2.9910999999999999, 0.26483839536511933, 0.048778395365119298, 2.9910999999999999, 0.24197569714517145, 0.048778395365119298,
-    2.9910999999999999, 0.24197569714517145, 0.025915697145171439, 2.9910999999999999, 0.26483839536511933, 0.025915697145171439, 2.9910999999999999,
-    0.26483839536511933, 0.048778395365119298, 2.9910999999999999, 0.24197569714517145, 0.048778395365119298, 2.9910999999999999, 0.24197569714517145,
-    0.025915697145171439, 3.2047499999999998, 0.26483839536511933, 0.025915697145171439, 3.2047499999999998, 0.26483839536511933, 0.048778395365119298,
-    3.2047499999999998, 0.24197569714517145, 0.048778395365119298, 3.2047499999999998,
-    0.24197569714517145, 0.025915697145171439, 3.2047499999999998, 0.26483839536511933, 0.025915697145171439, 3.2047499999999998, 0.26483839536511933,
-    0.048778395365119298, 3.2047499999999998, 0.24197569714517145, 0.048778395365119298, 3.2047499999999998, 0.24197569714517145, 0.025915697145171439,
-    3.4183999999999997, 0.26483839536511933, 0.025915697145171439, 3.4183999999999997, 0.26483839536511933, 0.048778395365119298, 3.4183999999999997,
-    0.24197569714517145, 0.048778395365119298, 3.4183999999999997, 0.24197569714517145, 0.025915697145171439, 3.4183999999999997, 0.26483839536511933,
-    0.025915697145171439, 3.4183999999999997, 0.26483839536511933, 0.048778395365119298, 3.4183999999999997, 0.24197569714517145, 0.048778395365119298,
-    3.4183999999999997, 0.24197569714517145, 0.025915697145171439, 3.6320499999999996, 0.26483839536511933, 0.025915697145171439, 3.6320499999999996,
-    0.26483839536511933, 0.048778395365119298, 3.6320499999999996, 0.24197569714517145, 0.048778395365119298, 3.6320499999999996, 0.24197569714517145,
-    0.025915697145171439, 3.6320499999999996, 0.26483839536511933, 0.025915697145171439, 3.6320499999999996, 0.26483839536511933, 0.048778395365119298,
-    3.6320499999999996, 0.24197569714517145, 0.048778395365119298, 3.6320499999999996, 0.24197569714517145, 0.025915697145171439, 3.8456999999999995,
-    0.26483839536511933, 0.025915697145171439, 3.8456999999999995, 0.26483839536511933, 0.048778395365119298, 3.8456999999999995, 0.24197569714517145,
-    0.048778395365119298, 3.8456999999999995, 0.24197569714517145, 0.025915697145171439, 3.8456999999999995, 0.26483839536511933, 0.025915697145171439,
-    3.8456999999999995, 0.26483839536511933, 0.048778395365119298, 3.8456999999999995, 0.24197569714517145, 0.048778395365119298, 3.8456999999999995,
-    0.24197569714517145, 0.025915697145171439, 4.0593499999999993, 0.26483839536511933, 0.025915697145171439, 4.0593499999999993, 0.26483839536511933,
-    0.048778395365119298, 4.0593499999999993, 0.24197569714517145, 0.048778395365119298, 4.0593499999999993, 0.24197569714517145, 0.025915697145171439,
-    4.0593499999999993, 0.26483839536511933, 0.025915697145171439, 4.0593499999999993, 0.26483839536511933, 0.048778395365119298, 4.0593499999999993,
-    0.24197569714517145, 0.048778395365119298, 4.0593499999999993, 0.24197569714517145, 0.025915697145171439, 4.2729999999999997, 0.26483839536511933,
-    0.025915697145171439, 4.2729999999999997, 0.26483839536511933, 0.048778395365119298, 4.2729999999999997, 0.24197569714517145, 0.048778395365119298,
-    4.2729999999999997, 0.31132160463488068, 0.029625802317440348, 0, 0.3368583953651193, 0.029625802317440348, 0, 0.3368583953651193, 0.046104302854828562, 0,
-    0.31132160463488068, 0.046104302854828562, 0, 0.31132160463488068, 0.029625802317440348, 0.21364999999999998, 0.3368583953651193, 0.029625802317440348,
-    0.21364999999999998, 0.3368583953651193, 0.046104302854828562, 0.21364999999999998, 0.31132160463488068, 0.046104302854828562, 0.21364999999999998,
-    0.31132160463488068, 0.029625802317440348, 0.21364999999999998, 0.3368583953651193, 0.029625802317440348, 0.21364999999999998, 0.3368583953651193,
-    0.046104302854828562, 0.21364999999999998, 0.31132160463488068, 0.046104302854828562, 0.21364999999999998, 0.31132160463488068, 0.029625802317440348,
-    0.42729999999999996, 0.3368583953651193, 0.029625802317440348, 0.42729999999999996, 0.3368583953651193, 0.046104302854828562, 0.42729999999999996,
-    0.31132160463488068, 0.046104302854828562, 0.42729999999999996, 0.31132160463488068, 0.029625802317440348, 0.42729999999999996, 0.3368583953651193,
-    0.029625802317440348, 0.42729999999999996, 0.3368583953651193, 0.046104302854828562, 0.42729999999999996, 0.31132160463488068, 0.046104302854828562,
-    0.42729999999999996, 0.31132160463488068, 0.029625802317440348, 0.64094999999999991, 0.3368583953651193, 0.029625802317440348, 0.64094999999999991,
-    0.3368583953651193, 0.046104302854828562, 0.64094999999999991, 0.31132160463488068, 0.046104302854828562, 0.64094999999999991, 0.31132160463488068,
-    0.029625802317440348, 0.64094999999999991, 0.3368583953651193, 0.029625802317440348, 0.64094999999999991, 0.3368583953651193, 0.046104302854828562,
-    0.64094999999999991, 0.31132160463488068, 0.046104302854828562, 0.64094999999999991, 0.31132160463488068, 0.029625802317440348, 0.85459999999999992,
-    0.3368583953651193, 0.029625802317440348, 0.85459999999999992, 0.3368583953651193, 0.046104302854828562, 0.85459999999999992, 0.31132160463488068,
-    0.046104302854828562, 0.85459999999999992, 0.31132160463488068, 0.029625802317440348, 0.85459999999999992, 0.3368583953651193, 0.029625802317440348,
-    0.85459999999999992, 0.3368583953651193, 0.046104302854828562, 0.85459999999999992, 0.31132160463488068, 0.046104302854828562, 0.85459999999999992,
-    0.31132160463488068, 0.029625802317440348, 1.0682499999999999, 0.3368583953651193, 0.029625802317440348, 1.0682499999999999, 0.3368583953651193,
-    0.046104302854828562, 1.0682499999999999, 0.31132160463488068, 0.046104302854828562, 1.0682499999999999, 0.31132160463488068, 0.029625802317440348,
-    1.0682499999999999, 0.3368583953651193, 0.029625802317440348, 1.0682499999999999, 0.3368583953651193, 0.046104302854828562, 1.0682499999999999,
-    0.31132160463488068, 0.046104302854828562, 1.0682499999999999, 0.31132160463488068, 0.029625802317440348, 1.2818999999999998, 0.3368583953651193,
-    0.029625802317440348, 1.2818999999999998, 0.3368583953651193, 0.046104302854828562, 1.2818999999999998, 0.31132160463488068, 0.046104302854828562,
-    1.2818999999999998, 0.31132160463488068, 0.029625802317440348, 1.2818999999999998, 0.3368583953651193, 0.029625802317440348, 1.2818999999999998,
-    0.3368583953651193, 0.046104302854828562, 1.2818999999999998, 0.31132160463488068, 0.046104302854828562, 1.2818999999999998, 0.31132160463488068,
-    0.029625802317440348, 1.4955499999999999, 0.3368583953651193, 0.029625802317440348, 1.4955499999999999, 0.3368583953651193, 0.046104302854828562,
-    1.4955499999999999, 0.31132160463488068, 0.046104302854828562, 1.4955499999999999, 0.31132160463488068, 0.029625802317440348, 1.4955499999999999,
-    0.3368583953651193, 0.029625802317440348, 1.4955499999999999, 0.3368583953651193, 0.046104302854828562, 1.4955499999999999, 0.31132160463488068,
-    0.046104302854828562, 1.4955499999999999, 0.31132160463488068, 0.029625802317440348, 1.7091999999999998, 0.3368583953651193, 0.029625802317440348,
-    1.7091999999999998, 0.3368583953651193, 0.046104302854828562, 1.7091999999999998, 0.31132160463488068, 0.046104302854828562, 1.7091999999999998,
-    0.31132160463488068, 0.029625802317440348, 1.7091999999999998, 0.3368583953651193, 0.029625802317440348, 1.7091999999999998, 0.3368583953651193,
-    0.046104302854828562, 1.7091999999999998, 0.31132160463488068, 0.046104302854828562, 1.7091999999999998, 0.31132160463488068, 0.029625802317440348,
-    1.9228499999999997, 0.3368583953651193, 0.029625802317440348, 1.9228499999999997, 0.3368583953651193, 0.046104302854828562, 1.9228499999999997,
-    0.31132160463488068, 0.046104302854828562, 1.9228499999999997, 0.31132160463488068, 0.029625802317440348, 1.9228499999999997, 0.3368583953651193,
-    0.029625802317440348, 1.9228499999999997, 0.3368583953651193, 0.046104302854828562, 1.9228499999999997, 0.31132160463488068, 0.046104302854828562,
-    1.9228499999999997, 0.31132160463488068, 0.029625802317440348, 2.1364999999999998, 0.3368583953651193, 0.029625802317440348, 2.1364999999999998,
-    0.3368583953651193, 0.046104302854828562, 2.1364999999999998, 0.31132160463488068, 0.046104302854828562, 2.1364999999999998, 0.31132160463488068,
-    0.029625802317440348, 2.1364999999999998, 0.3368583953651193, 0.029625802317440348, 2.1364999999999998, 0.3368583953651193, 0.046104302854828562,
-    2.1364999999999998, 0.31132160463488068, 0.046104302854828562, 2.1364999999999998, 0.31132160463488068, 0.029625802317440348, 2.3501499999999997,
-    0.3368583953651193, 0.029625802317440348, 2.3501499999999997, 0.3368583953651193, 0.046104302854828562, 2.3501499999999997, 0.31132160463488068,
-    0.046104302854828562, 2.3501499999999997, 0.31132160463488068, 0.029625802317440348, 2.3501499999999997, 0.3368583953651193, 0.029625802317440348,
-    2.3501499999999997, 0.3368583953651193, 0.046104302854828562, 2.3501499999999997, 0.31132160463488068, 0.046104302854828562, 2.3501499999999997,
-    0.31132160463488068, 0.029625802317440348, 2.5637999999999996, 0.3368583953651193,
-    0.029625802317440348, 2.5637999999999996, 0.3368583953651193, 0.046104302854828562, 2.5637999999999996, 0.31132160463488068, 0.046104302854828562,
-    2.5637999999999996, 0.31132160463488068, 0.029625802317440348, 2.5637999999999996, 0.3368583953651193, 0.029625802317440348, 2.5637999999999996,
-    0.3368583953651193, 0.046104302854828562, 2.5637999999999996, 0.31132160463488068, 0.046104302854828562, 2.5637999999999996, 0.31132160463488068,
-    0.029625802317440348, 2.7774499999999995, 0.3368583953651193, 0.029625802317440348, 2.7774499999999995, 0.3368583953651193, 0.046104302854828562,
-    2.7774499999999995, 0.31132160463488068, 0.046104302854828562, 2.7774499999999995, 0.31132160463488068, 0.029625802317440348, 2.7774499999999995,
-    0.3368583953651193, 0.029625802317440348, 2.7774499999999995, 0.3368583953651193, 0.046104302854828562, 2.7774499999999995, 0.31132160463488068,
-    0.046104302854828562, 2.7774499999999995, 0.31132160463488068, 0.029625802317440348, 2.9910999999999999, 0.3368583953651193, 0.029625802317440348,
-    2.9910999999999999, 0.3368583953651193, 0.046104302854828562, 2.9910999999999999, 0.31132160463488068, 0.046104302854828562, 2.9910999999999999,
-    0.31132160463488068, 0.029625802317440348, 2.9910999999999999, 0.3368583953651193, 0.029625802317440348, 2.9910999999999999, 0.3368583953651193,
-    0.046104302854828562, 2.9910999999999999, 0.31132160463488068, 0.046104302854828562, 2.9910999999999999, 0.31132160463488068, 0.029625802317440348,
-    3.2047499999999998, 0.3368583953651193, 0.029625802317440348, 3.2047499999999998, 0.3368583953651193, 0.046104302854828562, 3.2047499999999998,
-    0.31132160463488068, 0.046104302854828562, 3.2047499999999998, 0.31132160463488068, 0.029625802317440348, 3.2047499999999998, 0.3368583953651193,
-    0.029625802317440348, 3.2047499999999998, 0.3368583953651193, 0.046104302854828562, 3.2047499999999998, 0.31132160463488068, 0.046104302854828562,
-    3.2047499999999998, 0.31132160463488068, 0.029625802317440348, 3.4183999999999997, 0.3368583953651193, 0.029625802317440348, 3.4183999999999997,
-    0.3368583953651193, 0.046104302854828562, 3.4183999999999997, 0.31132160463488068, 0.046104302854828562, 3.4183999999999997, 0.31132160463488068,
-    0.029625802317440348, 3.4183999999999997, 0.3368583953651193, 0.029625802317440348, 3.4183999999999997, 0.3368583953651193, 0.046104302854828562,
-    3.4183999999999997, 0.31132160463488068, 0.046104302854828562, 3.4183999999999997, 0.31132160463488068, 0.029625802317440348, 3.6320499999999996,
-    0.3368583953651193, 0.029625802317440348, 3.6320499999999996, 0.3368583953651193, 0.046104302854828562, 3.6320499999999996, 0.31132160463488068,
-    0.046104302854828562, 3.6320499999999996, 0.31132160463488068, 0.029625802317440348, 3.6320499999999996, 0.3368583953651193, 0.029625802317440348,
-    3.6320499999999996, 0.3368583953651193, 0.046104302854828562, 3.6320499999999996, 0.31132160463488068, 0.046104302854828562, 3.6320499999999996,
-    0.31132160463488068, 0.029625802317440348, 3.8456999999999995, 0.3368583953651193, 0.029625802317440348, 3.8456999999999995, 0.3368583953651193,
-    0.046104302854828562, 3.8456999999999995, 0.31132160463488068, 0.046104302854828562, 3.8456999999999995, 0.31132160463488068, 0.029625802317440348,
-    3.8456999999999995, 0.3368583953651193, 0.029625802317440348, 3.8456999999999995, 0.3368583953651193, 0.046104302854828562, 3.8456999999999995,
-    0.31132160463488068, 0.046104302854828562, 3.8456999999999995, 0.31132160463488068, 0.029625802317440348, 4.0593499999999993, 0.3368583953651193,
-    0.029625802317440348, 4.0593499999999993, 0.3368583953651193, 0.046104302854828562, 4.0593499999999993, 0.31132160463488068, 0.046104302854828562,
-    4.0593499999999993, 0.31132160463488068, 0.029625802317440348, 4.0593499999999993, 0.3368583953651193, 0.029625802317440348, 4.0593499999999993,
-    0.3368583953651193, 0.046104302854828562, 4.0593499999999993, 0.31132160463488068, 0.046104302854828562, 4.0593499999999993, 0.31132160463488068,
-    0.029625802317440348, 4.2729999999999997, 0.3368583953651193, 0.029625802317440348, 4.2729999999999997, 0.3368583953651193, 0.046104302854828562,
-    4.2729999999999997, 0.31132160463488068, 0.046104302854828562, 4.2729999999999997,
-    0.38334160463488065, 0.025915697145171453, 0, 0.40620430285482856, 0.025915697145171453, 0, 0.40620430285482856, 0.048778395365119291, 0,
-    0.38334160463488065, 0.048778395365119291, 0, 0.38334160463488065, 0.025915697145171453, 0.21364999999999998, 0.40620430285482856, 0.025915697145171453,
-    0.21364999999999998, 0.40620430285482856, 0.048778395365119291, 0.21364999999999998, 0.38334160463488065, 0.048778395365119291, 0.21364999999999998,
-    0.38334160463488065, 0.025915697145171453, 0.21364999999999998, 0.40620430285482856, 0.025915697145171453, 0.21364999999999998, 0.40620430285482856,
-    0.048778395365119291, 0.21364999999999998, 0.38334160463488065, 0.048778395365119291, 0.21364999999999998, 0.38334160463488065, 0.025915697145171453,
-    0.42729999999999996, 0.40620430285482856, 0.025915697145171453, 0.42729999999999996, 0.40620430285482856, 0.048778395365119291, 0.42729999999999996,
-    0.38334160463488065, 0.048778395365119291, 0.42729999999999996, 0.38334160463488065, 0.025915697145171453, 0.42729999999999996, 0.40620430285482856,
-    0.025915697145171453, 0.42729999999999996, 0.40620430285482856, 0.048778395365119291, 0.42729999999999996, 0.38334160463488065, 0.048778395365119291,
-    0.42729999999999996, 0.38334160463488065, 0.025915697145171453, 0.64094999999999991, 0.40620430285482856, 0.025915697145171453, 0.64094999999999991,
-    0.40620430285482856, 0.048778395365119291, 0.64094999999999991, 0.38334160463488065, 0.048778395365119291, 0.64094999999999991, 0.38334160463488065,
-    0.025915697145171453, 0.64094999999999991, 0.40620430285482856, 0.025915697145171453, 0.64094999999999991, 0.40620430285482856, 0.048778395365119291,
-    0.64094999999999991, 0.38334160463488065, 0.048778395365119291, 0.64094999999999991, 0.38334160463488065, 0.025915697145171453, 0.85459999999999992,
-    0.40620430285482856, 0.025915697145171453, 0.85459999999999992, 0.40620430285482856, 0.048778395365119291, 0.85459999999999992, 0.38334160463488065,
-    0.048778395365119291, 0.85459999999999992, 0.38334160463488065, 0.025915697145171453, 0.85459999999999992, 0.40620430285482856, 0.025915697145171453,
-    0.85459999999999992, 0.40620430285482856, 0.048778395365119291, 0.85459999999999992, 0.38334160463488065, 0.048778395365119291, 0.85459999999999992,
-    0.38334160463488065, 0.025915697145171453, 1.0682499999999999, 0.40620430285482856, 0.025915697145171453, 1.0682499999999999, 0.40620430285482856,
-    0.048778395365119291, 1.0682499999999999, 0.38334160463488065, 0.048778395365119291, 1.0682499999999999, 0.38334160463488065, 0.025915697145171453,
-    1.0682499999999999, 0.40620430285482856, 0.025915697145171453, 1.0682499999999999, 0.40620430285482856, 0.048778395365119291, 1.0682499999999999,
-    0.38334160463488065, 0.048778395365119291, 1.0682499999999999, 0.38334160463488065, 0.025915697145171453, 1.2818999999999998, 0.40620430285482856,
-    0.025915697145171453, 1.2818999999999998, 0.40620430285482856, 0.048778395365119291, 1.2818999999999998, 0.38334160463488065, 0.048778395365119291,
-    1.2818999999999998, 0.38334160463488065, 0.025915697145171453, 1.2818999999999998, 0.40620430285482856, 0.025915697145171453, 1.2818999999999998,
-    0.40620430285482856, 0.048778395365119291, 1.2818999999999998, 0.38334160463488065, 0.048778395365119291, 1.2818999999999998, 0.38334160463488065,
-    0.025915697145171453, 1.4955499999999999, 0.40620430285482856, 0.025915697145171453, 1.4955499999999999, 0.40620430285482856, 0.048778395365119291,
-    1.4955499999999999, 0.38334160463488065, 0.048778395365119291, 1.4955499999999999, 0.38334160463488065, 0.025915697145171453, 1.4955499999999999,
-    0.40620430285482856, 0.025915697145171453, 1.4955499999999999, 0.40620430285482856, 0.048778395365119291, 1.4955499999999999, 0.38334160463488065,
-    0.048778395365119291, 1.4955499999999999, 0.38334160463488065, 0.025915697145171453, 1.7091999999999998, 0.40620430285482856, 0.025915697145171453,
-    1.7091999999999998, 0.40620430285482856, 0.048778395365119291, 1.7091999999999998, 0.38334160463488065, 0.048778395365119291, 1.7091999999999998,
-    0.38334160463488065, 0.025915697145171453, 1.7091999999999998, 0.40620430285482856, 0.025915697145171453, 1.7091999999999998, 0.40620430285482856,
-    0.048778395365119291,
-    1.7091999999999998, 0.38334160463488065, 0.048778395365119291, 1.7091999999999998, 0.38334160463488065, 0.025915697145171453, 1.9228499999999997,
-    0.40620430285482856, 0.025915697145171453, 1.9228499999999997, 0.40620430285482856, 0.048778395365119291, 1.9228499999999997, 0.38334160463488065,
-    0.048778395365119291, 1.9228499999999997, 0.38334160463488065, 0.025915697145171453, 1.9228499999999997, 0.40620430285482856, 0.025915697145171453,
-    1.9228499999999997, 0.40620430285482856, 0.048778395365119291, 1.9228499999999997, 0.38334160463488065, 0.048778395365119291, 1.9228499999999997,
-    0.38334160463488065, 0.025915697145171453, 2.1364999999999998, 0.40620430285482856, 0.025915697145171453, 2.1364999999999998, 0.40620430285482856,
-    0.048778395365119291, 2.1364999999999998, 0.38334160463488065, 0.048778395365119291, 2.1364999999999998, 0.38334160463488065, 0.025915697145171453,
-    2.1364999999999998, 0.40620430285482856, 0.025915697145171453, 2.1364999999999998, 0.40620430285482856, 0.048778395365119291, 2.1364999999999998,
-    0.38334160463488065, 0.048778395365119291, 2.1364999999999998, 0.38334160463488065, 0.025915697145171453, 2.3501499999999997, 0.40620430285482856,
-    0.025915697145171453, 2.3501499999999997, 0.40620430285482856, 0.048778395365119291, 2.3501499999999997, 0.38334160463488065, 0.048778395365119291,
-    2.3501499999999997, 0.38334160463488065, 0.025915697145171453, 2.3501499999999997, 0.40620430285482856, 0.025915697145171453, 2.3501499999999997,
-    0.40620430285482856, 0.048778395365119291, 2.3501499999999997, 0.38334160463488065, 0.048778395365119291, 2.3501499999999997, 0.38334160463488065,
-    0.025915697145171453, 2.5637999999999996, 0.40620430285482856, 0.025915697145171453, 2.5637999999999996, 0.40620430285482856, 0.048778395365119291,
-    2.5637999999999996, 0.38334160463488065, 0.048778395365119291, 2.5637999999999996, 0.38334160463488065, 0.025915697145171453, 2.5637999999999996,
-    0.40620430285482856, 0.025915697145171453, 2.5637999999999996, 0.40620430285482856, 0.048778395365119291, 2.5637999999999996, 0.38334160463488065,
-    0.048778395365119291, 2.5637999999999996, 0.38334160463488065, 0.025915697145171453, 2.7774499999999995, 0.40620430285482856, 0.025915697145171453,
-    2.7774499999999995, 0.40620430285482856, 0.048778395365119291, 2.7774499999999995, 0.38334160463488065, 0.048778395365119291, 2.7774499999999995,
-    0.38334160463488065, 0.025915697145171453, 2.7774499999999995, 0.40620430285482856, 0.025915697145171453, 2.7774499999999995, 0.40620430285482856,
-    0.048778395365119291, 2.7774499999999995, 0.38334160463488065, 0.048778395365119291, 2.7774499999999995, 0.38334160463488065, 0.025915697145171453,
-    2.9910999999999999, 0.40620430285482856, 0.025915697145171453, 2.9910999999999999, 0.40620430285482856, 0.048778395365119291, 2.9910999999999999,
-    0.38334160463488065, 0.048778395365119291, 2.9910999999999999, 0.38334160463488065, 0.025915697145171453, 2.9910999999999999, 0.40620430285482856,
-    0.025915697145171453, 2.9910999999999999, 0.40620430285482856, 0.048778395365119291, 2.9910999999999999, 0.38334160463488065, 0.048778395365119291,
-    2.9910999999999999, 0.38334160463488065, 0.025915697145171453, 3.2047499999999998, 0.40620430285482856, 0.025915697145171453, 3.2047499999999998,
-    0.40620430285482856, 0.048778395365119291, 3.2047499999999998, 0.38334160463488065, 0.048778395365119291, 3.2047499999999998, 0.38334160463488065,
-    0.025915697145171453, 3.2047499999999998, 0.40620430285482856, 0.025915697145171453, 3.2047499999999998, 0.40620430285482856, 0.048778395365119291,
-    3.2047499999999998, 0.38334160463488065, 0.048778395365119291, 3.2047499999999998, 0.38334160463488065, 0.025915697145171453, 3.4183999999999997,
-    0.40620430285482856, 0.025915697145171453, 3.4183999999999997, 0.40620430285482856, 0.048778395365119291, 3.4183999999999997, 0.38334160463488065,
-    0.048778395365119291, 3.4183999999999997, 0.38334160463488065, 0.025915697145171453, 3.4183999999999997, 0.40620430285482856, 0.025915697145171453,
-    3.4183999999999997, 0.40620430285482856, 0.048778395365119291, 3.4183999999999997, 0.38334160463488065, 0.048778395365119291, 3.4183999999999997,
-    0.38334160463488065, 0.025915697145171453, 3.6320499999999996, 0.40620430285482856,
-    0.025915697145171453, 3.6320499999999996, 0.40620430285482856, 0.048778395365119291, 3.6320499999999996, 0.38334160463488065, 0.048778395365119291,
-    3.6320499999999996, 0.38334160463488065, 0.025915697145171453, 3.6320499999999996, 0.40620430285482856, 0.025915697145171453, 3.6320499999999996,
-    0.40620430285482856, 0.048778395365119291, 3.6320499999999996, 0.38334160463488065, 0.048778395365119291, 3.6320499999999996, 0.38334160463488065,
-    0.025915697145171453, 3.8456999999999995, 0.40620430285482856, 0.025915697145171453, 3.8456999999999995, 0.40620430285482856, 0.048778395365119291,
-    3.8456999999999995, 0.38334160463488065, 0.048778395365119291, 3.8456999999999995, 0.38334160463488065, 0.025915697145171453, 3.8456999999999995,
-    0.40620430285482856, 0.025915697145171453, 3.8456999999999995, 0.40620430285482856, 0.048778395365119291, 3.8456999999999995, 0.38334160463488065,
-    0.048778395365119291, 3.8456999999999995, 0.38334160463488065, 0.025915697145171453, 4.0593499999999993, 0.40620430285482856, 0.025915697145171453,
-    4.0593499999999993, 0.40620430285482856, 0.048778395365119291, 4.0593499999999993, 0.38334160463488065, 0.048778395365119291, 4.0593499999999993,
-    0.38334160463488065, 0.025915697145171453, 4.0593499999999993, 0.40620430285482856, 0.025915697145171453, 4.0593499999999993, 0.40620430285482856,
-    0.048778395365119291, 4.0593499999999993, 0.38334160463488065, 0.048778395365119291, 4.0593499999999993, 0.38334160463488065, 0.025915697145171453,
-    4.2729999999999997, 0.40620430285482856, 0.025915697145171453, 4.2729999999999997, 0.40620430285482856, 0.048778395365119291, 4.2729999999999997,
-    0.38334160463488065, 0.048778395365119291, 4.2729999999999997, 0.24568580231744036, 0.095261604634880703, 0, 0.26216430285482856, 0.095261604634880703, 0,
-    0.26216430285482856, 0.1207983953651193, 0, 0.24568580231744036, 0.1207983953651193, 0, 0.24568580231744036, 0.095261604634880703, 0.21364999999999998,
-    0.26216430285482856, 0.095261604634880703, 0.21364999999999998, 0.26216430285482856, 0.1207983953651193, 0.21364999999999998, 0.24568580231744036,
-    0.1207983953651193, 0.21364999999999998, 0.24568580231744036, 0.095261604634880703, 0.21364999999999998, 0.26216430285482856, 0.095261604634880703,
-    0.21364999999999998, 0.26216430285482856, 0.1207983953651193, 0.21364999999999998, 0.24568580231744036, 0.1207983953651193, 0.21364999999999998,
-    0.24568580231744036, 0.095261604634880703, 0.42729999999999996, 0.26216430285482856, 0.095261604634880703, 0.42729999999999996, 0.26216430285482856,
-    0.1207983953651193, 0.42729999999999996, 0.24568580231744036, 0.1207983953651193, 0.42729999999999996, 0.24568580231744036, 0.095261604634880703,
-    0.42729999999999996, 0.26216430285482856, 0.095261604634880703, 0.42729999999999996, 0.26216430285482856, 0.1207983953651193, 0.42729999999999996,
-    0.24568580231744036, 0.1207983953651193, 0.42729999999999996, 0.24568580231744036, 0.095261604634880703, 0.64094999999999991, 0.26216430285482856,
-    0.095261604634880703, 0.64094999999999991, 0.26216430285482856, 0.1207983953651193, 0.64094999999999991, 0.24568580231744036, 0.1207983953651193,
-    0.64094999999999991, 0.24568580231744036, 0.095261604634880703, 0.64094999999999991, 0.26216430285482856, 0.095261604634880703, 0.64094999999999991,
-    0.26216430285482856, 0.1207983953651193, 0.64094999999999991, 0.24568580231744036, 0.1207983953651193, 0.64094999999999991, 0.24568580231744036,
-    0.095261604634880703, 0.85459999999999992, 0.26216430285482856, 0.095261604634880703, 0.85459999999999992, 0.26216430285482856, 0.1207983953651193,
-    0.85459999999999992, 0.24568580231744036, 0.1207983953651193, 0.85459999999999992, 0.24568580231744036, 0.095261604634880703, 0.85459999999999992,
-    0.26216430285482856, 0.095261604634880703, 0.85459999999999992, 0.26216430285482856, 0.1207983953651193, 0.85459999999999992, 0.24568580231744036,
-    0.1207983953651193, 0.85459999999999992, 0.24568580231744036, 0.095261604634880703, 1.0682499999999999, 0.26216430285482856, 0.095261604634880703,
-    1.0682499999999999, 0.26216430285482856, 0.1207983953651193, 1.0682499999999999, 0.24568580231744036, 0.1207983953651193, 1.0682499999999999,
-    0.24568580231744036, 0.095261604634880703, 1.0682499999999999, 0.26216430285482856, 0.095261604634880703, 1.0682499999999999, 0.26216430285482856,
-    0.1207983953651193, 1.0682499999999999, 0.24568580231744036, 0.1207983953651193, 1.0682499999999999, 0.24568580231744036, 0.095261604634880703,
-    1.2818999999999998, 0.26216430285482856, 0.095261604634880703, 1.2818999999999998, 0.26216430285482856, 0.1207983953651193, 1.2818999999999998,
-    0.24568580231744036, 0.1207983953651193, 1.2818999999999998, 0.24568580231744036, 0.095261604634880703, 1.2818999999999998, 0.26216430285482856,
-    0.095261604634880703, 1.2818999999999998, 0.26216430285482856, 0.1207983953651193, 1.2818999999999998, 0.24568580231744036, 0.1207983953651193,
-    1.2818999999999998, 0.24568580231744036, 0.095261604634880703, 1.4955499999999999, 0.26216430285482856, 0.095261604634880703, 1.4955499999999999,
-    0.26216430285482856, 0.1207983953651193, 1.4955499999999999, 0.24568580231744036, 0.1207983953651193, 1.4955499999999999, 0.24568580231744036,
-    0.095261604634880703, 1.4955499999999999, 0.26216430285482856, 0.095261604634880703, 1.4955499999999999, 0.26216430285482856, 0.1207983953651193,
-    1.4955499999999999, 0.24568580231744036, 0.1207983953651193, 1.4955499999999999, 0.24568580231744036, 0.095261604634880703, 1.7091999999999998,
-    0.26216430285482856, 0.095261604634880703, 1.7091999999999998, 0.26216430285482856, 0.1207983953651193, 1.7091999999999998, 0.24568580231744036,
-    0.1207983953651193, 1.7091999999999998, 0.24568580231744036, 0.095261604634880703, 1.7091999999999998, 0.26216430285482856, 0.095261604634880703,
-    1.7091999999999998, 0.26216430285482856, 0.1207983953651193, 1.7091999999999998, 0.24568580231744036, 0.1207983953651193, 1.7091999999999998,
-    0.24568580231744036, 0.095261604634880703, 1.9228499999999997, 0.26216430285482856, 0.095261604634880703, 1.9228499999999997, 0.26216430285482856,
-    0.1207983953651193, 1.9228499999999997, 0.24568580231744036, 0.1207983953651193, 1.9228499999999997, 0.24568580231744036, 0.095261604634880703,
-    1.9228499999999997, 0.26216430285482856, 0.095261604634880703, 1.9228499999999997, 0.26216430285482856, 0.1207983953651193, 1.9228499999999997,
-    0.24568580231744036, 0.1207983953651193, 1.9228499999999997, 0.24568580231744036, 0.095261604634880703, 2.1364999999999998, 0.26216430285482856,
-    0.095261604634880703, 2.1364999999999998, 0.26216430285482856, 0.1207983953651193, 2.1364999999999998, 0.24568580231744036, 0.1207983953651193,
-    2.1364999999999998, 0.24568580231744036, 0.095261604634880703, 2.1364999999999998, 0.26216430285482856, 0.095261604634880703, 2.1364999999999998,
-    0.26216430285482856, 0.1207983953651193, 2.1364999999999998, 0.24568580231744036, 0.1207983953651193, 2.1364999999999998, 0.24568580231744036,
-    0.095261604634880703, 2.3501499999999997, 0.26216430285482856, 0.095261604634880703, 2.3501499999999997, 0.26216430285482856, 0.1207983953651193,
-    2.3501499999999997, 0.24568580231744036, 0.1207983953651193, 2.3501499999999997, 0.24568580231744036, 0.095261604634880703, 2.3501499999999997,
-    0.26216430285482856, 0.095261604634880703, 2.3501499999999997, 0.26216430285482856, 0.1207983953651193, 2.3501499999999997, 0.24568580231744036,
-    0.1207983953651193, 2.3501499999999997, 0.24568580231744036, 0.095261604634880703, 2.5637999999999996, 0.26216430285482856, 0.095261604634880703,
-    2.5637999999999996, 0.26216430285482856, 0.1207983953651193, 2.5637999999999996, 0.24568580231744036, 0.1207983953651193, 2.5637999999999996,
-    0.24568580231744036, 0.095261604634880703, 2.5637999999999996, 0.26216430285482856, 0.095261604634880703, 2.5637999999999996, 0.26216430285482856,
-    0.1207983953651193, 2.5637999999999996, 0.24568580231744036, 0.1207983953651193, 2.5637999999999996, 0.24568580231744036, 0.095261604634880703,
-    2.7774499999999995, 0.26216430285482856, 0.095261604634880703, 2.7774499999999995, 0.26216430285482856, 0.1207983953651193, 2.7774499999999995,
-    0.24568580231744036, 0.1207983953651193, 2.7774499999999995, 0.24568580231744036, 0.095261604634880703, 2.7774499999999995, 0.26216430285482856,
-    0.095261604634880703, 2.7774499999999995, 0.26216430285482856, 0.1207983953651193,
-    2.7774499999999995, 0.24568580231744036, 0.1207983953651193, 2.7774499999999995, 0.24568580231744036, 0.095261604634880703, 2.9910999999999999,
-    0.26216430285482856, 0.095261604634880703, 2.9910999999999999, 0.26216430285482856, 0.1207983953651193, 2.9910999999999999, 0.24568580231744036,
-    0.1207983953651193, 2.9910999999999999, 0.24568580231744036, 0.095261604634880703, 2.9910999999999999, 0.26216430285482856, 0.095261604634880703,
-    2.9910999999999999, 0.26216430285482856, 0.1207983953651193, 2.9910999999999999, 0.24568580231744036, 0.1207983953651193, 2.9910999999999999,
-    0.24568580231744036, 0.095261604634880703, 3.2047499999999998, 0.26216430285482856, 0.095261604634880703, 3.2047499999999998, 0.26216430285482856,
-    0.1207983953651193, 3.2047499999999998, 0.24568580231744036, 0.1207983953651193, 3.2047499999999998, 0.24568580231744036, 0.095261604634880703,
-    3.2047499999999998, 0.26216430285482856, 0.095261604634880703, 3.2047499999999998, 0.26216430285482856, 0.1207983953651193, 3.2047499999999998,
-    0.24568580231744036, 0.1207983953651193, 3.2047499999999998, 0.24568580231744036, 0.095261604634880703, 3.4183999999999997, 0.26216430285482856,
-    0.095261604634880703, 3.4183999999999997, 0.26216430285482856, 0.1207983953651193, 3.4183999999999997, 0.24568580231744036, 0.1207983953651193,
-    3.4183999999999997, 0.24568580231744036, 0.095261604634880703, 3.4183999999999997, 0.26216430285482856, 0.095261604634880703, 3.4183999999999997,
-    0.26216430285482856, 0.1207983953651193, 3.4183999999999997, 0.24568580231744036, 0.1207983953651193, 3.4183999999999997, 0.24568580231744036,
-    0.095261604634880703, 3.6320499999999996, 0.26216430285482856, 0.095261604634880703, 3.6320499999999996, 0.26216430285482856, 0.1207983953651193,
-    3.6320499999999996, 0.24568580231744036, 0.1207983953651193, 3.6320499999999996, 0.24568580231744036, 0.095261604634880703, 3.6320499999999996,
-    0.26216430285482856, 0.095261604634880703, 3.6320499999999996, 0.26216430285482856, 0.1207983953651193, 3.6320499999999996, 0.24568580231744036,
-    0.1207983953651193, 3.6320499999999996, 0.24568580231744036, 0.095261604634880703, 3.8456999999999995, 0.26216430285482856, 0.095261604634880703,
-    3.8456999999999995, 0.26216430285482856, 0.1207983953651193, 3.8456999999999995, 0.24568580231744036, 0.1207983953651193, 3.8456999999999995,
-    0.24568580231744036, 0.095261604634880703, 3.8456999999999995, 0.26216430285482856, 0.095261604634880703, 3.8456999999999995, 0.26216430285482856,
-    0.1207983953651193, 3.8456999999999995, 0.24568580231744036, 0.1207983953651193, 3.8456999999999995, 0.24568580231744036, 0.095261604634880703,
-    4.0593499999999993, 0.26216430285482856, 0.095261604634880703, 4.0593499999999993, 0.26216430285482856, 0.1207983953651193, 4.0593499999999993,
-    0.24568580231744036, 0.1207983953651193, 4.0593499999999993, 0.24568580231744036, 0.095261604634880703, 4.0593499999999993, 0.26216430285482856,
-    0.095261604634880703, 4.0593499999999993, 0.26216430285482856, 0.1207983953651193, 4.0593499999999993, 0.24568580231744036, 0.1207983953651193,
-    4.0593499999999993, 0.24568580231744036, 0.095261604634880703, 4.2729999999999997, 0.26216430285482856, 0.095261604634880703, 4.2729999999999997,
-    0.26216430285482856, 0.1207983953651193, 4.2729999999999997, 0.24568580231744036, 0.1207983953651193, 4.2729999999999997, 0.31399569714517145,
-    0.097935697145171446, 0, 0.33418430285482853, 0.097935697145171446, 0, 0.33418430285482853, 0.11812430285482856, 0, 0.31399569714517145, 0.11812430285482856, 0,
-    0.31399569714517145, 0.097935697145171446, 0.21364999999999998, 0.33418430285482853, 0.097935697145171446, 0.21364999999999998, 0.33418430285482853,
-    0.11812430285482856, 0.21364999999999998, 0.31399569714517145, 0.11812430285482856, 0.21364999999999998, 0.31399569714517145, 0.097935697145171446,
-    0.21364999999999998, 0.33418430285482853, 0.097935697145171446, 0.21364999999999998, 0.33418430285482853, 0.11812430285482856, 0.21364999999999998,
-    0.31399569714517145, 0.11812430285482856, 0.21364999999999998, 0.31399569714517145, 0.097935697145171446, 0.42729999999999996, 0.33418430285482853,
-    0.097935697145171446, 0.42729999999999996, 0.33418430285482853, 0.11812430285482856, 0.42729999999999996, 0.31399569714517145, 0.11812430285482856,
-    0.42729999999999996, 0.31399569714517145, 0.097935697145171446, 0.42729999999999996, 0.33418430285482853, 0.097935697145171446, 0.42729999999999996,
-    0.33418430285482853, 0.11812430285482856, 0.42729999999999996, 0.31399569714517145, 0.11812430285482856, 0.42729999999999996, 0.31399569714517145,
-    0.097935697145171446, 0.64094999999999991, 0.33418430285482853, 0.097935697145171446, 0.64094999999999991, 0.33418430285482853, 0.11812430285482856,
-    0.64094999999999991, 0.31399569714517145, 0.11812430285482856, 0.64094999999999991, 0.31399569714517145, 0.097935697145171446, 0.64094999999999991,
-    0.33418430285482853, 0.097935697145171446, 0.64094999999999991, 0.33418430285482853, 0.11812430285482856, 0.64094999999999991, 0.31399569714517145,
-    0.11812430285482856, 0.64094999999999991, 0.31399569714517145, 0.097935697145171446, 0.85459999999999992, 0.33418430285482853, 0.097935697145171446,
-    0.85459999999999992, 0.33418430285482853, 0.11812430285482856, 0.85459999999999992, 0.31399569714517145, 0.11812430285482856, 0.85459999999999992,
-    0.31399569714517145, 0.097935697145171446, 0.85459999999999992, 0.33418430285482853, 0.097935697145171446, 0.85459999999999992, 0.33418430285482853,
-    0.11812430285482856, 0.85459999999999992, 0.31399569714517145, 0.11812430285482856, 0.85459999999999992, 0.31399569714517145, 0.097935697145171446,
-    1.0682499999999999, 0.33418430285482853, 0.097935697145171446, 1.0682499999999999, 0.33418430285482853, 0.11812430285482856, 1.0682499999999999,
-    0.31399569714517145, 0.11812430285482856, 1.0682499999999999, 0.31399569714517145, 0.097935697145171446, 1.0682499999999999, 0.33418430285482853,
-    0.097935697145171446, 1.0682499999999999, 0.33418430285482853, 0.11812430285482856, 1.0682499999999999, 0.31399569714517145, 0.11812430285482856,
-    1.0682499999999999, 0.31399569714517145, 0.097935697145171446, 1.2818999999999998, 0.33418430285482853, 0.097935697145171446, 1.2818999999999998,
-    0.33418430285482853, 0.11812430285482856, 1.2818999999999998, 0.31399569714517145, 0.11812430285482856, 1.2818999999999998, 0.31399569714517145,
-    0.097935697145171446, 1.2818999999999998, 0.33418430285482853, 0.097935697145171446, 1.2818999999999998, 0.33418430285482853, 0.11812430285482856,
-    1.2818999999999998, 0.31399569714517145, 0.11812430285482856, 1.2818999999999998, 0.31399569714517145, 0.097935697145171446, 1.4955499999999999,
-    0.33418430285482853, 0.097935697145171446, 1.4955499999999999, 0.33418430285482853, 0.11812430285482856, 1.4955499999999999, 0.31399569714517145,
-    0.11812430285482856, 1.4955499999999999, 0.31399569714517145, 0.097935697145171446, 1.4955499999999999, 0.33418430285482853, 0.097935697145171446,
-    1.4955499999999999, 0.33418430285482853, 0.11812430285482856, 1.4955499999999999, 0.31399569714517145, 0.11812430285482856, 1.4955499999999999,
-    0.31399569714517145, 0.097935697145171446, 1.7091999999999998, 0.33418430285482853, 0.097935697145171446, 1.7091999999999998, 0.33418430285482853,
-    0.11812430285482856, 1.7091999999999998, 0.31399569714517145, 0.11812430285482856, 1.7091999999999998, 0.31399569714517145, 0.097935697145171446,
-    1.7091999999999998, 0.33418430285482853, 0.097935697145171446, 1.7091999999999998, 0.33418430285482853, 0.11812430285482856, 1.7091999999999998,
-    0.31399569714517145, 0.11812430285482856, 1.7091999999999998, 0.31399569714517145, 0.097935697145171446, 1.9228499999999997, 0.33418430285482853,
-    0.097935697145171446, 1.9228499999999997, 0.33418430285482853, 0.11812430285482856, 1.9228499999999997, 0.31399569714517145, 0.11812430285482856,
-    1.9228499999999997, 0.31399569714517145, 0.097935697145171446, 1.9228499999999997, 0.33418430285482853, 0.097935697145171446, 1.9228499999999997,
-    0.33418430285482853, 0.11812430285482856, 1.9228499999999997, 0.31399569714517145, 0.11812430285482856, 1.9228499999999997, 0.31399569714517145,
-    0.097935697145171446, 2.1364999999999998, 0.33418430285482853, 0.097935697145171446, 2.1364999999999998, 0.33418430285482853, 0.11812430285482856,
-    2.1364999999999998, 0.31399569714517145, 0.11812430285482856, 2.1364999999999998,
-    0.31399569714517145, 0.097935697145171446, 2.1364999999999998, 0.33418430285482853, 0.097935697145171446, 2.1364999999999998, 0.33418430285482853,
-    0.11812430285482856, 2.1364999999999998, 0.31399569714517145, 0.11812430285482856, 2.1364999999999998, 0.31399569714517145, 0.097935697145171446,
-    2.3501499999999997, 0.33418430285482853, 0.097935697145171446, 2.3501499999999997, 0.33418430285482853, 0.11812430285482856, 2.3501499999999997,
-    0.31399569714517145, 0.11812430285482856, 2.3501499999999997, 0.31399569714517145, 0.097935697145171446, 2.3501499999999997, 0.33418430285482853,
-    0.097935697145171446, 2.3501499999999997, 0.33418430285482853, 0.11812430285482856, 2.3501499999999997, 0.31399569714517145, 0.11812430285482856,
-    2.3501499999999997, 0.31399569714517145, 0.097935697145171446, 2.5637999999999996, 0.33418430285482853, 0.097935697145171446, 2.5637999999999996,
-    0.33418430285482853, 0.11812430285482856, 2.5637999999999996, 0.31399569714517145, 0.11812430285482856, 2.5637999999999996, 0.31399569714517145,
-    0.097935697145171446, 2.5637999999999996, 0.33418430285482853, 0.097935697145171446, 2.5637999999999996, 0.33418430285482853, 0.11812430285482856,
-    2.5637999999999996, 0.31399569714517145, 0.11812430285482856, 2.5637999999999996, 0.31399569714517145, 0.097935697145171446, 2.7774499999999995,
-    0.33418430285482853, 0.097935697145171446, 2.7774499999999995, 0.33418430285482853, 0.11812430285482856, 2.7774499999999995, 0.31399569714517145,
-    0.11812430285482856, 2.7774499999999995, 0.31399569714517145, 0.097935697145171446, 2.7774499999999995, 0.33418430285482853, 0.097935697145171446,
-    2.7774499999999995, 0.33418430285482853, 0.11812430285482856, 2.7774499999999995, 0.31399569714517145, 0.11812430285482856, 2.7774499999999995,
-    0.31399569714517145, 0.097935697145171446, 2.9910999999999999, 0.33418430285482853, 0.097935697145171446, 2.9910999999999999, 0.33418430285482853,
-    0.11812430285482856, 2.9910999999999999, 0.31399569714517145, 0.11812430285482856, 2.9910999999999999, 0.31399569714517145, 0.097935697145171446,
-    2.9910999999999999, 0.33418430285482853, 0.097935697145171446, 2.9910999999999999, 0.33418430285482853, 0.11812430285482856, 2.9910999999999999,
-    0.31399569714517145, 0.11812430285482856, 2.9910999999999999, 0.31399569714517145, 0.097935697145171446, 3.2047499999999998, 0.33418430285482853,
-    0.097935697145171446, 3.2047499999999998, 0.33418430285482853, 0.11812430285482856, 3.2047499999999998, 0.31399569714517145, 0.11812430285482856,
-    3.2047499999999998, 0.31399569714517145, 0.097935697145171446, 3.2047499999999998, 0.33418430285482853, 0.097935697145171446, 3.2047499999999998,
-    0.33418430285482853, 0.11812430285482856, 3.2047499999999998, 0.31399569714517145, 0.11812430285482856, 3.2047499999999998, 0.31399569714517145,
-    0.097935697145171446, 3.4183999999999997, 0.33418430285482853, 0.097935697145171446, 3.4183999999999997, 0.33418430285482853, 0.11812430285482856,
-    3.4183999999999997, 0.31399569714517145, 0.11812430285482856, 3.4183999999999997, 0.31399569714517145, 0.097935697145171446, 3.4183999999999997,
-    0.33418430285482853, 0.097935697145171446, 3.4183999999999997, 0.33418430285482853, 0.11812430285482856, 3.4183999999999997, 0.31399569714517145,
-    0.11812430285482856, 3.4183999999999997, 0.31399569714517145, 0.097935697145171446, 3.6320499999999996, 0.33418430285482853, 0.097935697145171446,
-    3.6320499999999996, 0.33418430285482853, 0.11812430285482856, 3.6320499999999996, 0.31399569714517145, 0.11812430285482856, 3.6320499999999996,
-    0.31399569714517145, 0.097935697145171446, 3.6320499999999996, 0.33418430285482853, 0.097935697145171446, 3.6320499999999996, 0.33418430285482853,
-    0.11812430285482856, 3.6320499999999996, 0.31399569714517145, 0.11812430285482856, 3.6320499999999996, 0.31399569714517145, 0.097935697145171446,
-    3.8456999999999995, 0.33418430285482853, 0.097935697145171446, 3.8456999999999995, 0.33418430285482853, 0.11812430285482856, 3.8456999999999995,
-    0.31399569714517145, 0.11812430285482856, 3.8456999999999995, 0.31399569714517145, 0.097935697145171446, 3.8456999999999995, 0.33418430285482853,
-    0.097935697145171446, 3.8456999999999995, 0.33418430285482853, 0.11812430285482856,
-    3.8456999999999995, 0.31399569714517145, 0.11812430285482856, 3.8456999999999995, 0.31399569714517145, 0.097935697145171446, 4.0593499999999993,
-    0.33418430285482853, 0.097935697145171446, 4.0593499999999993, 0.33418430285482853, 0.11812430285482856, 4.0593499999999993, 0.31399569714517145,
-    0.11812430285482856, 4.0593499999999993, 0.31399569714517145, 0.097935697145171446, 4.0593499999999993, 0.33418430285482853, 0.097935697145171446,
-    4.0593499999999993, 0.33418430285482853, 0.11812430285482856, 4.0593499999999993, 0.31399569714517145, 0.11812430285482856, 4.0593499999999993,
-    0.31399569714517145, 0.097935697145171446, 4.2729999999999997, 0.33418430285482853, 0.097935697145171446, 4.2729999999999997, 0.33418430285482853,
-    0.11812430285482856, 4.2729999999999997, 0.31399569714517145, 0.11812430285482856, 4.2729999999999997, 0.38601569714517142, 0.095261604634880703, 0,
-    0.40249419768255962, 0.095261604634880703, 0, 0.40249419768255962, 0.1207983953651193, 0, 0.38601569714517142, 0.1207983953651193, 0, 0.38601569714517142,
-    0.095261604634880703, 0.21364999999999998, 0.40249419768255962, 0.095261604634880703, 0.21364999999999998, 0.40249419768255962, 0.1207983953651193,
-    0.21364999999999998, 0.38601569714517142, 0.1207983953651193, 0.21364999999999998, 0.38601569714517142, 0.095261604634880703, 0.21364999999999998,
-    0.40249419768255962, 0.095261604634880703, 0.21364999999999998, 0.40249419768255962, 0.1207983953651193, 0.21364999999999998, 0.38601569714517142,
-    0.1207983953651193, 0.21364999999999998, 0.38601569714517142, 0.095261604634880703, 0.42729999999999996, 0.40249419768255962, 0.095261604634880703,
-    0.42729999999999996, 0.40249419768255962, 0.1207983953651193, 0.42729999999999996, 0.38601569714517142, 0.1207983953651193, 0.42729999999999996,
-    0.38601569714517142, 0.095261604634880703, 0.42729999999999996, 0.40249419768255962, 0.095261604634880703, 0.42729999999999996, 0.40249419768255962,
-    0.1207983953651193, 0.42729999999999996, 0.38601569714517142, 0.1207983953651193, 0.42729999999999996, 0.38601569714517142, 0.095261604634880703,
-    0.64094999999999991, 0.40249419768255962, 0.095261604634880703, 0.64094999999999991, 0.40249419768255962, 0.1207983953651193, 0.64094999999999991,
-    0.38601569714517142, 0.1207983953651193, 0.64094999999999991, 0.38601569714517142, 0.095261604634880703, 0.64094999999999991, 0.40249419768255962,
-    0.095261604634880703, 0.64094999999999991, 0.40249419768255962, 0.1207983953651193, 0.64094999999999991, 0.38601569714517142, 0.1207983953651193,
-    0.64094999999999991, 0.38601569714517142, 0.095261604634880703, 0.85459999999999992, 0.40249419768255962, 0.095261604634880703, 0.85459999999999992,
-    0.40249419768255962, 0.1207983953651193, 0.85459999999999992, 0.38601569714517142, 0.1207983953651193, 0.85459999999999992, 0.38601569714517142,
-    0.095261604634880703, 0.85459999999999992, 0.40249419768255962, 0.095261604634880703, 0.85459999999999992, 0.40249419768255962, 0.1207983953651193,
-    0.85459999999999992, 0.38601569714517142, 0.1207983953651193, 0.85459999999999992, 0.38601569714517142, 0.095261604634880703, 1.0682499999999999,
-    0.40249419768255962, 0.095261604634880703, 1.0682499999999999, 0.40249419768255962, 0.1207983953651193, 1.0682499999999999, 0.38601569714517142,
-    0.1207983953651193, 1.0682499999999999, 0.38601569714517142, 0.095261604634880703, 1.0682499999999999, 0.40249419768255962, 0.095261604634880703,
-    1.0682499999999999, 0.40249419768255962, 0.1207983953651193, 1.0682499999999999, 0.38601569714517142, 0.1207983953651193, 1.0682499999999999,
-    0.38601569714517142, 0.095261604634880703, 1.2818999999999998, 0.40249419768255962, 0.095261604634880703, 1.2818999999999998, 0.40249419768255962,
-    0.1207983953651193, 1.2818999999999998, 0.38601569714517142, 0.1207983953651193, 1.2818999999999998, 0.38601569714517142, 0.095261604634880703,
-    1.2818999999999998, 0.40249419768255962, 0.095261604634880703, 1.2818999999999998, 0.40249419768255962, 0.1207983953651193, 1.2818999999999998,
-    0.38601569714517142, 0.1207983953651193, 1.2818999999999998, 0.38601569714517142, 0.095261604634880703, 1.4955499999999999, 0.40249419768255962,
-    0.095261604634880703, 1.4955499999999999, 0.40249419768255962, 0.1207983953651193, 1.4955499999999999, 0.38601569714517142, 0.1207983953651193,
-    1.4955499999999999, 0.38601569714517142, 0.095261604634880703, 1.4955499999999999, 0.40249419768255962, 0.095261604634880703, 1.4955499999999999,
-    0.40249419768255962, 0.1207983953651193, 1.4955499999999999, 0.38601569714517142, 0.1207983953651193, 1.4955499999999999, 0.38601569714517142,
-    0.095261604634880703, 1.7091999999999998, 0.40249419768255962, 0.095261604634880703, 1.7091999999999998, 0.40249419768255962, 0.1207983953651193,
-    1.7091999999999998, 0.38601569714517142, 0.1207983953651193, 1.7091999999999998, 0.38601569714517142, 0.095261604634880703, 1.7091999999999998,
-    0.40249419768255962, 0.095261604634880703, 1.7091999999999998, 0.40249419768255962, 0.1207983953651193, 1.7091999999999998, 0.38601569714517142,
-    0.1207983953651193, 1.7091999999999998, 0.38601569714517142, 0.095261604634880703, 1.9228499999999997, 0.40249419768255962, 0.095261604634880703,
-    1.9228499999999997, 0.40249419768255962, 0.1207983953651193, 1.9228499999999997, 0.38601569714517142, 0.1207983953651193, 1.9228499999999997,
-    0.38601569714517142, 0.095261604634880703, 1.9228499999999997, 0.40249419768255962, 0.095261604634880703, 1.9228499999999997, 0.40249419768255962,
-    0.1207983953651193, 1.9228499999999997, 0.38601569714517142, 0.1207983953651193, 1.9228499999999997, 0.38601569714517142, 0.095261604634880703,
-    2.1364999999999998, 0.40249419768255962, 0.095261604634880703, 2.1364999999999998, 0.40249419768255962, 0.1207983953651193, 2.1364999999999998,
-    0.38601569714517142, 0.1207983953651193, 2.1364999999999998, 0.38601569714517142, 0.095261604634880703, 2.1364999999999998, 0.40249419768255962,
-    0.095261604634880703, 2.1364999999999998, 0.40249419768255962, 0.1207983953651193, 2.1364999999999998, 0.38601569714517142, 0.1207983953651193,
-    2.1364999999999998, 0.38601569714517142, 0.095261604634880703, 2.3501499999999997, 0.40249419768255962, 0.095261604634880703, 2.3501499999999997,
-    0.40249419768255962, 0.1207983953651193, 2.3501499999999997, 0.38601569714517142, 0.1207983953651193, 2.3501499999999997, 0.38601569714517142,
-    0.095261604634880703, 2.3501499999999997, 0.40249419768255962, 0.095261604634880703, 2.3501499999999997, 0.40249419768255962, 0.1207983953651193,
-    2.3501499999999997, 0.38601569714517142, 0.1207983953651193, 2.3501499999999997, 0.38601569714517142, 0.095261604634880703, 2.5637999999999996,
-    0.40249419768255962, 0.095261604634880703, 2.5637999999999996, 0.40249419768255962, 0.1207983953651193, 2.5637999999999996, 0.38601569714517142,
-    0.1207983953651193, 2.5637999999999996, 0.38601569714517142, 0.095261604634880703, 2.5637999999999996, 0.40249419768255962, 0.095261604634880703,
-    2.5637999999999996, 0.40249419768255962, 0.1207983953651193, 2.5637999999999996, 0.38601569714517142, 0.1207983953651193, 2.5637999999999996,
-    0.38601569714517142, 0.095261604634880703, 2.7774499999999995, 0.40249419768255962, 0.095261604634880703, 2.7774499999999995, 0.40249419768255962,
-    0.1207983953651193, 2.7774499999999995, 0.38601569714517142, 0.1207983953651193, 2.7774499999999995, 0.38601569714517142, 0.095261604634880703,
-    2.7774499999999995, 0.40249419768255962, 0.095261604634880703, 2.7774499999999995, 0.40249419768255962, 0.1207983953651193, 2.7774499999999995,
-    0.38601569714517142, 0.1207983953651193, 2.7774499999999995, 0.38601569714517142, 0.095261604634880703, 2.9910999999999999, 0.40249419768255962,
-    0.095261604634880703, 2.9910999999999999, 0.40249419768255962, 0.1207983953651193, 2.9910999999999999, 0.38601569714517142, 0.1207983953651193,
-    2.9910999999999999, 0.38601569714517142, 0.095261604634880703, 2.9910999999999999, 0.40249419768255962, 0.095261604634880703, 2.9910999999999999,
-    0.40249419768255962, 0.1207983953651193, 2.9910999999999999, 0.38601569714517142, 0.1207983953651193, 2.9910999999999999, 0.38601569714517142,
-    0.095261604634880703, 3.2047499999999998, 0.40249419768255962, 0.095261604634880703, 3.2047499999999998, 0.40249419768255962, 0.1207983953651193,
-    3.2047499999999998, 0.38601569714517142, 0.1207983953651193, 3.2047499999999998,
-    0.38601569714517142, 0.095261604634880703, 3.2047499999999998, 0.40249419768255962, 0.095261604634880703, 3.2047499999999998, 0.40249419768255962,
-    0.1207983953651193, 3.2047499999999998, 0.38601569714517142, 0.1207983953651193, 3.2047499999999998, 0.38601569714517142, 0.095261604634880703,
-    3.4183999999999997, 0.40249419768255962, 0.095261604634880703, 3.4183999999999997, 0.40249419768255962, 0.1207983953651193, 3.4183999999999997,
-    0.38601569714517142, 0.1207983953651193, 3.4183999999999997, 0.38601569714517142, 0.095261604634880703, 3.4183999999999997, 0.40249419768255962,
-    0.095261604634880703, 3.4183999999999997, 0.40249419768255962, 0.1207983953651193, 3.4183999999999997, 0.38601569714517142, 0.1207983953651193,
-    3.4183999999999997, 0.38601569714517142, 0.095261604634880703, 3.6320499999999996, 0.40249419768255962, 0.095261604634880703, 3.6320499999999996,
-    0.40249419768255962, 0.1207983953651193, 3.6320499999999996, 0.38601569714517142, 0.1207983953651193, 3.6320499999999996, 0.38601569714517142,
-    0.095261604634880703, 3.6320499999999996, 0.40249419768255962, 0.095261604634880703, 3.6320499999999996, 0.40249419768255962, 0.1207983953651193,
-    3.6320499999999996, 0.38601569714517142, 0.1207983953651193, 3.6320499999999996, 0.38601569714517142, 0.095261604634880703, 3.8456999999999995,
-    0.40249419768255962, 0.095261604634880703, 3.8456999999999995, 0.40249419768255962, 0.1207983953651193, 3.8456999999999995, 0.38601569714517142,
-    0.1207983953651193, 3.8456999999999995, 0.38601569714517142, 0.095261604634880703, 3.8456999999999995, 0.40249419768255962, 0.095261604634880703,
-    3.8456999999999995, 0.40249419768255962, 0.1207983953651193, 3.8456999999999995, 0.38601569714517142, 0.1207983953651193, 3.8456999999999995,
-    0.38601569714517142, 0.095261604634880703, 4.0593499999999993, 0.40249419768255962, 0.095261604634880703, 4.0593499999999993, 0.40249419768255962,
-    0.1207983953651193, 4.0593499999999993, 0.38601569714517142, 0.1207983953651193, 4.0593499999999993, 0.38601569714517142, 0.095261604634880703,
-    4.0593499999999993, 0.40249419768255962, 0.095261604634880703, 4.0593499999999993, 0.40249419768255962, 0.1207983953651193, 4.0593499999999993,
-    0.38601569714517142, 0.1207983953651193, 4.0593499999999993, 0.38601569714517142, 0.095261604634880703, 4.2729999999999997, 0.40249419768255962,
-    0.095261604634880703, 4.2729999999999997, 0.40249419768255962, 0.1207983953651193, 4.2729999999999997, 0.38601569714517142, 0.1207983953651193,
-    4.2729999999999997, 0.24197569714517148, 0.16728160463488068, 0, 0.26483839536511933, 0.16728160463488068, 0, 0.26483839536511933, 0.19014430285482856, 0,
-    0.24197569714517148, 0.19014430285482856, 0, 0.24197569714517148, 0.16728160463488068, 0.21364999999999998, 0.26483839536511933, 0.16728160463488068,
-    0.21364999999999998, 0.26483839536511933, 0.19014430285482856, 0.21364999999999998, 0.24197569714517148, 0.19014430285482856, 0.21364999999999998,
-    0.24197569714517148, 0.16728160463488068, 0.21364999999999998, 0.26483839536511933, 0.16728160463488068, 0.21364999999999998, 0.26483839536511933,
-    0.19014430285482856, 0.21364999999999998, 0.24197569714517148, 0.19014430285482856, 0.21364999999999998, 0.24197569714517148, 0.16728160463488068,
-    0.42729999999999996, 0.26483839536511933, 0.16728160463488068, 0.42729999999999996, 0.26483839536511933, 0.19014430285482856, 0.42729999999999996,
-    0.24197569714517148, 0.19014430285482856, 0.42729999999999996, 0.24197569714517148, 0.16728160463488068, 0.42729999999999996, 0.26483839536511933,
-    0.16728160463488068, 0.42729999999999996, 0.26483839536511933, 0.19014430285482856, 0.42729999999999996, 0.24197569714517148, 0.19014430285482856,
-    0.42729999999999996, 0.24197569714517148, 0.16728160463488068, 0.64094999999999991, 0.26483839536511933, 0.16728160463488068, 0.64094999999999991,
-    0.26483839536511933, 0.19014430285482856, 0.64094999999999991, 0.24197569714517148, 0.19014430285482856, 0.64094999999999991, 0.24197569714517148,
-    0.16728160463488068, 0.64094999999999991, 0.26483839536511933, 0.16728160463488068, 0.64094999999999991, 0.26483839536511933, 0.19014430285482856,
-    0.64094999999999991, 0.24197569714517148, 0.19014430285482856, 0.64094999999999991, 0.24197569714517148, 0.16728160463488068, 0.85459999999999992,
-    0.26483839536511933, 0.16728160463488068, 0.85459999999999992, 0.26483839536511933, 0.19014430285482856, 0.85459999999999992, 0.24197569714517148,
-    0.19014430285482856, 0.85459999999999992, 0.24197569714517148, 0.16728160463488068, 0.85459999999999992, 0.26483839536511933, 0.16728160463488068,
-    0.85459999999999992, 0.26483839536511933, 0.19014430285482856, 0.85459999999999992, 0.24197569714517148, 0.19014430285482856, 0.85459999999999992,
-    0.24197569714517148, 0.16728160463488068, 1.0682499999999999, 0.26483839536511933, 0.16728160463488068, 1.0682499999999999, 0.26483839536511933,
-    0.19014430285482856, 1.0682499999999999, 0.24197569714517148, 0.19014430285482856, 1.0682499999999999, 0.24197569714517148, 0.16728160463488068,
-    1.0682499999999999, 0.26483839536511933, 0.16728160463488068, 1.0682499999999999, 0.26483839536511933, 0.19014430285482856, 1.0682499999999999,
-    0.24197569714517148, 0.19014430285482856, 1.0682499999999999, 0.24197569714517148, 0.16728160463488068, 1.2818999999999998, 0.26483839536511933,
-    0.16728160463488068, 1.2818999999999998, 0.26483839536511933, 0.19014430285482856, 1.2818999999999998, 0.24197569714517148, 0.19014430285482856,
-    1.2818999999999998, 0.24197569714517148, 0.16728160463488068, 1.2818999999999998, 0.26483839536511933, 0.16728160463488068, 1.2818999999999998,
-    0.26483839536511933, 0.19014430285482856, 1.2818999999999998, 0.24197569714517148, 0.19014430285482856, 1.2818999999999998, 0.24197569714517148,
-    0.16728160463488068, 1.4955499999999999, 0.26483839536511933, 0.16728160463488068, 1.4955499999999999, 0.26483839536511933, 0.19014430285482856,
-    1.4955499999999999, 0.24197569714517148, 0.19014430285482856, 1.4955499999999999, 0.24197569714517148, 0.16728160463488068, 1.4955499999999999,
-    0.26483839536511933, 0.16728160463488068, 1.4955499999999999, 0.26483839536511933, 0.19014430285482856, 1.4955499999999999, 0.24197569714517148,
-    0.19014430285482856, 1.4955499999999999, 0.24197569714517148, 0.16728160463488068, 1.7091999999999998, 0.26483839536511933, 0.16728160463488068,
-    1.7091999999999998, 0.26483839536511933, 0.19014430285482856, 1.7091999999999998, 0.24197569714517148, 0.19014430285482856, 1.7091999999999998,
-    0.24197569714517148, 0.16728160463488068, 1.7091999999999998, 0.26483839536511933, 0.16728160463488068, 1.7091999999999998, 0.26483839536511933,
-    0.19014430285482856, 1.7091999999999998, 0.24197569714517148, 0.19014430285482856, 1.7091999999999998, 0.24197569714517148, 0.16728160463488068,
-    1.9228499999999997, 0.26483839536511933, 0.16728160463488068, 1.9228499999999997, 0.26483839536511933, 0.19014430285482856, 1.9228499999999997,
-    0.24197569714517148, 0.19014430285482856, 1.9228499999999997, 0.24197569714517148, 0.16728160463488068, 1.9228499999999997, 0.26483839536511933,
-    0.16728160463488068, 1.9228499999999997, 0.26483839536511933, 0.19014430285482856, 1.9228499999999997, 0.24197569714517148, 0.19014430285482856,
-    1.9228499999999997, 0.24197569714517148, 0.16728160463488068, 2.1364999999999998, 0.26483839536511933, 0.16728160463488068, 2.1364999999999998,
-    0.26483839536511933, 0.19014430285482856, 2.1364999999999998, 0.24197569714517148, 0.19014430285482856, 2.1364999999999998, 0.24197569714517148,
-    0.16728160463488068, 2.1364999999999998, 0.26483839536511933, 0.16728160463488068, 2.1364999999999998, 0.26483839536511933, 0.19014430285482856,
-    2.1364999999999998, 0.24197569714517148, 0.19014430285482856, 2.1364999999999998, 0.24197569714517148, 0.16728160463488068, 2.3501499999999997,
-    0.26483839536511933, 0.16728160463488068, 2.3501499999999997, 0.26483839536511933, 0.19014430285482856, 2.3501499999999997, 0.24197569714517148,
-    0.19014430285482856, 2.3501499999999997, 0.24197569714517148, 0.16728160463488068, 2.3501499999999997, 0.26483839536511933, 0.16728160463488068,
-    2.3501499999999997, 0.26483839536511933, 0.19014430285482856, 2.3501499999999997, 0.24197569714517148, 0.19014430285482856, 2.3501499999999997,
-    0.24197569714517148, 0.16728160463488068, 2.5637999999999996, 0.26483839536511933,
-    0.16728160463488068, 2.5637999999999996, 0.26483839536511933, 0.19014430285482856, 2.5637999999999996, 0.24197569714517148, 0.19014430285482856,
-    2.5637999999999996, 0.24197569714517148, 0.16728160463488068, 2.5637999999999996, 0.26483839536511933, 0.16728160463488068, 2.5637999999999996,
-    0.26483839536511933, 0.19014430285482856, 2.5637999999999996, 0.24197569714517148, 0.19014430285482856, 2.5637999999999996, 0.24197569714517148,
-    0.16728160463488068, 2.7774499999999995, 0.26483839536511933, 0.16728160463488068, 2.7774499999999995, 0.26483839536511933, 0.19014430285482856,
-    2.7774499999999995, 0.24197569714517148, 0.19014430285482856, 2.7774499999999995, 0.24197569714517148, 0.16728160463488068, 2.7774499999999995,
-    0.26483839536511933, 0.16728160463488068, 2.7774499999999995, 0.26483839536511933, 0.19014430285482856, 2.7774499999999995, 0.24197569714517148,
-    0.19014430285482856, 2.7774499999999995, 0.24197569714517148, 0.16728160463488068, 2.9910999999999999, 0.26483839536511933, 0.16728160463488068,
-    2.9910999999999999, 0.26483839536511933, 0.19014430285482856, 2.9910999999999999, 0.24197569714517148, 0.19014430285482856, 2.9910999999999999,
-    0.24197569714517148, 0.16728160463488068, 2.9910999999999999, 0.26483839536511933, 0.16728160463488068, 2.9910999999999999, 0.26483839536511933,
-    0.19014430285482856, 2.9910999999999999, 0.24197569714517148, 0.19014430285482856, 2.9910999999999999, 0.24197569714517148, 0.16728160463488068,
-    3.2047499999999998, 0.26483839536511933, 0.16728160463488068, 3.2047499999999998, 0.26483839536511933, 0.19014430285482856, 3.2047499999999998,
-    0.24197569714517148, 0.19014430285482856, 3.2047499999999998, 0.24197569714517148, 0.16728160463488068, 3.2047499999999998, 0.26483839536511933,
-    0.16728160463488068, 3.2047499999999998, 0.26483839536511933, 0.19014430285482856, 3.2047499999999998, 0.24197569714517148, 0.19014430285482856,
-    3.2047499999999998, 0.24197569714517148, 0.16728160463488068, 3.4183999999999997, 0.26483839536511933, 0.16728160463488068, 3.4183999999999997,
-    0.26483839536511933, 0.19014430285482856, 3.4183999999999997, 0.24197569714517148, 0.19014430285482856, 3.4183999999999997, 0.24197569714517148,
-    0.16728160463488068, 3.4183999999999997, 0.26483839536511933, 0.16728160463488068, 3.4183999999999997, 0.26483839536511933, 0.19014430285482856,
-    3.4183999999999997, 0.24197569714517148, 0.19014430285482856, 3.4183999999999997, 0.24197569714517148, 0.16728160463488068, 3.6320499999999996,
-    0.26483839536511933, 0.16728160463488068, 3.6320499999999996, 0.26483839536511933, 0.19014430285482856, 3.6320499999999996, 0.24197569714517148,
-    0.19014430285482856, 3.6320499999999996, 0.24197569714517148, 0.16728160463488068, 3.6320499999999996, 0.26483839536511933, 0.16728160463488068,
-    3.6320499999999996, 0.26483839536511933, 0.19014430285482856, 3.6320499999999996, 0.24197569714517148, 0.19014430285482856, 3.6320499999999996,
-    0.24197569714517148, 0.16728160463488068, 3.8456999999999995, 0.26483839536511933, 0.16728160463488068, 3.8456999999999995, 0.26483839536511933,
-    0.19014430285482856, 3.8456999999999995, 0.24197569714517148, 0.19014430285482856, 3.8456999999999995, 0.24197569714517148, 0.16728160463488068,
-    3.8456999999999995, 0.26483839536511933, 0.16728160463488068, 3.8456999999999995, 0.26483839536511933, 0.19014430285482856, 3.8456999999999995,
-    0.24197569714517148, 0.19014430285482856, 3.8456999999999995, 0.24197569714517148, 0.16728160463488068, 4.0593499999999993, 0.26483839536511933,
-    0.16728160463488068, 4.0593499999999993, 0.26483839536511933, 0.19014430285482856, 4.0593499999999993, 0.24197569714517148, 0.19014430285482856,
-    4.0593499999999993, 0.24197569714517148, 0.16728160463488068, 4.0593499999999993, 0.26483839536511933, 0.16728160463488068, 4.0593499999999993,
-    0.26483839536511933, 0.19014430285482856, 4.0593499999999993, 0.24197569714517148, 0.19014430285482856, 4.0593499999999993, 0.24197569714517148,
-    0.16728160463488068, 4.2729999999999997, 0.26483839536511933, 0.16728160463488068, 4.2729999999999997, 0.26483839536511933, 0.19014430285482856,
-    4.2729999999999997, 0.24197569714517148, 0.19014430285482856, 4.2729999999999997,
-    0.31132160463488068, 0.16995569714517142, 0, 0.3368583953651193, 0.16995569714517142, 0, 0.3368583953651193, 0.18643419768255964, 0, 0.31132160463488068,
-    0.18643419768255964, 0, 0.31132160463488068, 0.16995569714517142, 0.21364999999999998, 0.3368583953651193, 0.16995569714517142, 0.21364999999999998,
-    0.3368583953651193, 0.18643419768255964, 0.21364999999999998, 0.31132160463488068, 0.18643419768255964, 0.21364999999999998, 0.31132160463488068,
-    0.16995569714517142, 0.21364999999999998, 0.3368583953651193, 0.16995569714517142, 0.21364999999999998, 0.3368583953651193, 0.18643419768255964,
-    0.21364999999999998, 0.31132160463488068, 0.18643419768255964, 0.21364999999999998, 0.31132160463488068, 0.16995569714517142, 0.42729999999999996,
-    0.3368583953651193, 0.16995569714517142, 0.42729999999999996, 0.3368583953651193, 0.18643419768255964, 0.42729999999999996, 0.31132160463488068,
-    0.18643419768255964, 0.42729999999999996, 0.31132160463488068, 0.16995569714517142, 0.42729999999999996, 0.3368583953651193, 0.16995569714517142,
-    0.42729999999999996, 0.3368583953651193, 0.18643419768255964, 0.42729999999999996, 0.31132160463488068, 0.18643419768255964, 0.42729999999999996,
-    0.31132160463488068, 0.16995569714517142, 0.64094999999999991, 0.3368583953651193, 0.16995569714517142, 0.64094999999999991, 0.3368583953651193,
-    0.18643419768255964, 0.64094999999999991, 0.31132160463488068, 0.18643419768255964, 0.64094999999999991, 0.31132160463488068, 0.16995569714517142,
-    0.64094999999999991, 0.3368583953651193, 0.16995569714517142, 0.64094999999999991, 0.3368583953651193, 0.18643419768255964, 0.64094999999999991,
-    0.31132160463488068, 0.18643419768255964, 0.64094999999999991, 0.31132160463488068, 0.16995569714517142, 0.85459999999999992, 0.3368583953651193,
-    0.16995569714517142, 0.85459999999999992, 0.3368583953651193, 0.18643419768255964, 0.85459999999999992, 0.31132160463488068, 0.18643419768255964,
-    0.85459999999999992, 0.31132160463488068, 0.16995569714517142, 0.85459999999999992, 0.3368583953651193, 0.16995569714517142, 0.85459999999999992,
-    0.3368583953651193, 0.18643419768255964, 0.85459999999999992, 0.31132160463488068, 0.18643419768255964, 0.85459999999999992, 0.31132160463488068,
-    0.16995569714517142, 1.0682499999999999, 0.3368583953651193, 0.16995569714517142, 1.0682499999999999, 0.3368583953651193, 0.18643419768255964,
-    1.0682499999999999, 0.31132160463488068, 0.18643419768255964, 1.0682499999999999, 0.31132160463488068, 0.16995569714517142, 1.0682499999999999,
-    0.3368583953651193, 0.16995569714517142, 1.0682499999999999, 0.3368583953651193, 0.18643419768255964, 1.0682499999999999, 0.31132160463488068,
-    0.18643419768255964, 1.0682499999999999, 0.31132160463488068, 0.16995569714517142, 1.2818999999999998, 0.3368583953651193, 0.16995569714517142,
-    1.2818999999999998, 0.3368583953651193, 0.18643419768255964, 1.2818999999999998, 0.31132160463488068, 0.18643419768255964, 1.2818999999999998,
-    0.31132160463488068, 0.16995569714517142, 1.2818999999999998, 0.3368583953651193, 0.16995569714517142, 1.2818999999999998, 0.3368583953651193,
-    0.18643419768255964, 1.2818999999999998, 0.31132160463488068, 0.18643419768255964, 1.2818999999999998, 0.31132160463488068, 0.16995569714517142,
-    1.4955499999999999, 0.3368583953651193, 0.16995569714517142, 1.4955499999999999, 0.3368583953651193, 0.18643419768255964, 1.4955499999999999,
-    0.31132160463488068, 0.18643419768255964, 1.4955499999999999, 0.31132160463488068, 0.16995569714517142, 1.4955499999999999, 0.3368583953651193,
-    0.16995569714517142, 1.4955499999999999, 0.3368583953651193, 0.18643419768255964, 1.4955499999999999, 0.31132160463488068, 0.18643419768255964,
-    1.4955499999999999, 0.31132160463488068, 0.16995569714517142, 1.7091999999999998, 0.3368583953651193, 0.16995569714517142, 1.7091999999999998,
-    0.3368583953651193, 0.18643419768255964, 1.7091999999999998, 0.31132160463488068, 0.18643419768255964, 1.7091999999999998, 0.31132160463488068,
-    0.16995569714517142, 1.7091999999999998, 0.3368583953651193, 0.16995569714517142, 1.7091999999999998, 0.3368583953651193, 0.18643419768255964,
-    1.7091999999999998, 0.31132160463488068, 0.18643419768255964, 1.7091999999999998, 0.31132160463488068, 0.16995569714517142, 1.9228499999999997,
-    0.3368583953651193, 0.16995569714517142, 1.9228499999999997, 0.3368583953651193, 0.18643419768255964, 1.9228499999999997, 0.31132160463488068,
-    0.18643419768255964, 1.9228499999999997, 0.31132160463488068, 0.16995569714517142, 1.9228499999999997, 0.3368583953651193, 0.16995569714517142,
-    1.9228499999999997, 0.3368583953651193, 0.18643419768255964, 1.9228499999999997, 0.31132160463488068, 0.18643419768255964, 1.9228499999999997,
-    0.31132160463488068, 0.16995569714517142, 2.1364999999999998, 0.3368583953651193, 0.16995569714517142, 2.1364999999999998, 0.3368583953651193,
-    0.18643419768255964, 2.1364999999999998, 0.31132160463488068, 0.18643419768255964, 2.1364999999999998, 0.31132160463488068, 0.16995569714517142,
-    2.1364999999999998, 0.3368583953651193, 0.16995569714517142, 2.1364999999999998, 0.3368583953651193, 0.18643419768255964, 2.1364999999999998,
-    0.31132160463488068, 0.18643419768255964, 2.1364999999999998, 0.31132160463488068, 0.16995569714517142, 2.3501499999999997, 0.3368583953651193,
-    0.16995569714517142, 2.3501499999999997, 0.3368583953651193, 0.18643419768255964, 2.3501499999999997, 0.31132160463488068, 0.18643419768255964,
-    2.3501499999999997, 0.31132160463488068, 0.16995569714517142, 2.3501499999999997, 0.3368583953651193, 0.16995569714517142, 2.3501499999999997,
-    0.3368583953651193, 0.18643419768255964, 2.3501499999999997, 0.31132160463488068, 0.18643419768255964, 2.3501499999999997, 0.31132160463488068,
-    0.16995569714517142, 2.5637999999999996, 0.3368583953651193, 0.16995569714517142, 2.5637999999999996, 0.3368583953651193, 0.18643419768255964,
-    2.5637999999999996, 0.31132160463488068, 0.18643419768255964, 2.5637999999999996, 0.31132160463488068, 0.16995569714517142, 2.5637999999999996,
-    0.3368583953651193, 0.16995569714517142, 2.5637999999999996, 0.3368583953651193, 0.18643419768255964, 2.5637999999999996, 0.31132160463488068,
-    0.18643419768255964, 2.5637999999999996, 0.31132160463488068, 0.16995569714517142, 2.7774499999999995, 0.3368583953651193, 0.16995569714517142,
-    2.7774499999999995, 0.3368583953651193, 0.18643419768255964, 2.7774499999999995, 0.31132160463488068, 0.18643419768255964, 2.7774499999999995,
-    0.31132160463488068, 0.16995569714517142, 2.7774499999999995, 0.3368583953651193, 0.16995569714517142, 2.7774499999999995, 0.3368583953651193,
-    0.18643419768255964, 2.7774499999999995, 0.31132160463488068, 0.18643419768255964, 2.7774499999999995, 0.31132160463488068, 0.16995569714517142,
-    2.9910999999999999, 0.3368583953651193, 0.16995569714517142, 2.9910999999999999, 0.3368583953651193, 0.18643419768255964, 2.9910999999999999,
-    0.31132160463488068, 0.18643419768255964, 2.9910999999999999, 0.31132160463488068, 0.16995569714517142, 2.9910999999999999, 0.3368583953651193,
-    0.16995569714517142, 2.9910999999999999, 0.3368583953651193, 0.18643419768255964, 2.9910999999999999, 0.31132160463488068, 0.18643419768255964,
-    2.9910999999999999, 0.31132160463488068, 0.16995569714517142, 3.2047499999999998, 0.3368583953651193, 0.16995569714517142, 3.2047499999999998,
-    0.3368583953651193, 0.18643419768255964, 3.2047499999999998, 0.31132160463488068, 0.18643419768255964, 3.2047499999999998, 0.31132160463488068,
-    0.16995569714517142, 3.2047499999999998, 0.3368583953651193, 0.16995569714517142, 3.2047499999999998, 0.3368583953651193, 0.18643419768255964,
-    3.2047499999999998, 0.31132160463488068, 0.18643419768255964, 3.2047499999999998, 0.31132160463488068, 0.16995569714517142, 3.4183999999999997,
-    0.3368583953651193, 0.16995569714517142, 3.4183999999999997, 0.3368583953651193, 0.18643419768255964, 3.4183999999999997, 0.31132160463488068,
-    0.18643419768255964, 3.4183999999999997, 0.31132160463488068, 0.16995569714517142, 3.4183999999999997, 0.3368583953651193, 0.16995569714517142,
-    3.4183999999999997, 0.3368583953651193, 0.18643419768255964, 3.4183999999999997, 0.31132160463488068, 0.18643419768255964, 3.4183999999999997,
-    0.31132160463488068, 0.16995569714517142, 3.6320499999999996, 0.3368583953651193,
-    0.16995569714517142, 3.6320499999999996, 0.3368583953651193, 0.18643419768255964, 3.6320499999999996, 0.31132160463488068, 0.18643419768255964,
-    3.6320499999999996, 0.31132160463488068, 0.16995569714517142, 3.6320499999999996, 0.3368583953651193, 0.16995569714517142, 3.6320499999999996,
-    0.3368583953651193, 0.18643419768255964, 3.6320499999999996, 0.31132160463488068, 0.18643419768255964, 3.6320499999999996, 0.31132160463488068,
-    0.16995569714517142, 3.8456999999999995, 0.3368583953651193, 0.16995569714517142, 3.8456999999999995, 0.3368583953651193, 0.18643419768255964,
-    3.8456999999999995, 0.31132160463488068, 0.18643419768255964, 3.8456999999999995, 0.31132160463488068, 0.16995569714517142, 3.8456999999999995,
-    0.3368583953651193, 0.16995569714517142, 3.8456999999999995, 0.3368583953651193, 0.18643419768255964, 3.8456999999999995, 0.31132160463488068,
-    0.18643419768255964, 3.8456999999999995, 0.31132160463488068, 0.16995569714517142, 4.0593499999999993, 0.3368583953651193, 0.16995569714517142,
-    4.0593499999999993, 0.3368583953651193, 0.18643419768255964, 4.0593499999999993, 0.31132160463488068, 0.18643419768255964, 4.0593499999999993,
-    0.31132160463488068, 0.16995569714517142, 4.0593499999999993, 0.3368583953651193, 0.16995569714517142, 4.0593499999999993, 0.3368583953651193,
-    0.18643419768255964, 4.0593499999999993, 0.31132160463488068, 0.18643419768255964, 4.0593499999999993, 0.31132160463488068, 0.16995569714517142,
-    4.2729999999999997, 0.3368583953651193, 0.16995569714517142, 4.2729999999999997, 0.3368583953651193, 0.18643419768255964, 4.2729999999999997,
-    0.31132160463488068, 0.18643419768255964, 4.2729999999999997, 0.38334160463488065, 0.1672816046348807, 0, 0.40620430285482856, 0.1672816046348807, 0,
-    0.40620430285482856, 0.19014430285482853, 0, 0.38334160463488065, 0.19014430285482853, 0, 0.38334160463488065, 0.1672816046348807, 0.21364999999999998,
-    0.40620430285482856, 0.1672816046348807, 0.21364999999999998, 0.40620430285482856, 0.19014430285482853, 0.21364999999999998, 0.38334160463488065,
-    0.19014430285482853, 0.21364999999999998, 0.38334160463488065, 0.1672816046348807, 0.21364999999999998, 0.40620430285482856, 0.1672816046348807,
-    0.21364999999999998, 0.40620430285482856, 0.19014430285482853, 0.21364999999999998, 0.38334160463488065, 0.19014430285482853, 0.21364999999999998,
-    0.38334160463488065, 0.1672816046348807, 0.42729999999999996, 0.40620430285482856, 0.1672816046348807, 0.42729999999999996, 0.40620430285482856,
-    0.19014430285482853, 0.42729999999999996, 0.38334160463488065, 0.19014430285482853, 0.42729999999999996, 0.38334160463488065, 0.1672816046348807,
-    0.42729999999999996, 0.40620430285482856, 0.1672816046348807, 0.42729999999999996, 0.40620430285482856, 0.19014430285482853, 0.42729999999999996,
-    0.38334160463488065, 0.19014430285482853, 0.42729999999999996, 0.38334160463488065, 0.1672816046348807, 0.64094999999999991, 0.40620430285482856,
-    0.1672816046348807, 0.64094999999999991, 0.40620430285482856, 0.19014430285482853, 0.64094999999999991, 0.38334160463488065, 0.19014430285482853,
-    0.64094999999999991, 0.38334160463488065, 0.1672816046348807, 0.64094999999999991, 0.40620430285482856, 0.1672816046348807, 0.64094999999999991,
-    0.40620430285482856, 0.19014430285482853, 0.64094999999999991, 0.38334160463488065, 0.19014430285482853, 0.64094999999999991, 0.38334160463488065,
-    0.1672816046348807, 0.85459999999999992, 0.40620430285482856, 0.1672816046348807, 0.85459999999999992, 0.40620430285482856, 0.19014430285482853,
-    0.85459999999999992, 0.38334160463488065, 0.19014430285482853, 0.85459999999999992, 0.38334160463488065, 0.1672816046348807, 0.85459999999999992,
-    0.40620430285482856, 0.1672816046348807, 0.85459999999999992, 0.40620430285482856, 0.19014430285482853, 0.85459999999999992, 0.38334160463488065,
-    0.19014430285482853, 0.85459999999999992, 0.38334160463488065, 0.1672816046348807, 1.0682499999999999, 0.40620430285482856, 0.1672816046348807,
-    1.0682499999999999, 0.40620430285482856, 0.19014430285482853, 1.0682499999999999, 0.38334160463488065, 0.19014430285482853, 1.0682499999999999,
-    0.38334160463488065, 0.1672816046348807, 1.0682499999999999, 0.40620430285482856, 0.1672816046348807, 1.0682499999999999, 0.40620430285482856,
-    0.19014430285482853, 1.0682499999999999, 0.38334160463488065, 0.19014430285482853, 1.0682499999999999, 0.38334160463488065, 0.1672816046348807,
-    1.2818999999999998, 0.40620430285482856, 0.1672816046348807, 1.2818999999999998, 0.40620430285482856, 0.19014430285482853, 1.2818999999999998,
-    0.38334160463488065, 0.19014430285482853, 1.2818999999999998, 0.38334160463488065, 0.1672816046348807, 1.2818999999999998, 0.40620430285482856,
-    0.1672816046348807, 1.2818999999999998, 0.40620430285482856, 0.19014430285482853, 1.2818999999999998, 0.38334160463488065, 0.19014430285482853,
-    1.2818999999999998, 0.38334160463488065, 0.1672816046348807, 1.4955499999999999, 0.40620430285482856, 0.1672816046348807, 1.4955499999999999,
-    0.40620430285482856, 0.19014430285482853, 1.4955499999999999, 0.38334160463488065, 0.19014430285482853, 1.4955499999999999, 0.38334160463488065,
-    0.1672816046348807, 1.4955499999999999, 0.40620430285482856, 0.1672816046348807, 1.4955499999999999, 0.40620430285482856, 0.19014430285482853,
-    1.4955499999999999, 0.38334160463488065, 0.19014430285482853, 1.4955499999999999, 0.38334160463488065, 0.1672816046348807, 1.7091999999999998,
-    0.40620430285482856, 0.1672816046348807, 1.7091999999999998, 0.40620430285482856, 0.19014430285482853, 1.7091999999999998, 0.38334160463488065,
-    0.19014430285482853, 1.7091999999999998, 0.38334160463488065, 0.1672816046348807, 1.7091999999999998, 0.40620430285482856, 0.1672816046348807,
-    1.7091999999999998, 0.40620430285482856, 0.19014430285482853, 1.7091999999999998, 0.38334160463488065, 0.19014430285482853, 1.7091999999999998,
-    0.38334160463488065, 0.1672816046348807, 1.9228499999999997, 0.40620430285482856, 0.1672816046348807, 1.9228499999999997, 0.40620430285482856,
-    0.19014430285482853, 1.9228499999999997, 0.38334160463488065, 0.19014430285482853, 1.9228499999999997, 0.38334160463488065, 0.1672816046348807,
-    1.9228499999999997, 0.40620430285482856, 0.1672816046348807, 1.9228499999999997, 0.40620430285482856, 0.19014430285482853, 1.9228499999999997,
-    0.38334160463488065, 0.19014430285482853, 1.9228499999999997, 0.38334160463488065, 0.1672816046348807, 2.1364999999999998, 0.40620430285482856,
-    0.1672816046348807, 2.1364999999999998, 0.40620430285482856, 0.19014430285482853, 2.1364999999999998, 0.38334160463488065, 0.19014430285482853,
-    2.1364999999999998, 0.38334160463488065, 0.1672816046348807, 2.1364999999999998, 0.40620430285482856, 0.1672816046348807, 2.1364999999999998,
-    0.40620430285482856, 0.19014430285482853, 2.1364999999999998, 0.38334160463488065, 0.19014430285482853, 2.1364999999999998, 0.38334160463488065,
-    0.1672816046348807, 2.3501499999999997, 0.40620430285482856, 0.1672816046348807, 2.3501499999999997, 0.40620430285482856, 0.19014430285482853,
-    2.3501499999999997, 0.38334160463488065, 0.19014430285482853, 2.3501499999999997, 0.38334160463488065, 0.1672816046348807, 2.3501499999999997,
-    0.40620430285482856, 0.1672816046348807, 2.3501499999999997, 0.40620430285482856, 0.19014430285482853, 2.3501499999999997, 0.38334160463488065,
-    0.19014430285482853, 2.3501499999999997, 0.38334160463488065, 0.1672816046348807, 2.5637999999999996, 0.40620430285482856, 0.1672816046348807,
-    2.5637999999999996, 0.40620430285482856, 0.19014430285482853, 2.5637999999999996, 0.38334160463488065, 0.19014430285482853, 2.5637999999999996,
-    0.38334160463488065, 0.1672816046348807, 2.5637999999999996, 0.40620430285482856, 0.1672816046348807, 2.5637999999999996, 0.40620430285482856,
-    0.19014430285482853, 2.5637999999999996, 0.38334160463488065, 0.19014430285482853, 2.5637999999999996, 0.38334160463488065, 0.1672816046348807,
-    2.7774499999999995, 0.40620430285482856, 0.1672816046348807, 2.7774499999999995, 0.40620430285482856, 0.19014430285482853, 2.7774499999999995,
-    0.38334160463488065, 0.19014430285482853, 2.7774499999999995, 0.38334160463488065, 0.1672816046348807, 2.7774499999999995, 0.40620430285482856,
-    0.1672816046348807, 2.7774499999999995, 0.40620430285482856, 0.19014430285482853,
-    2.7774499999999995, 0.38334160463488065, 0.19014430285482853, 2.7774499999999995, 0.38334160463488065, 0.1672816046348807, 2.9910999999999999,
-    0.40620430285482856, 0.1672816046348807, 2.9910999999999999, 0.40620430285482856, 0.19014430285482853, 2.9910999999999999, 0.38334160463488065,
-    0.19014430285482853, 2.9910999999999999, 0.38334160463488065, 0.1672816046348807, 2.9910999999999999, 0.40620430285482856, 0.1672816046348807,
-    2.9910999999999999, 0.40620430285482856, 0.19014430285482853, 2.9910999999999999, 0.38334160463488065, 0.19014430285482853, 2.9910999999999999,
-    0.38334160463488065, 0.1672816046348807, 3.2047499999999998, 0.40620430285482856, 0.1672816046348807, 3.2047499999999998, 0.40620430285482856,
-    0.19014430285482853, 3.2047499999999998, 0.38334160463488065, 0.19014430285482853, 3.2047499999999998, 0.38334160463488065, 0.1672816046348807,
-    3.2047499999999998, 0.40620430285482856, 0.1672816046348807, 3.2047499999999998, 0.40620430285482856, 0.19014430285482853, 3.2047499999999998,
-    0.38334160463488065, 0.19014430285482853, 3.2047499999999998, 0.38334160463488065, 0.1672816046348807, 3.4183999999999997, 0.40620430285482856,
-    0.1672816046348807, 3.4183999999999997, 0.40620430285482856, 0.19014430285482853, 3.4183999999999997, 0.38334160463488065, 0.19014430285482853,
-    3.4183999999999997, 0.38334160463488065, 0.1672816046348807, 3.4183999999999997, 0.40620430285482856, 0.1672816046348807, 3.4183999999999997,
-    0.40620430285482856, 0.19014430285482853, 3.4183999999999997, 0.38334160463488065, 0.19014430285482853, 3.4183999999999997, 0.38334160463488065,
-    0.1672816046348807, 3.6320499999999996, 0.40620430285482856, 0.1672816046348807, 3.6320499999999996, 0.40620430285482856, 0.19014430285482853,
-    3.6320499999999996, 0.38334160463488065, 0.19014430285482853, 3.6320499999999996, 0.38334160463488065, 0.1672816046348807, 3.6320499999999996,
-    0.40620430285482856, 0.1672816046348807, 3.6320499999999996, 0.40620430285482856, 0.19014430285482853, 3.6320499999999996, 0.38334160463488065,
-    0.19014430285482853, 3.6320499999999996, 0.38334160463488065, 0.1672816046348807, 3.8456999999999995, 0.40620430285482856, 0.1672816046348807,
-    3.8456999999999995, 0.40620430285482856, 0.19014430285482853, 3.8456999999999995, 0.38334160463488065, 0.19014430285482853, 3.8456999999999995,
-    0.38334160463488065, 0.1672816046348807, 3.8456999999999995, 0.40620430285482856, 0.1672816046348807, 3.8456999999999995, 0.40620430285482856,
-    0.19014430285482853, 3.8456999999999995, 0.38334160463488065, 0.19014430285482853, 3.8456999999999995, 0.38334160463488065, 0.1672816046348807,
-    4.0593499999999993, 0.40620430285482856, 0.1672816046348807, 4.0593499999999993, 0.40620430285482856, 0.19014430285482853, 4.0593499999999993,
-    0.38334160463488065, 0.19014430285482853, 4.0593499999999993, 0.38334160463488065, 0.1672816046348807, 4.0593499999999993, 0.40620430285482856,
-    0.1672816046348807, 4.0593499999999993, 0.40620430285482856, 0.19014430285482853, 4.0593499999999993, 0.38334160463488065, 0.19014430285482853,
-    4.0593499999999993, 0.38334160463488065, 0.1672816046348807, 4.2729999999999997, 0.40620430285482856, 0.1672816046348807, 4.2729999999999997,
-    0.40620430285482856, 0.19014430285482853, 4.2729999999999997, 0.38334160463488065, 0.19014430285482853, 4.2729999999999997
-  };
-
-
-const int connTFH8[2560]={
-  1, 2, 7, 6, 28, 29, 34, 33, 2, 3, 8, 7, 29, 30, 35, 34, 3, 4, 9, 8, 30, 31, 36, 35, 4, 5, 10, 9, 31, 32, 37, 36, 6, 7, 12, 11, 33, 34, 39, 38, 7, 8, 13, 12, 34, 35, 40, 39,
-  8, 9, 14, 13, 35, 36, 41, 40, 9, 10, 15, 14, 36, 37, 42, 41, 11, 12, 17, 16, 38, 39, 44, 43, 12, 13, 18, 17, 39, 40, 45, 44, 13, 14, 19, 18, 40, 41, 46, 45, 14, 15, 20, 19,
-  41, 42, 47, 46, 16, 17, 21, 26, 43, 44, 48, 53, 17, 18, 22, 21, 44, 45, 49, 48, 18, 19, 23, 22, 45, 46, 50, 49, 19, 20, 24, 23, 46, 47, 51, 50, 28, 29, 34, 33, 55, 56, 61, 60,
-  29, 30, 35, 34, 56, 57, 62, 61, 30, 31, 36, 35, 57, 58, 63, 62, 31, 32, 37, 36, 58, 59, 64, 63, 33, 34, 39, 38, 60, 61, 66, 65, 34, 35, 40, 39, 61, 62, 67, 66, 35, 36, 41, 40,
-  62, 63, 68, 67, 36, 37, 42, 41, 63, 64, 69, 68, 38, 39, 44, 43, 65, 66, 71, 70, 39, 40, 45, 44, 66, 67, 72, 71, 40, 41, 46, 45, 67, 68, 73, 72, 41, 42, 47, 46, 68, 69, 74, 73,
-  43, 44, 48, 53, 70, 71, 75, 80, 44, 45, 49, 48, 71, 72, 76, 75, 45, 46, 50, 49, 72, 73, 77, 76, 46, 47, 51, 50, 73, 74, 78, 77, 55, 56, 61, 60, 82, 83, 88, 87, 56, 57, 62, 61,
-  83, 84, 89, 88, 57, 58, 63, 62, 84, 85, 90, 89, 58, 59, 64, 63, 85, 86, 91, 90, 60, 61, 66, 65, 87, 88, 93, 92, 61, 62, 67, 66, 88, 89, 94, 93, 62, 63, 68, 67, 89, 90, 95, 94,
-  63, 64, 69, 68, 90, 91, 96, 95, 65, 66, 71, 70, 92, 93, 98, 97, 66, 67, 72, 71, 93, 94, 99, 98, 67, 68, 73, 72, 94, 95, 100, 99, 68, 69, 74, 73, 95, 96, 101, 100, 70, 71, 75,
-  80, 97, 98, 102, 107, 71, 72, 76, 75, 98, 99, 103, 102, 72, 73, 77, 76, 99, 100, 104, 103, 73, 74, 78, 77, 100, 101, 105, 104, 82, 83, 88, 87, 109, 110, 115, 114, 83, 84, 89,
-  88, 110, 111, 116, 115, 84, 85, 90, 89, 111, 112, 117, 116, 85, 86, 91, 90, 112, 113, 118, 117, 87, 88, 93, 92, 114, 115, 120, 119, 88, 89, 94, 93, 115, 116, 121, 120, 89, 90,
-  95, 94, 116, 117, 122, 121, 90, 91, 96, 95, 117, 118, 123, 122, 92, 93, 98, 97, 119, 120, 125, 124, 93, 94, 99, 98, 120, 121, 126, 125, 94, 95, 100, 99, 121, 122, 127, 126, 95,
-  96, 101, 100, 122, 123, 128, 127, 97, 98, 102, 107, 124, 125, 129, 134, 98, 99, 103, 102, 125, 126, 130, 129, 99, 100, 104, 103, 126, 127, 131, 130, 100, 101, 105, 104, 127, 128,
-  132, 131, 109, 110, 115, 114, 136, 137, 142, 141, 110, 111, 116, 115, 137, 138, 143, 142, 111, 112, 117, 116, 138, 139, 144, 143, 112, 113, 118, 117, 139, 140, 145, 144, 114, 115,
-  120, 119, 141, 142, 147, 146, 115, 116, 121, 120, 142, 143, 148, 147, 116, 117, 122, 121, 143, 144, 149, 148, 117, 118, 123, 122, 144, 145, 150, 149, 119, 120, 125, 124, 146, 147,
-  152, 151, 120, 121, 126, 125, 147, 148, 153, 152, 121, 122, 127, 126, 148, 149, 154, 153, 122, 123, 128, 127, 149, 150, 155, 154, 124, 125, 129, 134, 151, 152, 156, 161, 125, 126, 130,
-  129, 152, 153, 157, 156, 126, 127, 131, 130, 153, 154, 158, 157, 127, 128, 132, 131, 154, 155, 159, 158, 136, 137, 142, 141, 163, 164, 169, 168, 137, 138, 143, 142, 164, 165, 170, 169, 138, 139, 144, 143, 165, 166, 171, 170, 139, 
-  140, 145, 144, 166, 167, 172, 171, 141, 142, 147, 146, 168, 169, 174, 173, 142, 143, 148, 147, 169, 170, 175, 174, 143, 144, 149, 148, 170, 171, 176, 175, 144, 145, 150, 149, 171, 172, 177, 176, 146, 147, 152, 151, 173, 174, 179,
-  178, 147, 148, 153, 152, 174, 175, 180, 179, 148, 149, 154, 153, 175, 176, 181, 180, 149, 150, 155, 154, 176, 177, 182, 181, 151, 152, 156, 161, 178, 179, 183, 188, 152, 153, 157, 156, 179, 180, 184, 183, 153, 154, 158, 157, 180, 
-  181, 185, 184, 154, 155, 159, 158, 181, 182, 186, 185, 163, 164, 169, 168, 190, 191, 196, 195, 164, 165, 170, 169, 191, 192, 197, 196, 165, 166, 171, 170, 192, 193, 198, 197, 166, 167, 172, 171, 193, 194, 199, 198, 168, 169, 174, 
-  173, 195, 196, 201, 200, 169, 170, 175, 174, 196, 197, 202, 201, 170, 171, 176, 175, 197, 198, 203, 202, 171, 172, 177, 176, 198, 199, 204, 203, 173, 174, 179, 178, 200, 201, 206, 205, 174, 175, 180, 179, 201, 202, 207, 206, 175,
-  176, 181, 180, 202, 203, 208, 207, 176, 177, 182, 181, 203, 204, 209, 208, 178, 179, 183, 188, 205, 206, 210, 215, 179, 180, 184, 183, 206, 207, 211, 210, 180, 181, 185, 184, 207, 208, 212, 211, 181, 182, 186, 185, 208, 209, 213,
-  212, 190, 191, 196, 195, 217, 218, 223, 222, 191, 192, 197, 196, 218, 219, 224, 223, 192, 193, 198, 197, 219, 220, 225, 224, 193, 194, 199, 198, 220, 221, 226, 225, 195, 196, 201, 200, 222, 223, 228, 227, 196, 197, 202, 201, 223,
-  224, 229, 228, 197, 198, 203, 202, 224, 225, 230, 229, 198, 199, 204, 203, 225, 226, 231, 230, 200, 201, 206, 205, 227, 228, 233, 232, 201, 202, 207, 206, 228, 229, 234, 233, 202, 203, 208, 207, 229, 230, 235, 234, 203, 204, 209,
-  208, 230, 231, 236, 235, 205, 206, 210, 215, 232, 233, 237, 242, 206, 207, 211, 210, 233, 234, 238, 237, 207, 208, 212, 211, 234, 235, 239, 238, 208, 209, 213, 212, 235, 236, 240, 239, 217, 218, 223, 222, 244, 245, 250, 249, 218,
-  219, 224, 223, 245, 246, 251, 250, 219, 220, 225, 224, 246, 247, 252, 251, 220, 221, 226, 225, 247, 248, 253, 252, 222, 223, 228, 227, 249, 250, 255, 254, 223, 224, 229, 228, 250, 251, 256, 255, 224, 225, 230, 229, 251, 252, 257,
-  256, 225, 226, 231, 230, 252, 253, 258, 257, 227, 228, 233, 232, 254, 255, 260, 259, 228, 229, 234, 233, 255, 256, 261, 260, 229, 230, 235, 234, 256, 257, 262, 261, 230, 231, 236, 235, 257, 258, 263, 262, 232, 233, 237, 242, 259,
-  260, 264, 269, 233, 234, 238, 237, 260, 261, 265, 264, 234, 235, 239, 238, 261, 262, 266, 265, 235, 236, 240, 239, 262, 263, 267, 266, 244, 245, 250, 249, 271, 272, 277, 276, 245, 246, 251, 250, 272, 273, 278, 277, 246, 247, 252,
-  251, 273, 274, 279, 278, 247, 248, 253, 252, 274, 275, 280, 279, 249, 250, 255, 254, 276, 277, 282, 281, 250, 251, 256, 255, 277, 278, 283, 282, 251, 252, 257, 256, 278, 279, 284, 283, 252, 253, 258, 257, 279, 280, 285, 284, 254,
-  255, 260, 259, 281, 282, 287, 286, 255, 256, 261, 260, 282, 283, 288, 287, 256, 257, 262, 261, 283, 284, 289, 288, 257, 258, 263, 262, 284, 285, 290, 289, 259, 260, 264, 269, 286, 287, 291, 296, 260, 261, 265, 264, 287, 288, 292,
-  291, 261, 262, 266, 265, 288, 289, 293, 292, 262, 263, 267, 266, 289, 290, 294, 293, 271, 272, 277, 276, 298, 299, 304, 303, 272, 273, 278, 277, 299, 300, 305, 304, 273, 274, 279, 278, 300, 301, 306, 305, 274, 275, 280, 279, 301,
-  302, 307, 306, 276, 277, 282, 281, 303, 304, 309, 308, 277, 278, 283, 282, 304, 305, 310, 309, 278, 279, 284, 283, 305, 306, 311, 310, 279, 280, 285, 284, 306, 307, 312, 311, 281, 282, 287, 286, 308, 309, 314, 313, 282, 283, 288,
-  287, 309, 310, 315, 314, 283, 284, 289, 288, 310, 311, 316, 315, 284, 285, 290, 289, 311, 312, 317, 316, 286, 287, 291, 296, 313, 314, 318, 323, 287, 288, 292, 291, 314, 315, 319, 318, 288, 289, 293, 292, 315, 316, 320, 319, 289,
-  290, 294, 293, 316, 317, 321, 320, 298, 299, 304, 303, 325, 326, 331, 330, 299, 300, 305, 304, 326, 327, 332, 331, 300, 301, 306, 305, 327, 328, 333, 332, 301, 302, 307, 306, 328, 329, 334, 333, 303, 304, 309, 308, 330, 331, 336,
-  335, 304, 305, 310, 309, 331, 332, 337, 336, 305, 306, 311, 310, 332, 333, 338, 337, 306, 307, 312, 311, 333, 334, 339, 338, 308, 309, 314, 313, 335, 336, 341, 340, 309, 310, 315, 314, 336, 337, 342, 341, 310, 311, 316, 315, 337,
-  338, 343, 342, 311, 312, 317, 316, 338, 339, 344, 343, 313, 314, 318, 323, 340, 341, 345, 350, 314, 315, 319, 318, 341, 342, 346, 345, 315, 316, 320, 319, 342, 343, 347, 346, 316, 317, 321, 320, 343, 344, 348, 347, 325, 326, 331,
-  330, 352, 353, 358, 357, 326, 327, 332, 331, 353, 354, 359, 358, 327, 328, 333, 332, 354, 355, 360, 359, 328, 329, 334, 333, 355, 356, 361, 360, 330, 331, 336, 335, 357, 358, 363, 362, 331, 332, 337, 336, 358, 359, 364, 363, 332,
-  333, 338, 337, 359, 360, 365, 364, 333, 334, 339, 338, 360, 361, 366, 365, 335, 336, 341, 340, 362, 363, 368, 367, 336, 337, 342, 341, 363, 364, 369, 368, 337, 338, 343, 342, 364, 365, 370, 369, 338, 339, 344, 343, 365, 366, 371,
-  370, 340, 341, 345, 350, 367, 368, 372, 377, 341, 342, 346, 345, 368, 369, 373, 372, 342, 343, 347, 346, 369, 370, 374, 373, 343, 344, 348, 347, 370, 371, 375, 374, 352, 353, 358, 357, 379, 380, 385, 384, 353, 354, 359, 358, 380,
-  381, 386, 385, 354, 355, 360, 359, 381, 382, 387, 386, 355, 356, 361, 360, 382, 383, 388, 387, 357, 358, 363, 362, 384, 385, 390, 389, 358, 359, 364, 363, 385, 386, 391, 390, 359, 360, 365, 364, 386, 387, 392, 391, 360, 361, 366,
-  365, 387, 388, 393, 392, 362, 363, 368, 367, 389, 390, 395, 394, 363, 364, 369, 368, 390, 391, 396, 395, 364, 365, 370, 369, 391, 392, 397, 396, 365, 366, 371, 370, 392, 393, 398, 397, 367, 368, 372, 377, 394, 395, 399, 404, 368,
-  369, 373, 372, 395, 396, 400, 399, 369, 370, 374, 373, 396, 397, 401, 400, 370, 371, 375, 374, 397, 398, 402, 401, 379, 380, 385, 384, 406, 407, 412, 411, 380, 381, 386, 385, 407, 408, 413, 412, 381, 382, 387, 386, 408, 409, 414,
-  413, 382, 383, 388, 387, 409, 410, 415, 414, 384, 385, 390, 389, 411, 412, 417, 416, 385, 386, 391, 390, 412, 413, 418, 417, 386, 387, 392, 391, 413, 414, 419, 418, 387, 388, 393, 392, 414, 415, 420, 419, 389, 390, 395, 394, 416,
-  417, 422, 421, 390, 391, 396, 395, 417, 418, 423, 422, 391, 392, 397, 396, 418, 419, 424, 423, 392, 393, 398, 397, 419, 420, 425, 424, 394, 395, 399, 404, 421, 422, 426, 431, 395, 396, 400, 399, 422, 423, 427, 426, 396, 397, 401,
-  400, 423, 424, 428, 427, 397, 398, 402, 401, 424, 425, 429, 428, 406, 407, 412, 411, 433, 434, 439, 438, 407, 408, 413, 412, 434, 435, 440, 439, 408, 409, 414, 413, 435, 436, 441, 440, 409, 410, 415, 414, 436, 437, 442, 441, 411,
-  412, 417, 416, 438, 439, 444, 443, 412, 413, 418, 417, 439, 440, 445, 444, 413, 414, 419, 418, 440, 441, 446, 445, 414, 415, 420, 419, 441, 442, 447, 446, 416, 417, 422, 421, 443, 444, 449, 448, 417, 418, 423, 422, 444, 445, 450,
-  449, 418, 419, 424, 423, 445, 446, 451, 450, 419, 420, 425, 424, 446, 447, 452, 451, 421, 422, 426, 431, 448, 449, 453, 458, 422, 423, 427, 426, 449, 450, 454, 453, 423, 424, 428, 427, 450, 451, 455, 454, 424, 425, 429, 428, 451,
-  452, 456, 455, 433, 434, 439, 438, 460, 461, 466, 465, 434, 435, 440, 439, 461, 462, 467, 466, 435, 436, 441, 440, 462, 463, 468, 467, 436, 437, 442, 441, 463, 464, 469, 468, 438, 439, 444, 443, 465, 466, 471, 470, 439, 440, 445,
-  444, 466, 467, 472, 471, 440, 441, 446, 445, 467, 468, 473, 472, 441, 442, 447, 446, 468, 469, 474, 473, 443, 444, 449, 448, 470, 471, 476, 475, 444, 445, 450, 449, 471, 472, 477, 476, 445, 446, 451, 450, 472, 473, 478, 477, 446,
-  447, 452, 451, 473, 474, 479, 478, 448, 449, 453, 458, 475, 476, 480, 485, 449, 450, 454, 453, 476, 477, 481, 480, 450, 451, 455, 454, 477, 478, 482, 481, 451, 452, 456, 455, 478, 479, 483, 482, 460, 461, 466, 465, 487, 488, 493,
-  492, 461, 462, 467, 466, 488, 489, 494, 493, 462, 463, 468, 467, 489, 490, 495, 494, 463, 464, 469, 468, 490, 491, 496, 495, 465, 466, 471, 470, 492, 493, 498, 497, 466, 467, 472, 471, 493, 494, 499, 498, 467, 468, 473, 472, 494,
-  495, 500, 499, 468, 469, 474, 473, 495, 496, 501, 500, 470, 471, 476, 475, 497, 498, 503, 502, 471, 472, 477, 476, 498, 499, 504, 503, 472, 473, 478, 477, 499, 500, 505, 504, 473, 474, 479, 478, 500, 501, 506, 505, 475, 476, 480,
-  485, 502, 503, 507, 512, 476, 477, 481, 480, 503, 504, 508, 507, 477, 478, 482, 481, 504, 505, 509, 508, 478, 479, 483, 482, 505, 506, 510, 509, 487, 488, 493, 492, 514, 515, 520, 519, 488, 489, 494, 493, 515, 516, 521, 520, 489,
-  490, 495, 494, 516, 517, 522, 521, 490, 491, 496, 495, 517, 518, 523, 522, 492, 493, 498, 497, 519, 520, 525, 524, 493, 494, 499, 498, 520, 521, 526, 525, 494, 495, 500, 499, 521, 522, 527, 526, 495, 496, 501, 500, 522, 523, 528,
-  527, 497, 498, 503, 502, 524, 525, 530, 529, 498, 499, 504, 503, 525, 526, 531, 530, 499, 500, 505, 504, 526, 527, 532, 531, 500, 501, 506, 505, 527, 528, 533, 532, 502, 503, 507, 512, 529, 530, 534, 539, 503, 504, 508, 507, 530,
-  531, 535, 534, 504, 505, 509, 508, 531, 532, 536, 535, 505, 506, 510, 509, 532, 533, 537, 536, 514, 515, 520, 519, 541, 542, 547, 546, 515, 516, 521, 520, 542, 543, 548, 547, 516, 517, 522, 521, 543, 544, 549, 548, 517, 518, 523,
-  522, 544, 545, 550, 549, 519, 520, 525, 524, 546, 547, 552, 551, 520, 521, 526, 525, 547, 548, 553, 552, 521, 522, 527, 526, 548, 549, 554, 553, 522, 523, 528, 527, 549, 550, 555, 554, 524, 525, 530, 529, 551, 552, 557, 556, 525,
-  526, 531, 530, 552, 553, 558, 557, 526, 527, 532, 531, 553, 554, 559, 558, 527, 528, 533, 532, 554, 555, 560, 559, 529, 530, 534, 539, 556, 557, 561, 566, 530, 531, 535, 534, 557, 558, 562, 561, 531, 532, 536, 535, 558, 559, 563,
-  562, 532, 533, 537, 536, 559, 560, 564, 563};
-
-const int connTFPOLH[1000]={
-  0, 25, 26, 16, 11, 6, 1, -1, 27, 28, 33, 38, 43, 53, 52, -1, 0, 1, 28, 27, -1, 1, 6, 33, 28, -1, 6, 11, 38, 33, -1, 11, 16, 43, 38, -1, 16, 26, 53, 43, -1, 26, 25, 52, 53, -1, 25, 0, 27, 52, 27, 52, 53, 43, 38, 33, 28, -1, 54, 55,
-  60, 65, 70, 80, 79, -1, 27, 28, 55, 54, -1, 28, 33, 60, 55, -1, 33, 38, 65, 60, -1, 38, 43, 70, 65, -1, 43, 53, 80, 70, -1, 53, 52, 79, 80, -1, 52, 27, 54, 79, 54, 79, 80, 70, 65, 60, 55, -1, 81, 82, 87, 92, 97, 107, 106, -1, 54,
-  55, 82, 81, -1, 55, 60, 87, 82, -1, 60, 65, 92, 87, -1, 65, 70, 97, 92, -1, 70, 80, 107, 97, -1, 80, 79, 106, 107, -1, 79, 54, 81, 106, 81, 106, 107, 97, 92, 87, 82, -1, 108, 109, 114, 119, 124, 134, 133, -1, 81, 82, 109, 108, -1,
-  82, 87, 114, 109, -1, 87, 92, 119, 114, -1, 92, 97, 124, 119, -1, 97, 107, 134, 124, -1, 107, 106, 133, 134, -1, 106, 81, 108, 133, 108, 133, 134, 124, 119, 114, 109, -1, 135, 136, 141, 146, 151, 161, 160, -1, 108, 109, 136, 135,
-  -1, 109, 114, 141, 136, -1, 114, 119, 146, 141, -1, 119, 124, 151, 146, -1, 124, 134, 161, 151, -1, 134, 133, 160, 161, -1, 133, 108, 135, 160, 135, 160, 161, 151, 146, 141, 136, -1, 162, 163, 168, 173, 178, 188, 187, -1, 135, 136,
-  163, 162, -1, 136, 141, 168, 163, -1, 141, 146, 173, 168, -1, 146, 151, 178, 173, -1, 151, 161, 188, 178, -1, 161, 160, 187, 188, -1, 160, 135, 162, 187, 162, 187, 188, 178, 173, 168, 163, -1, 189, 190, 195, 200, 205, 215, 214, -1,
-  162, 163, 190, 189, -1, 163, 168, 195, 190, -1, 168, 173, 200, 195, -1, 173, 178, 205, 200, -1, 178, 188, 215, 205, -1, 188, 187, 214, 215, -1, 187, 162, 189, 214, 189, 214, 215, 205, 200, 195, 190, -1, 216, 217, 222, 227, 232, 242,
-  241, -1, 189, 190, 217, 216, -1, 190, 195, 222, 217, -1, 195, 200, 227, 222, -1, 200, 205, 232, 227, -1, 205, 215, 242, 232, -1, 215, 214, 241, 242, -1, 214, 189, 216, 241, 216, 241, 242, 232, 227, 222, 217, -1, 243, 244, 249, 254,
-259, 269, 268, -1, 216, 217, 244, 243, -1, 217, 222, 249, 244, -1, 222, 227, 254, 249, -1, 227, 232, 259, 254, -1, 232, 242, 269, 259, -1, 242, 241, 268, 269, -1, 241, 216, 243, 268, 243, 268, 269, 259, 254, 249, 244, -1, 270, 271, 276,
-  281, 286, 296, 295, -1, 243, 244, 271, 270, -1, 244, 249, 276, 271, -1, 249, 254, 281, 276, -1, 254, 259, 286, 281, -1, 259, 269, 296, 286, -1, 269, 268, 295, 296, -1, 268, 243, 270, 295, 270, 295, 296, 286, 281, 276, 271, -1, 297, 298,
-  303, 308, 313, 323, 322, -1, 270, 271, 298, 297, -1, 271, 276, 303, 298, -1, 276, 281, 308, 303, -1, 281, 286, 313, 308, -1, 286, 296, 323, 313, -1, 296, 295, 322, 323, -1, 295, 270, 297, 322, 297, 322, 323, 313, 308, 303, 298, -1, 324,
-  325, 330, 335, 340, 350, 349, -1, 297, 298, 325, 324, -1, 298, 303, 330, 325, -1, 303, 308, 335, 330, -1, 308, 313, 340, 335, -1, 313, 323, 350, 340, -1, 323, 322, 349, 350, -1, 322, 297, 324, 349, 324, 349, 350, 340, 335, 330, 325, -1,
-  351, 352, 357, 362, 367, 377, 376, -1, 324, 325, 352, 351, -1, 325, 330, 357, 352, -1, 330, 335, 362, 357, -1, 335, 340, 367, 362, -1, 340, 350, 377, 367, -1, 350, 349, 376, 377, -1, 349, 324, 351, 376, 351, 376, 377, 367, 362, 357, 352,
-  -1, 378, 379, 384, 389, 394, 404, 403, -1, 351, 352, 379, 378, -1, 352, 357, 384, 379, -1, 357, 362, 389, 384, -1, 362, 367, 394, 389, -1, 367, 377, 404, 394, -1, 377, 376, 403, 404, -1, 376, 351, 378, 403, 378, 403, 404, 394, 389, 384, 
-  379, -1, 405, 406, 411, 416, 421, 431, 430, -1, 378, 379, 406, 405, -1, 379, 384, 411, 406, -1, 384, 389, 416, 411, -1, 389, 394, 421, 416, -1, 394, 404, 431, 421, -1, 404, 403, 430, 431, -1, 403, 378, 405, 430, 405, 430, 431, 421, 416,
-  411, 406, -1, 432, 433, 438, 443, 448, 458, 457, -1, 405, 406, 433, 432, -1, 406, 411, 438, 433, -1, 411, 416, 443, 438, -1, 416, 421, 448, 443, -1, 421, 431, 458, 448, -1, 431, 430, 457, 458, -1, 430, 405, 432, 457, 432, 457, 458, 448,
-  443, 438, 433, -1, 459, 460, 465, 470, 475, 485, 484, -1, 432, 433, 460, 459, -1, 433, 438, 465, 460, -1, 438, 443, 470, 465, -1, 443, 448, 475, 470, -1, 448, 458, 485, 475, -1, 458, 457, 484, 485, -1, 457, 432, 459, 484, 459, 484, 485,
-  475, 470, 465, 460, -1, 486, 487, 492, 497, 502, 512, 511, -1, 459, 460, 487, 486, -1, 460, 465, 492, 487, -1, 465, 470, 497, 492, -1, 470, 475, 502, 497, -1, 475, 485, 512, 502, -1, 485, 484, 511, 512, -1, 484, 459, 486, 511, 486, 511,
-  512, 502, 497, 492, 487, -1, 513, 514, 519, 524, 529, 539, 538, -1, 486, 487, 514, 513, -1, 487, 492, 519, 514, -1, 492, 497, 524, 519, -1, 497, 502, 529, 524, -1, 502, 512, 539, 529, -1, 512, 511, 538, 539, -1, 511, 486, 513, 538, 513,
-  538, 539, 529, 524, 519, 514, -1, 540, 541, 546, 551, 556, 566, 565, -1, 513, 514, 541, 540, -1, 514, 519, 546, 541, -1, 519, 524, 551, 546, -1, 524, 529, 556, 551, -1, 529, 539, 566, 556, -1, 539, 538, 565, 566, -1, 538, 513, 540, 565
-};
-
-const double coordsTF[1701]={
-  0, 0, 0, 0.21606, 0, 0, 0.25207000000000002, 0, 0, 0.32408999999999999, 0, 0, 0.39610999999999996, 0, 0, 0.43212, 0, 0, 0.21606, 0.03601, 0,
-  0.25207000000000002, 0.03601, 0, 0.32408999999999999, 0.03601, 0, 0.39610999999999996, 0.03601, 0, 0.43212, 0.03601, 0, 0.21606, 0.10803, 0, 0.25207000000000002,
-  0.10803, 0, 0.32408999999999999, 0.10803, 0, 0.39610999999999996, 0.10803, 0, 0.43212, 0.10803, 0, 0.21606, 0.18004999999999999, 0, 0.25207000000000002,
-  0.18004999999999999, 0, 0.32408999999999999, 0.18004999999999999, 0, 0.39610999999999996, 0.18004999999999999, 0, 0.43212, 0.18004999999999999, 0,
-  0.25207000000000002, 0.21605999999999997, 0, 0.32408999999999999, 0.21605999999999997, 0, 0.39610999999999996, 0.21605999999999997, 0, 0.43212,
-  0.21605999999999997, 0, 0, 0.21606, 0, 0.21606, 0.21606, 0, 0, 0, 0.21364999999999998, 0.21606, 0, 0.21364999999999998, 0.25207000000000002, 0,
-  0.21364999999999998, 0.32408999999999999, 0, 0.21364999999999998, 0.39610999999999996, 0, 0.21364999999999998, 0.43212, 0, 0.21364999999999998, 0.21606, 0.03601,
-  0.21364999999999998, 0.25207000000000002, 0.03601, 0.21364999999999998, 0.32408999999999999, 0.03601, 0.21364999999999998, 0.39610999999999996, 0.03601,
-  0.21364999999999998, 0.43212, 0.03601, 0.21364999999999998, 0.21606, 0.10803, 0.21364999999999998, 0.25207000000000002, 0.10803, 0.21364999999999998,
-  0.32408999999999999, 0.10803, 0.21364999999999998, 0.39610999999999996, 0.10803, 0.21364999999999998, 0.43212, 0.10803, 0.21364999999999998, 0.21606,
-  0.18004999999999999, 0.21364999999999998, 0.25207000000000002, 0.18004999999999999, 0.21364999999999998, 0.32408999999999999, 0.18004999999999999,
-  0.21364999999999998, 0.39610999999999996, 0.18004999999999999, 0.21364999999999998, 0.43212, 0.18004999999999999, 0.21364999999999998, 0.25207000000000002,
-  0.21605999999999997, 0.21364999999999998, 0.32408999999999999, 0.21605999999999997, 0.21364999999999998, 0.39610999999999996, 0.21605999999999997,
-  0.21364999999999998, 0.43212, 0.21605999999999997, 0.21364999999999998, 0, 0.21606, 0.21364999999999998, 0.21606, 0.21606, 0.21364999999999998, 0, 0,
-  0.42729999999999996, 0.21606, 0, 0.42729999999999996, 0.25207000000000002, 0, 0.42729999999999996, 0.32408999999999999, 0, 0.42729999999999996,
-  0.39610999999999996, 0, 0.42729999999999996, 0.43212, 0, 0.42729999999999996, 0.21606, 0.03601, 0.42729999999999996, 0.25207000000000002, 0.03601,
-  0.42729999999999996, 0.32408999999999999, 0.03601, 0.42729999999999996, 0.39610999999999996, 0.03601, 0.42729999999999996, 0.43212, 0.03601, 0.42729999999999996,
-  0.21606, 0.10803, 0.42729999999999996, 0.25207000000000002, 0.10803,0.42729999999999996, 0.32408999999999999, 0.10803, 0.42729999999999996, 0.39610999999999996, 0.10803, 0.42729999999999996, 0.43212, 0.10803,
-  0.42729999999999996, 0.21606, 0.18004999999999999, 0.42729999999999996, 0.25207000000000002, 0.18004999999999999, 0.42729999999999996, 0.32408999999999999,
-  0.18004999999999999, 0.42729999999999996, 0.39610999999999996, 0.18004999999999999, 0.42729999999999996, 0.43212, 0.18004999999999999, 0.42729999999999996,
-  0.25207000000000002, 0.21605999999999997, 0.42729999999999996, 0.32408999999999999, 0.21605999999999997, 0.42729999999999996, 0.39610999999999996,
-  0.21605999999999997, 0.42729999999999996, 0.43212, 0.21605999999999997, 0.42729999999999996, 0, 0.21606, 0.42729999999999996, 0.21606, 0.21606,
-  0.42729999999999996, 0, 0, 0.64094999999999991, 0.21606, 0, 0.64094999999999991, 0.25207000000000002, 0, 0.64094999999999991, 0.32408999999999999, 0,
-  0.64094999999999991, 0.39610999999999996, 0, 0.64094999999999991, 0.43212, 0, 0.64094999999999991, 0.21606, 0.03601, 0.64094999999999991, 0.25207000000000002,
-  0.03601, 0.64094999999999991, 0.32408999999999999, 0.03601, 0.64094999999999991, 0.39610999999999996, 0.03601, 0.64094999999999991, 0.43212, 0.03601,
-  0.64094999999999991, 0.21606, 0.10803, 0.64094999999999991, 0.25207000000000002, 0.10803, 0.64094999999999991, 0.32408999999999999, 0.10803, 0.64094999999999991,
-  0.39610999999999996, 0.10803, 0.64094999999999991, 0.43212, 0.10803, 0.64094999999999991, 0.21606, 0.18004999999999999, 0.64094999999999991, 0.25207000000000002,
-  0.18004999999999999, 0.64094999999999991, 0.32408999999999999, 0.18004999999999999, 0.64094999999999991, 0.39610999999999996, 0.18004999999999999,
-  0.64094999999999991, 0.43212, 0.18004999999999999, 0.64094999999999991, 0.25207000000000002, 0.21605999999999997, 0.64094999999999991, 0.32408999999999999,
-  0.21605999999999997, 0.64094999999999991, 0.39610999999999996, 0.21605999999999997, 0.64094999999999991, 0.43212, 0.21605999999999997, 0.64094999999999991, 0,
-  0.21606, 0.64094999999999991, 0.21606, 0.21606, 0.64094999999999991, 0, 0, 0.85459999999999992, 0.21606, 0, 0.85459999999999992, 0.25207000000000002, 0,
-  0.85459999999999992, 0.32408999999999999, 0, 0.85459999999999992, 0.39610999999999996, 0, 0.85459999999999992, 0.43212, 0, 0.85459999999999992, 0.21606, 0.03601,
-  0.85459999999999992, 0.25207000000000002, 0.03601, 0.85459999999999992, 0.32408999999999999, 0.03601, 0.85459999999999992, 0.39610999999999996, 0.03601,
-  0.85459999999999992, 0.43212, 0.03601, 0.85459999999999992, 0.21606, 0.10803, 0.85459999999999992, 0.25207000000000002, 0.10803, 0.85459999999999992,
-  0.32408999999999999, 0.10803, 0.85459999999999992, 0.39610999999999996, 0.10803, 0.85459999999999992, 0.43212, 0.10803, 0.85459999999999992, 0.21606,
-  0.18004999999999999, 0.85459999999999992, 0.25207000000000002, 0.18004999999999999, 0.85459999999999992, 0.32408999999999999, 0.18004999999999999,
-  0.85459999999999992, 0.39610999999999996, 0.18004999999999999, 0.85459999999999992, 0.43212, 0.18004999999999999, 0.85459999999999992, 0.25207000000000002,
-  0.21605999999999997, 0.85459999999999992, 0.32408999999999999, 0.21605999999999997, 0.85459999999999992, 0.39610999999999996, 0.21605999999999997,
-  0.85459999999999992, 0.43212, 0.21605999999999997, 0.85459999999999992, 0,0.21606, 0.85459999999999992, 0.21606, 0.21606, 0.85459999999999992, 0, 0, 1.0682499999999999, 0.21606, 0, 1.0682499999999999, 0.25207000000000002, 0,
-  1.0682499999999999, 0.32408999999999999, 0, 1.0682499999999999, 0.39610999999999996, 0, 1.0682499999999999, 0.43212, 0, 1.0682499999999999, 0.21606, 0.03601,
-  1.0682499999999999, 0.25207000000000002, 0.03601, 1.0682499999999999, 0.32408999999999999, 0.03601, 1.0682499999999999, 0.39610999999999996, 0.03601,
-  1.0682499999999999, 0.43212, 0.03601, 1.0682499999999999, 0.21606, 0.10803, 1.0682499999999999, 0.25207000000000002, 0.10803, 1.0682499999999999,
-  0.32408999999999999, 0.10803, 1.0682499999999999, 0.39610999999999996, 0.10803, 1.0682499999999999, 0.43212, 0.10803, 1.0682499999999999, 0.21606,
-  0.18004999999999999, 1.0682499999999999, 0.25207000000000002, 0.18004999999999999, 1.0682499999999999, 0.32408999999999999, 0.18004999999999999,
-  1.0682499999999999, 0.39610999999999996, 0.18004999999999999, 1.0682499999999999, 0.43212, 0.18004999999999999, 1.0682499999999999, 0.25207000000000002,
-  0.21605999999999997, 1.0682499999999999, 0.32408999999999999, 0.21605999999999997, 1.0682499999999999, 0.39610999999999996, 0.21605999999999997,
-  1.0682499999999999, 0.43212, 0.21605999999999997, 1.0682499999999999, 0, 0.21606, 1.0682499999999999, 0.21606, 0.21606, 1.0682499999999999, 0, 0,
-  1.2818999999999998, 0.21606, 0, 1.2818999999999998, 0.25207000000000002, 0, 1.2818999999999998, 0.32408999999999999, 0, 1.2818999999999998, 0.39610999999999996,
-  0, 1.2818999999999998, 0.43212, 0, 1.2818999999999998, 0.21606, 0.03601, 1.2818999999999998, 0.25207000000000002, 0.03601, 1.2818999999999998,
-  0.32408999999999999, 0.03601, 1.2818999999999998, 0.39610999999999996, 0.03601, 1.2818999999999998, 0.43212, 0.03601, 1.2818999999999998, 0.21606, 0.10803,
-  1.2818999999999998, 0.25207000000000002, 0.10803, 1.2818999999999998, 0.32408999999999999, 0.10803, 1.2818999999999998, 0.39610999999999996, 0.10803,
-  1.2818999999999998, 0.43212, 0.10803, 1.2818999999999998, 0.21606, 0.18004999999999999, 1.2818999999999998, 0.25207000000000002, 0.18004999999999999,
-  1.2818999999999998, 0.32408999999999999, 0.18004999999999999, 1.2818999999999998, 0.39610999999999996, 0.18004999999999999, 1.2818999999999998, 0.43212,
-  0.18004999999999999, 1.2818999999999998, 0.25207000000000002, 0.21605999999999997, 1.2818999999999998, 0.32408999999999999, 0.21605999999999997,
-  1.2818999999999998, 0.39610999999999996, 0.21605999999999997, 1.2818999999999998, 0.43212, 0.21605999999999997, 1.2818999999999998, 0, 0.21606,
-  1.2818999999999998, 0.21606, 0.21606, 1.2818999999999998, 0, 0, 1.4955499999999999, 0.21606, 0, 1.4955499999999999, 0.25207000000000002, 0, 1.4955499999999999,
-  0.32408999999999999, 0, 1.4955499999999999, 0.39610999999999996, 0, 1.4955499999999999, 0.43212, 0, 1.4955499999999999, 0.21606, 0.03601, 1.4955499999999999,
-  0.25207000000000002, 0.03601, 1.4955499999999999, 0.32408999999999999, 0.03601, 1.4955499999999999, 0.39610999999999996, 0.03601, 1.4955499999999999, 0.43212,
-  0.03601, 1.4955499999999999,0.21606, 0.10803, 1.4955499999999999, 0.25207000000000002, 0.10803, 1.4955499999999999, 0.32408999999999999, 0.10803, 1.4955499999999999,
-  0.39610999999999996, 0.10803, 1.4955499999999999, 0.43212, 0.10803, 1.4955499999999999, 0.21606, 0.18004999999999999, 1.4955499999999999, 0.25207000000000002,
-  0.18004999999999999, 1.4955499999999999, 0.32408999999999999, 0.18004999999999999, 1.4955499999999999, 0.39610999999999996, 0.18004999999999999,
-  1.4955499999999999, 0.43212, 0.18004999999999999, 1.4955499999999999, 0.25207000000000002, 0.21605999999999997, 1.4955499999999999, 0.32408999999999999,
-  0.21605999999999997, 1.4955499999999999, 0.39610999999999996, 0.21605999999999997, 1.4955499999999999, 0.43212, 0.21605999999999997, 1.4955499999999999, 0,
-  0.21606, 1.4955499999999999, 0.21606, 0.21606, 1.4955499999999999, 0, 0, 1.7091999999999998, 0.21606, 0, 1.7091999999999998, 0.25207000000000002, 0,
-  1.7091999999999998, 0.32408999999999999, 0, 1.7091999999999998, 0.39610999999999996, 0, 1.7091999999999998, 0.43212, 0, 1.7091999999999998, 0.21606, 0.03601,
-  1.7091999999999998, 0.25207000000000002, 0.03601, 1.7091999999999998, 0.32408999999999999, 0.03601, 1.7091999999999998, 0.39610999999999996, 0.03601,
-  1.7091999999999998, 0.43212, 0.03601, 1.7091999999999998, 0.21606, 0.10803, 1.7091999999999998, 0.25207000000000002, 0.10803, 1.7091999999999998,
-  0.32408999999999999, 0.10803, 1.7091999999999998, 0.39610999999999996, 0.10803, 1.7091999999999998, 0.43212, 0.10803, 1.7091999999999998, 0.21606,
-  0.18004999999999999, 1.7091999999999998, 0.25207000000000002, 0.18004999999999999, 1.7091999999999998, 0.32408999999999999, 0.18004999999999999,
-  1.7091999999999998, 0.39610999999999996, 0.18004999999999999, 1.7091999999999998, 0.43212, 0.18004999999999999, 1.7091999999999998, 0.25207000000000002,
-  0.21605999999999997, 1.7091999999999998, 0.32408999999999999, 0.21605999999999997, 1.7091999999999998, 0.39610999999999996, 0.21605999999999997,
-  1.7091999999999998, 0.43212, 0.21605999999999997, 1.7091999999999998, 0, 0.21606, 1.7091999999999998, 0.21606, 0.21606, 1.7091999999999998, 0, 0,
-  1.9228499999999997, 0.21606, 0, 1.9228499999999997, 0.25207000000000002, 0, 1.9228499999999997, 0.32408999999999999, 0, 1.9228499999999997, 0.39610999999999996,
-  0, 1.9228499999999997, 0.43212, 0, 1.9228499999999997, 0.21606, 0.03601, 1.9228499999999997, 0.25207000000000002, 0.03601, 1.9228499999999997,
-  0.32408999999999999, 0.03601, 1.9228499999999997, 0.39610999999999996, 0.03601, 1.9228499999999997, 0.43212, 0.03601, 1.9228499999999997, 0.21606, 0.10803,
-  1.9228499999999997, 0.25207000000000002, 0.10803, 1.9228499999999997, 0.32408999999999999, 0.10803, 1.9228499999999997, 0.39610999999999996, 0.10803,
-  1.9228499999999997, 0.43212, 0.10803, 1.9228499999999997, 0.21606, 0.18004999999999999, 1.9228499999999997, 0.25207000000000002, 0.18004999999999999,
-  1.9228499999999997, 0.32408999999999999, 0.18004999999999999, 1.9228499999999997, 0.39610999999999996, 0.18004999999999999, 1.9228499999999997, 0.43212,
-  0.18004999999999999, 1.9228499999999997, 0.25207000000000002, 0.21605999999999997, 1.9228499999999997, 0.32408999999999999, 0.21605999999999997,
-  1.9228499999999997, 0.39610999999999996, 0.21605999999999997,1.9228499999999997, 0.43212, 0.21605999999999997, 1.9228499999999997, 0, 0.21606, 1.9228499999999997, 0.21606, 0.21606, 1.9228499999999997, 0, 0,
-  2.1364999999999998, 0.21606, 0, 2.1364999999999998, 0.25207000000000002, 0, 2.1364999999999998, 0.32408999999999999, 0, 2.1364999999999998, 0.39610999999999996,
-  0, 2.1364999999999998, 0.43212, 0, 2.1364999999999998, 0.21606, 0.03601, 2.1364999999999998, 0.25207000000000002, 0.03601, 2.1364999999999998,
-  0.32408999999999999, 0.03601, 2.1364999999999998, 0.39610999999999996, 0.03601, 2.1364999999999998, 0.43212, 0.03601, 2.1364999999999998, 0.21606, 0.10803,
-  2.1364999999999998, 0.25207000000000002, 0.10803, 2.1364999999999998, 0.32408999999999999, 0.10803, 2.1364999999999998, 0.39610999999999996, 0.10803,
-  2.1364999999999998, 0.43212, 0.10803, 2.1364999999999998, 0.21606, 0.18004999999999999, 2.1364999999999998, 0.25207000000000002, 0.18004999999999999,
-  2.1364999999999998, 0.32408999999999999, 0.18004999999999999, 2.1364999999999998, 0.39610999999999996, 0.18004999999999999, 2.1364999999999998, 0.43212,
-  0.18004999999999999, 2.1364999999999998, 0.25207000000000002, 0.21605999999999997, 2.1364999999999998, 0.32408999999999999, 0.21605999999999997,
-  2.1364999999999998, 0.39610999999999996, 0.21605999999999997, 2.1364999999999998, 0.43212, 0.21605999999999997, 2.1364999999999998, 0, 0.21606,
-  2.1364999999999998, 0.21606, 0.21606, 2.1364999999999998, 0, 0, 2.3501499999999997, 0.21606, 0, 2.3501499999999997, 0.25207000000000002, 0, 2.3501499999999997,
-  0.32408999999999999, 0, 2.3501499999999997, 0.39610999999999996, 0, 2.3501499999999997, 0.43212, 0, 2.3501499999999997, 0.21606, 0.03601, 2.3501499999999997,
-  0.25207000000000002, 0.03601, 2.3501499999999997, 0.32408999999999999, 0.03601, 2.3501499999999997, 0.39610999999999996, 0.03601, 2.3501499999999997, 0.43212,
-  0.03601, 2.3501499999999997, 0.21606, 0.10803, 2.3501499999999997, 0.25207000000000002, 0.10803, 2.3501499999999997, 0.32408999999999999, 0.10803,
-  2.3501499999999997, 0.39610999999999996, 0.10803, 2.3501499999999997, 0.43212, 0.10803, 2.3501499999999997, 0.21606, 0.18004999999999999, 2.3501499999999997,
-  0.25207000000000002, 0.18004999999999999, 2.3501499999999997, 0.32408999999999999, 0.18004999999999999, 2.3501499999999997, 0.39610999999999996,
-  0.18004999999999999, 2.3501499999999997, 0.43212, 0.18004999999999999, 2.3501499999999997, 0.25207000000000002, 0.21605999999999997, 2.3501499999999997,
-  0.32408999999999999, 0.21605999999999997, 2.3501499999999997, 0.39610999999999996, 0.21605999999999997, 2.3501499999999997, 0.43212, 0.21605999999999997,
-  2.3501499999999997, 0, 0.21606, 2.3501499999999997, 0.21606, 0.21606, 2.3501499999999997, 0, 0, 2.5637999999999996, 0.21606, 0, 2.5637999999999996,
-  0.25207000000000002, 0, 2.5637999999999996, 0.32408999999999999, 0, 2.5637999999999996, 0.39610999999999996, 0, 2.5637999999999996, 0.43212, 0,
-  2.5637999999999996, 0.21606, 0.03601, 2.5637999999999996, 0.25207000000000002, 0.03601, 2.5637999999999996, 0.32408999999999999, 0.03601, 2.5637999999999996,
-  0.39610999999999996,0.03601, 2.5637999999999996, 0.43212, 0.03601, 2.5637999999999996, 0.21606, 0.10803, 2.5637999999999996, 0.25207000000000002, 0.10803, 2.5637999999999996,
-  0.32408999999999999, 0.10803, 2.5637999999999996, 0.39610999999999996, 0.10803, 2.5637999999999996, 0.43212, 0.10803, 2.5637999999999996, 0.21606,
-  0.18004999999999999, 2.5637999999999996, 0.25207000000000002, 0.18004999999999999, 2.5637999999999996, 0.32408999999999999, 0.18004999999999999,
-  2.5637999999999996, 0.39610999999999996, 0.18004999999999999, 2.5637999999999996, 0.43212, 0.18004999999999999, 2.5637999999999996, 0.25207000000000002,
-  0.21605999999999997, 2.5637999999999996, 0.32408999999999999, 0.21605999999999997, 2.5637999999999996, 0.39610999999999996, 0.21605999999999997,
-  2.5637999999999996, 0.43212, 0.21605999999999997, 2.5637999999999996, 0, 0.21606, 2.5637999999999996, 0.21606, 0.21606, 2.5637999999999996, 0, 0,
-  2.7774499999999995, 0.21606, 0, 2.7774499999999995, 0.25207000000000002, 0, 2.7774499999999995, 0.32408999999999999, 0, 2.7774499999999995, 0.39610999999999996,
-  0, 2.7774499999999995, 0.43212, 0, 2.7774499999999995, 0.21606, 0.03601, 2.7774499999999995, 0.25207000000000002, 0.03601, 2.7774499999999995,
-  0.32408999999999999, 0.03601, 2.7774499999999995, 0.39610999999999996, 0.03601, 2.7774499999999995, 0.43212, 0.03601, 2.7774499999999995, 0.21606, 0.10803,
-  2.7774499999999995, 0.25207000000000002, 0.10803, 2.7774499999999995, 0.32408999999999999, 0.10803, 2.7774499999999995, 0.39610999999999996, 0.10803,
-  2.7774499999999995, 0.43212, 0.10803, 2.7774499999999995, 0.21606, 0.18004999999999999, 2.7774499999999995, 0.25207000000000002, 0.18004999999999999,
-  2.7774499999999995, 0.32408999999999999, 0.18004999999999999, 2.7774499999999995, 0.39610999999999996, 0.18004999999999999, 2.7774499999999995, 0.43212,
-  0.18004999999999999, 2.7774499999999995, 0.25207000000000002, 0.21605999999999997, 2.7774499999999995, 0.32408999999999999, 0.21605999999999997,
-  2.7774499999999995, 0.39610999999999996, 0.21605999999999997, 2.7774499999999995, 0.43212, 0.21605999999999997, 2.7774499999999995, 0, 0.21606,
-  2.7774499999999995, 0.21606, 0.21606, 2.7774499999999995, 0, 0, 2.9910999999999999, 0.21606, 0, 2.9910999999999999, 0.25207000000000002, 0, 2.9910999999999999,
-  0.32408999999999999, 0, 2.9910999999999999, 0.39610999999999996, 0, 2.9910999999999999, 0.43212, 0, 2.9910999999999999, 0.21606, 0.03601, 2.9910999999999999,
-  0.25207000000000002, 0.03601, 2.9910999999999999, 0.32408999999999999, 0.03601, 2.9910999999999999, 0.39610999999999996, 0.03601, 2.9910999999999999, 0.43212,
-  0.03601, 2.9910999999999999, 0.21606, 0.10803, 2.9910999999999999, 0.25207000000000002, 0.10803, 2.9910999999999999, 0.32408999999999999, 0.10803,
-  2.9910999999999999, 0.39610999999999996, 0.10803, 2.9910999999999999, 0.43212, 0.10803, 2.9910999999999999, 0.21606, 0.18004999999999999, 2.9910999999999999,
-  0.25207000000000002, 0.18004999999999999, 2.9910999999999999, 0.32408999999999999, 0.18004999999999999, 2.9910999999999999, 0.39610999999999996,
-  0.18004999999999999, 2.9910999999999999, 0.43212, 0.18004999999999999, 2.9910999999999999, 0.25207000000000002, 0.21605999999999997, 2.9910999999999999,
-  0.32408999999999999, 0.21605999999999997, 2.9910999999999999, 0.39610999999999996, 0.21605999999999997, 2.9910999999999999, 0.43212, 0.21605999999999997,
-  2.9910999999999999, 0, 0.21606, 2.9910999999999999, 0.21606, 0.21606, 2.9910999999999999, 0, 0, 3.2047499999999998, 0.21606, 0, 3.2047499999999998,
-  0.25207000000000002, 0, 3.2047499999999998, 0.32408999999999999, 0, 3.2047499999999998, 0.39610999999999996, 0, 3.2047499999999998, 0.43212, 0,
-  3.2047499999999998, 0.21606, 0.03601, 3.2047499999999998, 0.25207000000000002, 0.03601, 3.2047499999999998, 0.32408999999999999, 0.03601, 3.2047499999999998,
-  0.39610999999999996, 0.03601, 3.2047499999999998, 0.43212, 0.03601, 3.2047499999999998, 0.21606, 0.10803, 3.2047499999999998, 0.25207000000000002, 0.10803,
-  3.2047499999999998, 0.32408999999999999, 0.10803, 3.2047499999999998, 0.39610999999999996, 0.10803, 3.2047499999999998, 0.43212, 0.10803, 3.2047499999999998,
-  0.21606, 0.18004999999999999, 3.2047499999999998, 0.25207000000000002, 0.18004999999999999, 3.2047499999999998, 0.32408999999999999, 0.18004999999999999,
-  3.2047499999999998, 0.39610999999999996, 0.18004999999999999, 3.2047499999999998, 0.43212, 0.18004999999999999, 3.2047499999999998, 0.25207000000000002,
-  0.21605999999999997, 3.2047499999999998, 0.32408999999999999, 0.21605999999999997, 3.2047499999999998, 0.39610999999999996, 0.21605999999999997,
-  3.2047499999999998, 0.43212, 0.21605999999999997, 3.2047499999999998, 0, 0.21606, 3.2047499999999998, 0.21606, 0.21606, 3.2047499999999998, 0, 0,
-  3.4183999999999997, 0.21606, 0, 3.4183999999999997, 0.25207000000000002, 0, 3.4183999999999997, 0.32408999999999999, 0, 3.4183999999999997, 0.39610999999999996,
-  0, 3.4183999999999997, 0.43212, 0, 3.4183999999999997, 0.21606, 0.03601, 3.4183999999999997, 0.25207000000000002, 0.03601, 3.4183999999999997,
-  0.32408999999999999, 0.03601, 3.4183999999999997, 0.39610999999999996, 0.03601, 3.4183999999999997, 0.43212, 0.03601, 3.4183999999999997, 0.21606, 0.10803,
-  3.4183999999999997, 0.25207000000000002, 0.10803, 3.4183999999999997, 0.32408999999999999, 0.10803, 3.4183999999999997, 0.39610999999999996, 0.10803,
-  3.4183999999999997, 0.43212, 0.10803, 3.4183999999999997, 0.21606, 0.18004999999999999, 3.4183999999999997, 0.25207000000000002, 0.18004999999999999,
-  3.4183999999999997, 0.32408999999999999, 0.18004999999999999, 3.4183999999999997, 0.39610999999999996, 0.18004999999999999, 3.4183999999999997, 0.43212,
-  0.18004999999999999, 3.4183999999999997, 0.25207000000000002, 0.21605999999999997, 3.4183999999999997, 0.32408999999999999, 0.21605999999999997,
-  3.4183999999999997, 0.39610999999999996, 0.21605999999999997, 3.4183999999999997, 0.43212, 0.21605999999999997, 3.4183999999999997, 0, 0.21606,
-  3.4183999999999997, 0.21606, 0.21606, 3.4183999999999997, 0, 0, 3.6320499999999996, 0.21606, 0, 3.6320499999999996, 0.25207000000000002, 0, 3.6320499999999996,
-  0.32408999999999999, 0, 3.6320499999999996, 0.39610999999999996, 0, 3.6320499999999996, 0.43212, 0, 3.6320499999999996, 0.21606, 0.03601, 3.6320499999999996,
-  0.25207000000000002, 0.03601, 3.6320499999999996, 0.32408999999999999, 0.03601, 3.6320499999999996, 0.39610999999999996, 0.03601, 3.6320499999999996, 0.43212, 0.03601,
-  3.6320499999999996, 0.21606, 0.10803, 3.6320499999999996, 0.25207000000000002, 0.10803, 3.6320499999999996, 0.32408999999999999, 0.10803, 3.6320499999999996,
-  0.39610999999999996, 0.10803, 3.6320499999999996, 0.43212, 0.10803, 3.6320499999999996, 0.21606, 0.18004999999999999, 3.6320499999999996, 0.25207000000000002,
-  0.18004999999999999, 3.6320499999999996, 0.32408999999999999, 0.18004999999999999, 3.6320499999999996, 0.39610999999999996, 0.18004999999999999,
-  3.6320499999999996, 0.43212, 0.18004999999999999, 3.6320499999999996, 0.25207000000000002, 0.21605999999999997, 3.6320499999999996, 0.32408999999999999,
-  0.21605999999999997, 3.6320499999999996, 0.39610999999999996, 0.21605999999999997, 3.6320499999999996, 0.43212, 0.21605999999999997, 3.6320499999999996, 0,
-  0.21606, 3.6320499999999996, 0.21606, 0.21606, 3.6320499999999996, 0, 0, 3.8456999999999995, 0.21606, 0, 3.8456999999999995, 0.25207000000000002, 0,
-  3.8456999999999995, 0.32408999999999999, 0, 3.8456999999999995, 0.39610999999999996, 0, 3.8456999999999995, 0.43212, 0, 3.8456999999999995, 0.21606, 0.03601,
-  3.8456999999999995, 0.25207000000000002, 0.03601, 3.8456999999999995, 0.32408999999999999, 0.03601, 3.8456999999999995, 0.39610999999999996, 0.03601,
-  3.8456999999999995, 0.43212, 0.03601, 3.8456999999999995, 0.21606, 0.10803, 3.8456999999999995, 0.25207000000000002, 0.10803, 3.8456999999999995,
-  0.32408999999999999, 0.10803, 3.8456999999999995, 0.39610999999999996, 0.10803, 3.8456999999999995, 0.43212, 0.10803, 3.8456999999999995, 0.21606,
-  0.18004999999999999, 3.8456999999999995, 0.25207000000000002, 0.18004999999999999, 3.8456999999999995, 0.32408999999999999, 0.18004999999999999,
-  3.8456999999999995, 0.39610999999999996, 0.18004999999999999, 3.8456999999999995, 0.43212, 0.18004999999999999, 3.8456999999999995, 0.25207000000000002,
-  0.21605999999999997, 3.8456999999999995, 0.32408999999999999, 0.21605999999999997, 3.8456999999999995, 0.39610999999999996, 0.21605999999999997,
-  3.8456999999999995, 0.43212, 0.21605999999999997, 3.8456999999999995, 0, 0.21606, 3.8456999999999995, 0.21606, 0.21606, 3.8456999999999995, 0, 0,
-  4.0593499999999993, 0.21606, 0, 4.0593499999999993, 0.25207000000000002, 0, 4.0593499999999993, 0.32408999999999999, 0, 4.0593499999999993, 0.39610999999999996,
-  0, 4.0593499999999993, 0.43212, 0, 4.0593499999999993, 0.21606, 0.03601, 4.0593499999999993, 0.25207000000000002, 0.03601, 4.0593499999999993,
-  0.32408999999999999, 0.03601, 4.0593499999999993, 0.39610999999999996, 0.03601, 4.0593499999999993, 0.43212, 0.03601, 4.0593499999999993, 0.21606, 0.10803,
-  4.0593499999999993, 0.25207000000000002, 0.10803, 4.0593499999999993, 0.32408999999999999, 0.10803, 4.0593499999999993, 0.39610999999999996, 0.10803,
-  4.0593499999999993, 0.43212, 0.10803, 4.0593499999999993, 0.21606, 0.18004999999999999, 4.0593499999999993, 0.25207000000000002, 0.18004999999999999,
-  4.0593499999999993, 0.32408999999999999, 0.18004999999999999, 4.0593499999999993, 0.39610999999999996, 0.18004999999999999, 4.0593499999999993, 0.43212,
-  0.18004999999999999, 4.0593499999999993, 0.25207000000000002, 0.21605999999999997, 4.0593499999999993, 0.32408999999999999, 0.21605999999999997,
-  4.0593499999999993, 0.39610999999999996, 0.21605999999999997, 4.0593499999999993, 0.43212, 0.21605999999999997, 4.0593499999999993, 0, 0.21606,
-  4.0593499999999993, 0.21606, 0.21606, 4.0593499999999993, 0, 0, 4.2729999999999997, 0.21606, 0, 4.2729999999999997, 0.25207000000000002, 0, 4.2729999999999997,
-  0.32408999999999999, 0, 4.2729999999999997, 0.39610999999999996, 0, 4.2729999999999997, 0.43212, 0, 4.2729999999999997, 0.21606, 0.03601, 4.2729999999999997,
-  0.25207000000000002, 0.03601, 4.2729999999999997, 0.32408999999999999, 0.03601, 4.2729999999999997, 0.39610999999999996, 0.03601, 4.2729999999999997, 0.43212,
-  0.03601, 4.2729999999999997, 0.21606, 0.10803, 4.2729999999999997, 0.25207000000000002, 0.10803, 4.2729999999999997, 0.32408999999999999, 0.10803,
-  4.2729999999999997, 0.39610999999999996, 0.10803, 4.2729999999999997, 0.43212, 0.10803, 4.2729999999999997, 0.21606, 0.18004999999999999, 4.2729999999999997,
-  0.25207000000000002, 0.18004999999999999, 4.2729999999999997, 0.32408999999999999, 0.18004999999999999, 4.2729999999999997, 0.39610999999999996,
-  0.18004999999999999, 4.2729999999999997, 0.43212, 0.18004999999999999, 4.2729999999999997, 0.25207000000000002, 0.21605999999999997, 4.2729999999999997,
-  0.32408999999999999, 0.21605999999999997, 4.2729999999999997, 0.39610999999999996, 0.21605999999999997, 4.2729999999999997, 0.43212, 0.21605999999999997,
-  4.2729999999999997, 0, 0.21606, 4.2729999999999997, 0.21606, 0.21606, 4.2729999999999997
-};
-
-const int connTFPOLH_I[21]={0, 50, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 600, 650, 700, 750, 800, 850, 900, 950, 1000};
diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx
deleted file mode 100644
index b60b3e066..000000000
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx
+++ /dev/null
@@ -1,2213 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "MEDCouplingBasicsTest.hxx"
-#include "MEDCouplingUMesh.hxx"
-#include "MEDCouplingExtrudedMesh.hxx"
-#include "MEDCouplingFieldDouble.hxx"
-#include "MEDCouplingMemArray.hxx"
-#include "Interpolation2D.txx"
-#include "Interpolation3DSurf.txx"
-#include "Interpolation3D.txx"
-#include "InterpolationCC.txx"
-#include "InterpolationCU.txx"
-#include "Interpolation2DCurve.txx"
-#include "Interpolation1D.txx"
-
-#include "MEDCouplingNormalizedUnstructuredMesh.txx"
-#include "MEDCouplingNormalizedCartesianMesh.txx"
-
-#include <cmath>
-#include <functional>
-
-using namespace ParaMEDMEM;
-
-void MEDCouplingBasicsTest::test2DInterpP0P0_1()
-{
-  MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  INTERP_KERNEL::IntersectionType types[3]={INTERP_KERNEL::Triangulation, INTERP_KERNEL::Convex, INTERP_KERNEL::Geometric2D};
-  for(int i=0;i<3;i++)
-    {
-      myInterpolator.setPrecision(1e-12);
-      myInterpolator.setIntersectionType(types[i]);
-      myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-      CPPUNIT_ASSERT_EQUAL(5,(int)res.size());
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125,res[0][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125,res[0][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125,res[1][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125,res[2][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[3][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125,res[4][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125,res[4][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,sumAll(res),1e-12);
-      res.clear();
-    }
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test2DInterpP0P0PL_1()
-{
-  MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  //
-  myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-  CPPUNIT_ASSERT_EQUAL(5,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[2][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(7.,sumAll(res),1e-12);
-  //
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test2DInterpP0P0PL_2()
-{
-  MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
-  //
-  std::vector<int> cellsIds(targetMesh->getNumberOfCells());
-  for(int i=0;i<targetMesh->getNumberOfCells();i++)
-    cellsIds[i]=i;
-  targetMesh->convertToPolyTypes(cellsIds);
-  //
-  MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  //
-  myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-  CPPUNIT_ASSERT_EQUAL(5,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[2][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(7.,sumAll(res),1e-12);
-  //
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test2DInterpP0P0PL_3()
-{
-  MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
-  //
-  std::vector<int> cellsIds(sourceMesh->getNumberOfCells());
-  for(int i=0;i<sourceMesh->getNumberOfCells();i++)
-    cellsIds[i]=i;
-  sourceMesh->convertToPolyTypes(cellsIds);
-  //
-  MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  //
-  myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-  CPPUNIT_ASSERT_EQUAL(5,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[2][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(7.,sumAll(res),1e-12);
-  //
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test2DInterpP0P0PL_4()
-{
-  MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
-  //
-  std::vector<int> cellsIds(sourceMesh->getNumberOfCells());
-  for(int i=0;i<sourceMesh->getNumberOfCells();i++)
-    cellsIds[i]=i;
-  sourceMesh->convertToPolyTypes(cellsIds);
-  cellsIds.resize(targetMesh->getNumberOfCells());
-  for(int i=0;i<targetMesh->getNumberOfCells();i++)
-    cellsIds[i]=i;
-  targetMesh->convertToPolyTypes(cellsIds);
-  //
-  MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  //
-  myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-  CPPUNIT_ASSERT_EQUAL(5,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[2][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(7.,sumAll(res),1e-12);
-  //
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test2DInterpP0P1_1()
-{
-  MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  INTERP_KERNEL::IntersectionType types[2]={INTERP_KERNEL::Triangulation, INTERP_KERNEL::Geometric2D};
-  for(int i=0;i<2;i++)
-    {
-      myInterpolator.setPrecision(1e-12);
-      myInterpolator.setIntersectionType(types[i]);
-      myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P1");
-      CPPUNIT_ASSERT_EQUAL(9,(int)res.size());
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664,res[0][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664,res[0][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125,res[1][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.083333333333333329,res[2][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.16666666666666666,res[3][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.16666666666666666,res[4][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.16666666666666666,res[4][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125,res[5][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.083333333333333329,res[6][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.16666666666666666,res[7][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664,res[8][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664,res[8][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(1.25,sumAll(res),1e-12);
-      res.clear();
-    }
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test2DInterpP0P1PL_1()
-{
-  MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P1");
-  CPPUNIT_ASSERT_EQUAL(9,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[2][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[5][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[6][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[8][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[8][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(12.,sumAll(res),1e-12);
-  res.clear();
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test2DInterpP0P1PL_2()
-{
-  MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
-  //
-  std::vector<int> cellsIds(sourceMesh->getNumberOfCells());
-  for(int i=0;i<sourceMesh->getNumberOfCells();i++)
-    cellsIds[i]=i;
-  sourceMesh->convertToPolyTypes(cellsIds);
-  //
-  cellsIds.resize(targetMesh->getNumberOfCells());
-  for(int i=0;i<targetMesh->getNumberOfCells();i++)
-    cellsIds[i]=i;
-  targetMesh->convertToPolyTypes(cellsIds);
-  //
-  MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P1");
-  CPPUNIT_ASSERT_EQUAL(9,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[2][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[5][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[6][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[8][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[8][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(12.,sumAll(res),1e-12);
-  res.clear();
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test2DInterpP1P0_1()
-{
-  MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  INTERP_KERNEL::IntersectionType types[2]={INTERP_KERNEL::Triangulation, INTERP_KERNEL::Geometric2D};
-  for(int i=0;i<2;i++)
-    {
-      myInterpolator.setPrecision(1e-12);
-      myInterpolator.setIntersectionType(types[i]);
-      myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P0");
-      CPPUNIT_ASSERT_EQUAL(5,(int)res.size());
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[0][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664,res[1][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664,res[3][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.083333333333333333,res[1][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.083333333333333333,res[2][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.166666666666666667,res[3][2],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664,res[2][3],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664,res[3][3],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[4][3],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,sumAll(res),1e-12);
-      res.clear();
-    }
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test2DInterpP1P0PL_1()
-{
-  MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P0");
-  CPPUNIT_ASSERT_EQUAL(5,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.5,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,res[0][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,res[0][2],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[0][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.333333333333333333,res[1][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[1][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.166666666666666666,res[1][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.166666666666666666,res[2][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[2][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.333333333333333333,res[2][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[3][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[3][2],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[3][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[4][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,res[4][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,res[4][2],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.5,res[4][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(7.,sumAll(res),1e-12);
-  res.clear();
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test2DInterpP1P0PL_2()
-{
-  MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
-  //
-  std::vector<int >cellsIds(targetMesh->getNumberOfCells());
-  for(int i=0;i<targetMesh->getNumberOfCells();i++)
-    cellsIds[i]=i;
-  targetMesh->convertToPolyTypes(cellsIds);
-  //
-  MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P0");
-  CPPUNIT_ASSERT_EQUAL(5,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.5,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,res[0][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,res[0][2],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[0][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.333333333333333333,res[1][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[1][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.166666666666666666,res[1][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.166666666666666666,res[2][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[2][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.333333333333333333,res[2][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[3][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[3][2],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[3][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[4][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,res[4][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,res[4][2],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.5,res[4][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(7.,sumAll(res),1e-12);
-  res.clear();
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test2DInterpP1P1_1()
-{
-  MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build2DTargetMesh_2();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  INTERP_KERNEL::IntersectionType types[2]={INTERP_KERNEL::Triangulation, INTERP_KERNEL::Geometric2D};
-  for(int i=0;i<2;i++)
-    {
-      myInterpolator.setPrecision(1e-12);
-      myInterpolator.setIntersectionType(types[i]);
-      myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P1");
-      CPPUNIT_ASSERT_EQUAL(9,(int)res.size());
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.08333333333333334,res[0][0],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.05416666666666665,res[1][0],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.02916666666666666,res[1][1],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.08333333333333334,res[2][1],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.05416666666666665,res[3][0],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.02916666666666668,res[3][2],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.1416666666666666,res[4][0],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.02499999999999999,res[4][1],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.02499999999999999,res[4][2],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.09999999999999999,res[4][3],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.02916666666666666,res[5][1],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.09583333333333333,res[5][3],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.08333333333333333,res[6][2],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.02916666666666667,res[7][2],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.09583333333333331,res[7][3],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.04166666666666668,res[8][3],1.e-12);
-      res.clear();
-    }
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test2DInterpP1P1PL_1()
-{
-  MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P1");
-  CPPUNIT_ASSERT_EQUAL(9,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(2.,res[0][0],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][0],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][1],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(2.,res[2][1],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][0],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][2],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(5.,res[4][0],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(5.,res[4][3],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[5][1],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[5][3],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[6][2],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][2],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][3],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(2.,res[8][3],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(25.,sumAll(res),1e-12);
-  res.clear();
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DSurfInterpP0P0_1()
-{
-  MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3DSurf myInterpolator;
-  std::vector<std::map<int,double> > res;
-  INTERP_KERNEL::IntersectionType types[3]={INTERP_KERNEL::Triangulation, INTERP_KERNEL::Geometric2D};
-  for(int i=0;i<2;i++)
-    {
-      myInterpolator.setPrecision(1e-12);
-      myInterpolator.setIntersectionType(types[i]);
-      myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-      CPPUNIT_ASSERT_EQUAL(5,(int)res.size());
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[0][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[0][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[1][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[2][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25*sqrt(2.),res[3][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[4][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[4][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(1.*sqrt(2.),sumAll(res),1e-12);
-      res.clear();
-    }
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DSurfInterpP0P0PL_1()
-{
-  MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3DSurf myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-  CPPUNIT_ASSERT_EQUAL(5,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[2][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(7.,sumAll(res),1e-12);
-  res.clear();
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DSurfInterpP0P1_1()
-{
-  MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3DSurf myInterpolator;
-  std::vector<std::map<int,double> > res;
-  INTERP_KERNEL::IntersectionType types[2]={INTERP_KERNEL::Triangulation, INTERP_KERNEL::Geometric2D};
-  for(int i=0;i<2;i++)
-    {
-      myInterpolator.setPrecision(1e-12);
-      myInterpolator.setIntersectionType(types[i]);
-      myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P1");
-      CPPUNIT_ASSERT_EQUAL(9,(int)res.size());
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664*sqrt(2.),res[0][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664*sqrt(2.),res[0][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[1][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.083333333333333329*sqrt(2.),res[2][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.16666666666666666*sqrt(2.),res[3][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.16666666666666666*sqrt(2.),res[4][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.16666666666666666*sqrt(2.),res[4][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[5][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.083333333333333329*sqrt(2.),res[6][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.16666666666666666*sqrt(2.),res[7][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664*sqrt(2.),res[8][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664*sqrt(2.),res[8][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(1.25*sqrt(2.),sumAll(res),1e-12);
-      res.clear();
-    }
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DSurfInterpP0P1PL_1()
-{
-  MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3DSurf myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P1");
-  CPPUNIT_ASSERT_EQUAL(9,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[2][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[5][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[6][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[8][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[8][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(12.,sumAll(res),1e-12);
-  res.clear();
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DSurfInterpP1P0_1()
-{
-  MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3DSurf myInterpolator;
-  std::vector<std::map<int,double> > res;
-  INTERP_KERNEL::IntersectionType types[2]={INTERP_KERNEL::Triangulation, INTERP_KERNEL::Geometric2D};
-  for(int i=0;i<2;i++)
-    {
-      myInterpolator.setPrecision(1e-12);
-      myInterpolator.setIntersectionType(types[i]);
-      myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P0");
-      CPPUNIT_ASSERT_EQUAL(5,(int)res.size());
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25*sqrt(2.),res[0][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664*sqrt(2.),res[1][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664*sqrt(2.),res[3][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.083333333333333333*sqrt(2.),res[1][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.083333333333333333*sqrt(2.),res[2][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.166666666666666667*sqrt(2.),res[3][2],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664*sqrt(2.),res[2][3],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664*sqrt(2.),res[3][3],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25*sqrt(2.),res[4][3],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(1.*sqrt(2.),sumAll(res),1e-12);
-      res.clear();
-    }
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DSurfInterpP1P0PL_1()
-{
-  MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3DSurf myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P0");
-  CPPUNIT_ASSERT_EQUAL(5,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.5,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,res[0][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,res[0][2],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[0][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.333333333333333333,res[1][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[1][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.166666666666666666,res[1][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.166666666666666666,res[2][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[2][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.333333333333333333,res[2][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[3][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[3][2],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[3][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[4][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,res[4][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,res[4][2],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.5,res[4][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(7.,sumAll(res),1e-12);
-  res.clear();
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DSurfInterpP1P1_1()
-{
-  MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_2();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3DSurf myInterpolator;
-  std::vector<std::map<int,double> > res;
-  INTERP_KERNEL::IntersectionType types[2]={INTERP_KERNEL::Triangulation, INTERP_KERNEL::Geometric2D};
-  for(int i=0;i<2;i++)
-    {
-      myInterpolator.setPrecision(1e-12);
-      myInterpolator.setIntersectionType(types[i]);
-      myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P1");
-      CPPUNIT_ASSERT_EQUAL(9,(int)res.size());
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.08333333333333334*sqrt(2.),res[0][0],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.05416666666666665*sqrt(2.),res[1][0],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.02916666666666666*sqrt(2.),res[1][1],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.08333333333333334*sqrt(2.),res[2][1],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.05416666666666665*sqrt(2.),res[3][0],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.02916666666666668*sqrt(2.),res[3][2],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.1416666666666666*sqrt(2.),res[4][0],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.02499999999999999*sqrt(2.),res[4][1],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.02499999999999999*sqrt(2.),res[4][2],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.09999999999999999*sqrt(2.),res[4][3],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.02916666666666666*sqrt(2.),res[5][1],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.09583333333333333*sqrt(2.),res[5][3],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.08333333333333333*sqrt(2.),res[6][2],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.02916666666666667*sqrt(2.),res[7][2],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.09583333333333331*sqrt(2.),res[7][3],1.e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.04166666666666668*sqrt(2.),res[8][3],1.e-12);
-      res.clear();
-    }
-  //
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DSurfInterpP1P1PL_1()
-{
-  MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3DSurf myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P1");
-  CPPUNIT_ASSERT_EQUAL(9,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(2.,res[0][0],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][0],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][1],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(2.,res[2][1],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][0],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][2],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(5.,res[4][0],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(5.,res[4][3],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[5][1],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[5][3],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[6][2],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][2],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][3],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(2.,res[8][3],1.e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(25.,sumAll(res),1e-12);
-  res.clear();
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DSurfInterpP0P0_2()
-{
-  MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build3DSurfTargetMeshPerm_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3DSurf myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.setIntersectionType(INTERP_KERNEL::Triangulation);
-  {
-    myInterpolator.setOrientation(2);
-    myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-    CPPUNIT_ASSERT_EQUAL(5,(int)res.size());
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[0][0],1e-12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[0][1],1e-12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[1][0],1e-12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[2][0],1e-12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25*sqrt(2.),res[3][1],1e-12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[4][0],1e-12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[4][1],1e-12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(1.*sqrt(2.),sumAll(res),1e-12);
-    res.clear();
-  }
-  {
-    myInterpolator.setOrientation(0);
-    myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-    CPPUNIT_ASSERT_EQUAL(5,(int)res.size());
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[0][0],1e-12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[0][1],1e-12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[1][0],1e-12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.125*sqrt(2.),res[2][0],1e-12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25*sqrt(2.),res[3][1],1e-12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[4][0],1e-12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[4][1],1e-12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.75*sqrt(2.),sumAll(res),1e-12);
-    res.clear();
-  }
-  {
-    myInterpolator.setOrientation(1);
-    myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-    CPPUNIT_ASSERT_EQUAL(5,(int)res.size());
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[0][0],1e-12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[0][1],1e-12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[1][0],1e-12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25*sqrt(2.),res[3][1],1e-12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[4][0],1e-12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[4][1],1e-12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.875*sqrt(2.),sumAll(res),1e-12);
-    res.clear();
-  }
-  {
-    myInterpolator.setOrientation(-1);
-    myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-    CPPUNIT_ASSERT_EQUAL(5,(int)res.size());
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[2][0],1e-12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),sumAll(res),1e-12);
-    res.clear();
-  }
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-/*!
- * Test of precision option implemented by Fabien that represents distance of "barycenter" to the other cell.
- */
-void MEDCouplingBasicsTest::test3DSurfInterpP0P0_3()
-{
-  INTERP_KERNEL::Interpolation3DSurf myInterpolator;
-  std::vector<std::map<int,double> > res;
-  double vecTrans[3]={0.,0.,1.e-10};
-  double vec[3]={0.,-1.,0.};
-  double pt[3]={-0.3,-0.3,5.e-11};
-  const int N=32;
-  const double deltaA=M_PI/N;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.setIntersectionType(INTERP_KERNEL::Triangulation);
-  myInterpolator.setMaxDistance3DSurfIntersect(1e-9);
-  for(int i=0;i<N;i++)
-    {
-      res.clear();
-      MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_2();
-      sourceMesh->rotate(pt,vec,i*deltaA);
-      MEDCouplingUMesh *targetMesh=build3DSurfSourceMesh_2();
-      targetMesh->translate(vecTrans);
-      targetMesh->rotate(pt,vec,i*deltaA);
-      MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper(sourceMesh);
-      MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh);
-      myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-      CPPUNIT_ASSERT_EQUAL(2,(int)res.size());
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,sumAll(res),1e-12);
-      sourceMesh->decrRef();
-      targetMesh->decrRef();
-    }
-  //
-  myInterpolator.setMaxDistance3DSurfIntersect(1e-11);
-  for(int i=0;i<N;i++)
-    {
-      res.clear();
-      MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_2();
-      sourceMesh->rotate(pt,vec,i*deltaA);
-      MEDCouplingUMesh *targetMesh=build3DSurfSourceMesh_2();
-      targetMesh->translate(vecTrans);
-      targetMesh->rotate(pt,vec,i*deltaA);
-      MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper(sourceMesh);
-      MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh);
-      myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-      CPPUNIT_ASSERT_EQUAL(2,(int)res.size());
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,sumAll(res),1e-12);
-      sourceMesh->decrRef();
-      targetMesh->decrRef();
-    }
-  //
-  res.clear();
-  myInterpolator.setMaxDistance3DSurfIntersect(-1.);//unactivate fabien lookup
-  MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_2();
-  MEDCouplingUMesh *targetMesh=build3DSurfSourceMesh_2();
-  targetMesh->translate(vecTrans);
-  myInterpolator.setBoundingBoxAdjustment(1e-11);
-  MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper0(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper0(targetMesh);
-  myInterpolator.interpolateMeshes(sourceWrapper0,targetWrapper0,res,"P0P0");
-  CPPUNIT_ASSERT_EQUAL(2,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,sumAll(res),1e-12);
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-  //
-  res.clear();
-  sourceMesh=build3DSurfSourceMesh_2();
-  targetMesh=build3DSurfSourceMesh_2();
-  targetMesh->translate(vecTrans);
-  myInterpolator.setBoundingBoxAdjustment(1e-9);
-  MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper1(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper1(targetMesh);
-  myInterpolator.interpolateMeshes(sourceWrapper1,targetWrapper1,res,"P0P0");
-  CPPUNIT_ASSERT_EQUAL(2,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,sumAll(res),1e-12);
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-  //keeping the same bbox adj == 1.e-11 but trying rotation
-  res.clear();
-  sourceMesh=build3DSurfSourceMesh_2();
-  sourceMesh->rotate(pt,vec,M_PI/4.);
-  targetMesh=build3DSurfSourceMesh_2();
-  targetMesh->translate(vecTrans);
-  targetMesh->rotate(pt,vec,M_PI/4.);
-  myInterpolator.setBoundingBoxAdjustment(1e-11);
-  MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper2(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper2(targetMesh);
-  myInterpolator.interpolateMeshes(sourceWrapper2,targetWrapper2,res,"P0P0");
-  CPPUNIT_ASSERT_EQUAL(2,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,sumAll(res),1e-12);
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DInterpP0P0_1()
-{
-  MEDCouplingUMesh *sourceMesh=build3DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build3DTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-  CPPUNIT_ASSERT_EQUAL(8,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(8.e6,sumAll(res),1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(20833.33333333333,res[0][0],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(41666.66666666667,res[0][6],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(20833.33333333333,res[0][7],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(20833.33333333333,res[0][8],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(20833.33333333333,res[0][10],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(41666.66666666667,res[1][2],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(166666.6666666667,res[1][7],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(166666.6666666667,res[1][8],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(166666.6666666667,res[2][0],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(20833.33333333333,res[2][5],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(145833.3333333333,res[2][6],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(20833.33333333333,res[2][9],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(20833.33333333333,res[2][11],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(395833.3333333333,res[3][0],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(145833.3333333333,res[3][2],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(20833.33333333331,res[3][3],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(166666.6666666667,res[3][5],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(395833.3333333333,res[3][8],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(20833.33333333333,res[4][1],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(20833.33333333333,res[4][4],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(145833.3333333333,res[4][6],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(20833.33333333333,res[4][9],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(166666.6666666667,res[4][10],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(145833.3333333333,res[5][2],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(20833.33333333331,res[5][3],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(166666.6666666667,res[5][4],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(395833.3333333333,res[5][7],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(395833.3333333333,res[5][10],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(166666.6666666667,res[6][1],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(250000,res[6][6],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(541666.6666666667,res[6][9],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(166666.6666666667,res[6][11],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(83333.33333333331,res[7][0],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(479166.6666666667,res[7][1],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(333333.3333333333,res[7][2],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(624999.9999999997,res[7][3],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(479166.6666666667,res[7][4],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(479166.6666666667,res[7][5],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(83333.33333333333,res[7][6],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(83333.33333333331,res[7][7],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(83333.33333333333,res[7][8],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(83333.33333333333,res[7][9],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(83333.33333333331,res[7][10],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(479166.6666666667,res[7][11],1e-7);
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DInterpP0P0PL_1()
-{
-  MEDCouplingUMesh *sourceMesh=build3DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build3DTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-  CPPUNIT_ASSERT_EQUAL(8,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][6],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][7],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][8],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][10],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][7],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][8],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[2][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[2][6],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][8],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][6],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][10],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[5][7],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[5][10],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[6][9],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][4],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][5],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][11],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(21.,sumAll(res),1e-12);
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DInterpP0P0PL_2()
-{
-  MEDCouplingUMesh *sourceMesh=build3DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build3DTargetMesh_1();
-  std::vector<int> cellsIds(targetMesh->getNumberOfCells());
-  for(int i=0;i<targetMesh->getNumberOfCells();i++)
-    cellsIds[i]=i;
-  targetMesh->convertToPolyTypes(cellsIds);
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-  CPPUNIT_ASSERT_EQUAL(8,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][6],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][7],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][8],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][10],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][7],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][8],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[2][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[2][6],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][8],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][6],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][10],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[5][7],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[5][10],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[6][9],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][4],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][5],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][11],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(21.,sumAll(res),1e-12);
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DInterpP0P0PL_3()
-{
-  MEDCouplingUMesh *sourceMesh=build3DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build3DTargetMesh_1();
-  std::vector<int> cellsIds(sourceMesh->getNumberOfCells());
-  for(int i=0;i<sourceMesh->getNumberOfCells();i++)
-    cellsIds[i]=i;
-  sourceMesh->convertToPolyTypes(cellsIds);
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-  CPPUNIT_ASSERT_EQUAL(8,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][6],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][7],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][8],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][10],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][7],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][8],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[2][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[2][6],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][8],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][6],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][10],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[5][7],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[5][10],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[6][9],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][4],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][5],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][11],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(21.,sumAll(res),1e-12);
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DInterpP0P0PL_4()
-{
-  MEDCouplingUMesh *sourceMesh=build3DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build3DTargetMesh_1();
-  std::vector<int> cellsIds(sourceMesh->getNumberOfCells());
-  for(int i=0;i<sourceMesh->getNumberOfCells();i++)
-    cellsIds[i]=i;
-  sourceMesh->convertToPolyTypes(cellsIds);
-  cellsIds.resize(targetMesh->getNumberOfCells());
-  for(int j=0;j<targetMesh->getNumberOfCells();j++)
-    cellsIds[j]=j;
-  targetMesh->convertToPolyTypes(cellsIds);
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-  CPPUNIT_ASSERT_EQUAL(8,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][6],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][7],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][8],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][10],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][7],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][8],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[2][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[2][6],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][8],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][6],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][10],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[5][7],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[5][10],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[6][9],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][4],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][5],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][11],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(21.,sumAll(res),1e-12);
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DInterpP0P1_1()
-{
-  MEDCouplingUMesh *sourceMesh=build3DTargetMesh_1();
-  MEDCouplingUMesh *targetMesh=build3DSourceMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P1");
-  CPPUNIT_ASSERT_EQUAL(9,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(244444.4444444445,res[0][4],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(145833.3333333333,res[0][5],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(291666.6666666666,res[0][6],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(151388.8888888889,res[0][7],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(125000,res[1][0],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(140277.7777777778,res[1][1],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(119444.4444444444,res[1][2],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(151388.8888888889,res[1][3],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(119444.4444444444,res[1][4],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(151388.8888888889,res[1][5],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(26388.88888888889,res[1][6],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(348611.1111111111,res[2][6],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(151388.8888888888,res[2][7],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(244444.4444444444,res[3][2],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(145833.3333333334,res[3][3],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(291666.6666666666,res[3][6],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(151388.8888888889,res[3][7],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(536111.111111111,res[4][5],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(297222.2222222221,res[4][7],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(223611.1111111111,res[5][1],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(125000,res[5][3],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(125000,res[5][5],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(26388.88888888892,res[5][7],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(833333.333333333,res[6][7],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(536111.1111111109,res[7][3],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(297222.2222222221,res[7][7],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(11111.1111111111,res[8][1],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(11111.11111111111,res[8][2],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(166666.6666666666,res[8][3],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(11111.11111111111,res[8][4],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(166666.6666666667,res[8][5],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(166666.6666666667,res[8][6],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1466666.666666668,res[8][7],1e-7);
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DInterpP0P1PL_1()
-{
-  MEDCouplingUMesh *sourceMesh=build3DTargetMesh_1();
-  MEDCouplingUMesh *targetMesh=build3DSourceMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P1");
-  CPPUNIT_ASSERT_EQUAL(9,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][4],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[2][6],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][2],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][5],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[5][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[6][7],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[8][7],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(9.,sumAll(res),1e-12);
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DInterpP1P0_1()
-{
-  MEDCouplingUMesh *sourceMesh=build3DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build3DTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P0");
-  CPPUNIT_ASSERT_EQUAL(8,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(125000,res[0][1],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(140277.7777777778,res[1][1],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(223611.1111111111,res[1][5],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(11111.1111111111,res[1][8],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(119444.4444444444,res[2][1],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(244444.4444444445,res[2][3],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(11111.11111111111,res[2][8],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(151388.8888888889,res[3][1],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(145833.3333333333,res[3][3],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(125000,res[3][5],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(536111.1111111109,res[3][7],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(166666.6666666667,res[3][8],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(244444.4444444445,res[4][0],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(119444.4444444445,res[4][1],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(11111.11111111111,res[4][8],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(145833.3333333333,res[5][0],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(151388.8888888889,res[5][1],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(536111.1111111109,res[5][4],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(125000,res[5][5],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(166666.6666666666,res[5][8],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(291666.6666666666,res[6][0],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(26388.88888888889,res[6][1],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(348611.1111111112,res[6][2],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(291666.6666666667,res[6][3],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(166666.6666666666,res[6][8],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(151388.8888888889,res[7][0],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(151388.8888888889,res[7][2],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(151388.8888888889,res[7][3],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(297222.2222222221,res[7][4],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(26388.88888888892,res[7][5],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(833333.333333333,res[7][6],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(297222.2222222222,res[7][7],1e-7);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1466666.666666668,res[7][8],1e-7);
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DInterpP1P0PL_1()
-{
-  MEDCouplingUMesh *sourceMesh=build3DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build3DTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P0");
-  CPPUNIT_ASSERT_EQUAL(8,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(3.75,res[0][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.25,res[0][8],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[1][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][5],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[1][8],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[2][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[2][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[2][8],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[3][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][7],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[3][8],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[4][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[4][8],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[5][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[5][4],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5,res[5][8],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[6][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[6][2],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[6][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[6][8],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.25,res[7][6],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(3.75,res[7][8],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(21.,sumAll(res),1e-12);
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DInterpP1P1_1()
-{
-  MEDCouplingUMesh *sourceMesh=build3DSourceMesh_2();
-  MEDCouplingUMesh *targetMesh=build3DTargetMesh_2();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P1");
-  CPPUNIT_ASSERT_EQUAL(8,(int)res.size());
-  double res3D[8][28]= {{124999.999883775978, 245370.370390364464, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 203703.703634892299, 187500.000094145857, 0.0, 0.0, 4629.6296266718, 0.0, 215277.777751402784, 209722.222322299582, 0.0, 0.0, 0.0, 0.0, 104166.666590829205, 121296.296368812196, 0.0, 250000.000003472145},
-                        {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 120370.370368827047, 0.0, 0.0, 38888.888897777797, 0.0, 0.0, 45370.3703701697596, 0.0, 0.0, 45370.3703701697596, 83333.3333263888926, 0.0},
-                        {0.0, 0.0, 0.0, 97222.2222222221753, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 97222.2222222221608, 0.0, 97222.2222222222044, 41666.6666666666642, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-                        {0.0, 277777.777787084982, 199074.074074073927, 0.0, 0.0, 0.0, 4629.62962962962774, 0.0, 321759.259254934732, 83333.3333333333139, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 4629.62962667180363, 0.0, 0.0, 251388.88888319055, 194444.444454861077, 0.0, 79629.6296194135939, 250000.000003472145, 0.0, 0.0, 0.0, 0.0},
-                        {0.0, 0.0, 0.0, 0.0, 85185.1851851851534, 4629.62962962962774, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 118518.518518518511, 0.0, 41666.6666666666642, 83333.3333333333285, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-                        {0.0, 324074.07407629228, 0.0, 0.0, 0.0, 247685.185185184964, 6481.48148148147993, 0.0, 173611.11111196311, 0.0, 164814.814814814832, 0.0, 4629.62962962962865, 208333.33333418527, 0.0, 83333.3333333333285, 203703.703697273799, 249999.999999999767, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-                        {125000.000000000015, 423611.111111110775, 134259.259259259241, 194444.444444444351, 164814.814814814745, 164351.851851851825, 203703.703703703592, 249999.999999999825, 0.0, 0.0, 0.0, 0.0, 6481.48148148147902, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-                        {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 118518.518518518453, 0.0, 4629.62962962962956, 83333.3333333333139, 85185.1851851851825, 41666.6666666666642, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}};
-  int i=0;
-  double sum = 0;
-  //cout.precision(18);
-  for(std::vector<std::map<int,double> >::const_iterator iter1=res.begin();iter1!=res.end();iter1++,i++)
-    {
-      //cout<< "res3D[" <<i<< "][]={";
-      for(int j=0;j<28;j++)
-        {
-          std::map<int,double>::const_iterator iter2=(*iter1).find(j);
-          if(iter2!=(*iter1).end())
-            {
-              //cout<< iter2->second<< ", ";
-              sum += iter2->second;
-              CPPUNIT_ASSERT_DOUBLES_EQUAL(res3D[i][j],(*iter2).second,1.e-5);
-            }
-          else
-            {
-              //cout << "0.0, ";
-              CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,res3D[i][j],1e-14);
-            }
-        }
-      //cout << "}" << endl;
-    }
-  //cout << "Sum = " << sum << endl;
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(8000000,sum,1.e-5);
-  //clean-up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DInterpP1P1PL_1()
-{
-  MEDCouplingUMesh *sourceMesh=build3DSourceMesh_2();
-  MEDCouplingUMesh *targetMesh=build3DTargetMesh_2();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P1");
-  CPPUNIT_ASSERT_EQUAL(8,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(20.,res[0][24],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(2.,res[1][26],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[2][21],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(24.,res[3][23],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][14],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(24.,res[5][17],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(24.,res[6][7],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][11],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(97.,sumAll(res),1e-12);
-  //clean-up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DInterpP0P0Empty()
-{
-  MEDCouplingUMesh *sourceMesh=MEDCouplingUMesh::New();
-  sourceMesh->setMeshDimension(2);
-  sourceMesh->allocateCells(0);
-  sourceMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(0,0);
-  sourceMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  MEDCouplingUMesh *targetMesh=MEDCouplingUMesh::New();
-  targetMesh->setMeshDimension(2);
-  targetMesh->allocateCells(0);
-  targetMesh->finishInsertingCells();
-  myCoords=DataArrayDouble::New();
-  myCoords->alloc(0,2);
-  targetMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::testInterpolationCC()
-{
-  double arr1[3] = { 0/2., 1/2., 2/2. };
-  double arr2[4] = { 0/3, 1/3., 2/3., 3/3. };
-  MEDCouplingCMesh* mesh[2];
-  for ( int i = 0; i < 2; ++i )
-    {
-      const double* arr = i ? arr1 : arr2;
-      const int nb_coord = i ? 3 : 4;
-      DataArrayDouble* coords = DataArrayDouble::New();
-      coords->useArray( arr, /*ownership=*/false, CPP_DEALLOC, nb_coord, 1 );
-
-      mesh[i] = MEDCouplingCMesh::New();
-      mesh[i]->setCoords( coords, coords, coords );
-      coords->decrRef();
-    }
-  MEDCouplingNormalizedCartesianMesh<3> targetWrapper(mesh[1]);
-  MEDCouplingNormalizedCartesianMesh<3> sourceWrapper(mesh[0]);
-  CPPUNIT_ASSERT_EQUAL( 27,int( sourceWrapper.getNumberOfElements()));
-  CPPUNIT_ASSERT_EQUAL( 3, int( sourceWrapper.nbCellsAlongAxis(0)));
-  CPPUNIT_ASSERT_EQUAL( 3, int( sourceWrapper.nbCellsAlongAxis(1)));
-  CPPUNIT_ASSERT_EQUAL( 3, int( sourceWrapper.nbCellsAlongAxis(2)));
-  CPPUNIT_ASSERT_THROW( sourceWrapper.nbCellsAlongAxis(3), INTERP_KERNEL::Exception);
-
-  INTERP_KERNEL::InterpolationCC myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-
-  CPPUNIT_ASSERT_EQUAL(8,int( res.size()));
-  CPPUNIT_ASSERT_EQUAL(8,int( res[0].size()));
-  const double precis = 1e-7;
-  std::set<double> vals;
-  double sum = 0;
-  for ( int i = 0; i < (int)res.size(); ++i )
-    for ( std::map<int,double>::iterator s_v = res[i].begin(); s_v != res[i].end(); ++s_v)
-      {
-        sum += s_v->second;
-        double vvv;
-#ifdef WNT
-        double vv = s_v->second / precis;
-        if(vv>=0.0)
-          {
-            vvv = floor(vv+0.5);
-          }
-        else
-          {
-            vvv = ceil(vv-0.5);
-          }
-#else
-        vvv = round( s_v->second / precis );
-#endif
-        vals.insert( precis * vvv );
-      }
-  //cout << "tgt: " << i << " src: " << s_v->first << " - w: " << s_v->second << endl;
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0, sum, precis );
-
-  std::set<double>::iterator v = vals.begin();
-  CPPUNIT_ASSERT_EQUAL( 4, int( vals.size()) );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00462963, *v++, precis );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00925926, *v++, precis );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.01851850, *v++, precis );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03703700, *v++, precis );
-
-  mesh[0]->decrRef();
-  mesh[1]->decrRef();
-}
-
-void MEDCouplingBasicsTest::testInterpolationCU1D()
-{
-  MEDCouplingCMesh* meshC = MEDCouplingCMesh::New();
-  DataArrayDouble* coords = DataArrayDouble::New();
-  double arr[4] = { -1/3., 1/3., 2/3., 4/3. };
-  coords->useArray( arr, /*ownership=*/false, CPP_DEALLOC, 4, 1 );
-  meshC->setCoords( coords );
-  coords->decrRef();
-
-  MEDCouplingUMesh * meshU = buildCU1DMesh_U();
-
-  MEDCouplingNormalizedCartesianMesh<1>      sourceWrapper(meshC);
-  MEDCouplingNormalizedUnstructuredMesh<1,1> targetWrapper(meshU);
-  INTERP_KERNEL::InterpolationCU myInterpolator;
-  std::vector<std::map<int,double> > res;
-  const double precis = 1e-13;
-  myInterpolator.setPrecision(precis);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-
-//   std::cout.precision(18);
-//   for ( int i = 0; i < (int)res.size(); ++i )
-//     for ( std::map<int,double>::iterator s_v = res[i].begin(); s_v != res[i].end(); ++s_v)
-//     {
-//       std::cout << "CPPUNIT_ASSERT_DOUBLES_EQUAL( "<<s_v->second<<" ,res["<<i<<"]["<<s_v->first<<"],precis);"<<std::endl;
-//     }
-
-  double sum = sumAll(res);
-  CPPUNIT_ASSERT_EQUAL(3,int( res.size()));
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 1, sum, precis );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03333333333333 ,res[1][0],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.33333333333333 ,res[1][1],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.08333333333333 ,res[1][2],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.25000000000000 ,res[2][2],precis);
-
-  meshC->decrRef();
-  meshU->decrRef();
-}
-
-void MEDCouplingBasicsTest::testInterpolationCU2D()
-{
-  MEDCouplingCMesh* meshC = MEDCouplingCMesh::New();
-  DataArrayDouble* coords = DataArrayDouble::New();
-  double arr[4] = { -1/3., 1/3., 2/3., 4/3. };
-  coords->useArray( arr, /*ownership=*/false, CPP_DEALLOC, 4, 1 );
-  meshC->setCoords( coords, coords );
-  coords->decrRef();
-
-  MEDCouplingUMesh * meshU = buildCU2DMesh_U();
-
-  MEDCouplingNormalizedCartesianMesh<2>      sourceWrapper(meshC);
-  MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(meshU);
-  INTERP_KERNEL::InterpolationCU myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-
-  const double precis = 1e-7;
-  double sum = sumAll(res);
-  CPPUNIT_ASSERT_EQUAL(5,int( res.size()));
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 1, sum, precis );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.1111111 ,res[0][0],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0555556 ,res[0][1],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0555556 ,res[0][3],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0277778 ,res[0][4],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0555556 ,res[1][3],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0277778 ,res[1][4],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.1111111 ,res[1][6],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0555556 ,res[1][7],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0277778 ,res[2][4],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0555556 ,res[2][5],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0555556 ,res[2][7],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.1111111 ,res[2][8],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0416667 ,res[3][1],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0138889 ,res[3][2],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0277778 ,res[3][4],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0416667 ,res[3][5],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0138889 ,res[4][1],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0972222 ,res[4][2],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0138889 ,res[4][5],precis);
-
-  std::vector<std::map<int,double> > resRev;
-  myInterpolator.interpolateMeshesRev(targetWrapper,sourceWrapper,resRev,"P0P0");
-
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( res[0][0] ,resRev[0][0],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( res[0][1] ,resRev[1][0],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( res[3][1] ,resRev[1][3],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( res[4][1] ,resRev[1][4],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( res[3][2] ,resRev[2][3],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( res[4][2] ,resRev[2][4],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( res[0][3] ,resRev[3][0],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( res[1][3] ,resRev[3][1],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( res[0][4] ,resRev[4][0],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( res[1][4] ,resRev[4][1],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( res[2][4] ,resRev[4][2],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( res[3][4] ,resRev[4][3],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( res[2][5] ,resRev[5][2],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( res[3][5] ,resRev[5][3],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( res[4][5] ,resRev[5][4],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( res[1][6] ,resRev[6][1],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( res[1][7] ,resRev[7][1],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( res[2][7] ,resRev[7][2],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( res[2][8] ,resRev[8][2],precis);
-
-  meshC->decrRef();
-  meshU->decrRef();
-}
-
-void MEDCouplingBasicsTest::testInterpolationCU3D()
-{
-  MEDCouplingCMesh* meshC = MEDCouplingCMesh::New();
-  DataArrayDouble* coords = DataArrayDouble::New();
-  double arr[4] = { -1/3., 1/3., 2/3., 4/3. };
-  coords->useArray( arr, /*ownership=*/false, CPP_DEALLOC, 4, 1 );
-  meshC->setCoords( coords, coords, coords );
-  coords->decrRef();
-
-  MEDCouplingUMesh * meshU = buildCU3DMesh_U();
-
-  MEDCouplingNormalizedCartesianMesh<3>      sourceWrapper(meshC);
-  MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(meshU);
-  INTERP_KERNEL::InterpolationCU myInterpolator;
-  std::vector<std::map<int,double> > res;
-  const double precis = 1e-13;
-  myInterpolator.setPrecision(precis);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-
-  double sum = sumAll(res);
-  CPPUNIT_ASSERT_EQUAL(8,int( res.size()));
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 1, sum, precis );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.02700000000000 ,res[0][0],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00299999999999 ,res[1][0],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.02999999999999 ,res[1][1],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03000000000000 ,res[1][2],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00300000000000 ,res[2][0],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.02999999999999 ,res[2][3],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.02999999999999 ,res[2][6],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00033333333333 ,res[3][0],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00333333333333 ,res[3][1],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00333333333333 ,res[3][2],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00333333333333 ,res[3][3],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03333333333333 ,res[3][4],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03333333333333 ,res[3][5],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00333333333333 ,res[3][6],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03333333333333 ,res[3][7],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03333333333333 ,res[3][8],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00299999999999 ,res[4][0],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.02999999999999 ,res[4][9],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03000000000000 ,res[4][18],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00033333333333 ,res[5][0],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00333333333333 ,res[5][1],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00333333333333 ,res[5][2],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00333333333333 ,res[5][9],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03333333333333 ,res[5][10],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03333333333333 ,res[5][11],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00333333333333 ,res[5][18],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03333333333333 ,res[5][19],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03333333333333 ,res[5][20],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00033333333333 ,res[6][0],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00333333333333 ,res[6][3],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00333333333333 ,res[6][6],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00333333333333 ,res[6][9],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03333333333333 ,res[6][12],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03333333333333 ,res[6][15],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00333333333333 ,res[6][18],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03333333333333 ,res[6][21],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03333333333333 ,res[6][24],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 3.7037037037e-05 ,res[7][0],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00037037037037 ,res[7][1],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00037037037037 ,res[7][2],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00037037037037 ,res[7][3],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00370370370370 ,res[7][4],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00370370370370 ,res[7][5],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00037037037037 ,res[7][6],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00370370370370 ,res[7][7],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00370370370370 ,res[7][8],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00037037037037 ,res[7][9],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00370370370370 ,res[7][10],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00370370370370 ,res[7][11],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00370370370370 ,res[7][12],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03703703703703 ,res[7][13],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03703703703703 ,res[7][14],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00370370370370 ,res[7][15],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03703703703703 ,res[7][16],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03703703703703 ,res[7][17],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00037037037037 ,res[7][18],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00370370370370 ,res[7][19],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00370370370370 ,res[7][20],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00370370370370 ,res[7][21],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03703703703703 ,res[7][22],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03703703703703 ,res[7][23],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00370370370370 ,res[7][24],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03703703703703 ,res[7][25],precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.03703703703703 ,res[7][26],precis);
-
-
-  meshC->decrRef();
-  meshU->decrRef();
-}
-
-void MEDCouplingBasicsTest::test2DInterpP0IntegralUniform()
-{
-  MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  CPPUNIT_ASSERT_EQUAL(5,myInterpolator.toIntegralUniform(targetWrapper,res,"P0"));
-  CPPUNIT_ASSERT_EQUAL(1,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125,res[0][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125,res[0][2],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[0][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[0][4],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,sumAll(res),1e-12);
-  res.clear();
-  CPPUNIT_ASSERT_EQUAL(1,myInterpolator.fromIntegralUniform(targetWrapper,res,"P0"));
-  CPPUNIT_ASSERT_EQUAL(5,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125,res[1][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125,res[2][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[3][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[4][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,sumAll(res),1e-12);
-  res.clear();
-  targetMesh->decrRef();
-  //
-  targetMesh=build2DTargetMeshPerm_1();
-  MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper2(targetMesh);
-  INTERP_KERNEL::Interpolation2D myInterpolator2;
-  CPPUNIT_ASSERT(myInterpolator2.getMeasureAbsStatus());
-  CPPUNIT_ASSERT_EQUAL(5,myInterpolator2.toIntegralUniform(targetWrapper2,res,"P0"));
-  CPPUNIT_ASSERT_EQUAL(1,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125,res[0][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125,res[0][2],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[0][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[0][4],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,sumAll(res),1e-12);
-  res.clear();
-  myInterpolator2.setMeasureAbsStatus(false);
-  CPPUNIT_ASSERT(!myInterpolator2.getMeasureAbsStatus());
-  CPPUNIT_ASSERT_EQUAL(5,myInterpolator2.toIntegralUniform(targetWrapper2,res,"P0"));
-  CPPUNIT_ASSERT_EQUAL(1,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.125,res[0][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125,res[0][2],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[0][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[0][4],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.75,sumAll(res),1e-12);
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DSurfInterpP0IntegralUniform()
-{
-  MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_1();
-  INTERP_KERNEL::Interpolation3DSurf myInterpolator;
-  MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh);
-  std::vector<std::map<int,double> > res;
-  CPPUNIT_ASSERT_EQUAL(5,myInterpolator.toIntegralUniform(targetWrapper,res,"P0"));
-  CPPUNIT_ASSERT_EQUAL(1,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25*sqrt(2.),res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[0][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[0][2],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25*sqrt(2.),res[0][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25*sqrt(2.),res[0][4],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.*sqrt(2.),sumAll(res),1e-12);
-  res.clear();
-  CPPUNIT_ASSERT_EQUAL(1,myInterpolator.fromIntegralUniform(targetWrapper,res,"P0"));
-  CPPUNIT_ASSERT_EQUAL(5,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25*sqrt(2.),res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[1][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[2][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25*sqrt(2.),res[3][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25*sqrt(2.),res[4][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.*sqrt(2.),sumAll(res),1e-12);
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DInterpP0IntegralUniform()
-{
-  MEDCouplingUMesh *targetMesh=build3DTargetMesh_1();
-  INTERP_KERNEL::Interpolation3D myInterpolator;
-  MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh);
-  std::vector<std::map<int,double> > res;
-  CPPUNIT_ASSERT_EQUAL(8,myInterpolator.toIntegralUniform(targetWrapper,res,"P0"));
-  CPPUNIT_ASSERT_EQUAL(1,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(125000.,res[0][0],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(375000.,res[0][1],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(375000.,res[0][2],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1125000.,res[0][3],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(375000.,res[0][4],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1125000.,res[0][5],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1125000.,res[0][6],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(3375000.,res[0][7],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(8000000.,sumAll(res),1e-6);
-  res.clear();
-  CPPUNIT_ASSERT_EQUAL(1,myInterpolator.fromIntegralUniform(targetWrapper,res,"P0"));
-  CPPUNIT_ASSERT_EQUAL(8,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(125000.,res[0][0],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(375000.,res[1][0],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(375000.,res[2][0],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1125000.,res[3][0],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(375000.,res[4][0],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1125000.,res[5][0],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1125000.,res[6][0],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(3375000.,res[7][0],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(8000000.,sumAll(res),1e-6);
-  res.clear();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test2DInterpP1IntegralUniform()
-{
-  MEDCouplingUMesh *targetMesh=build2DSourceMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  CPPUNIT_ASSERT_EQUAL(4,myInterpolator.toIntegralUniform(targetWrapper,res,"P1"));
-  CPPUNIT_ASSERT_EQUAL(1,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.33333333333333331,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.16666666666666666,res[0][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.16666666666666666,res[0][2],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.33333333333333331,res[0][3],1e-12);
-  res.clear();
-  CPPUNIT_ASSERT_EQUAL(1,myInterpolator.fromIntegralUniform(targetWrapper,res,"P1"));
-  CPPUNIT_ASSERT_EQUAL(4,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.33333333333333331,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.16666666666666666,res[1][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.16666666666666666,res[2][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.33333333333333331,res[3][0],1e-12);
-  res.clear();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DInterpP1IntegralUniform()
-{
-  MEDCouplingUMesh *sourceMesh=build3DSourceMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(sourceMesh);
-  INTERP_KERNEL::Interpolation3D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  CPPUNIT_ASSERT_EQUAL(9,myInterpolator.toIntegralUniform(targetWrapper,res,"P1"));
-  CPPUNIT_ASSERT_EQUAL(1,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(833333.333333333,res[0][0],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(833333.333333333,res[0][1],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(500000.,res[0][2],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(833333.333333333,res[0][3],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(833333.333333333,res[0][4],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(500000.,res[0][5],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(833333.333333333,res[0][6],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(833333.333333333,res[0][7],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(2000000.,res[0][8],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(8000000.,sumAll(res),1e-6);
-  res.clear();
-  CPPUNIT_ASSERT_EQUAL(1,myInterpolator.fromIntegralUniform(targetWrapper,res,"P1"));
-  CPPUNIT_ASSERT_EQUAL(9,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(833333.333333333,res[0][0],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(833333.333333333,res[1][0],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(500000.,res[2][0],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(833333.333333333,res[3][0],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(833333.333333333,res[4][0],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(500000.,res[5][0],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(833333.333333333,res[6][0],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(833333.333333333,res[7][0],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(2000000.,res[8][0],1e-6);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(8000000.,sumAll(res),1e-6);
-  sourceMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test2DInterpP1P0Bary_1()
-{
-  MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2D myInterpolator;
-  myInterpolator.setP1P0BaryMethod(true);
-  std::vector<std::map<int,double> > res;
-  INTERP_KERNEL::IntersectionType types[2]={INTERP_KERNEL::Triangulation, INTERP_KERNEL::Geometric2D};
-  for(int i=0;i<2;i++)
-    {
-      myInterpolator.setPrecision(1e-12);
-      myInterpolator.setIntersectionType(types[i]);
-      myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P0");
-      CPPUNIT_ASSERT_EQUAL(5,(int)res.size());
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.16666666666666669,res[0][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.020833333333333343,res[0][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.020833333333333343,res[0][2],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664,res[0][3],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664,res[1][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0625,res[1][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.020833333333333343,res[1][3],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.020833333333333343,res[2][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0625,res[2][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664,res[2][3],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0625,res[3][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125,res[3][2],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0625,res[3][3],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664,res[4][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.020833333333333343,res[4][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.020833333333333343,res[4][2],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.16666666666666666,res[4][3],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,sumAll(res),1e-12);
-      res.clear();
-    }
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DSurfInterpP1P0Bary_1()
-{
-  MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3DSurf myInterpolator;
-  myInterpolator.setP1P0BaryMethod(true);
-  std::vector<std::map<int,double> > res;
-  INTERP_KERNEL::IntersectionType types[2]={INTERP_KERNEL::Triangulation, INTERP_KERNEL::Geometric2D};
-  for(int i=0;i<2;i++)
-    {
-      myInterpolator.setPrecision(1e-12);
-      myInterpolator.setIntersectionType(types[i]);
-      myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P0");
-      CPPUNIT_ASSERT_EQUAL(5,(int)res.size());
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.16666666666666669*sqrt(2.),res[0][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.020833333333333343*sqrt(2.),res[0][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.020833333333333343*sqrt(2.),res[0][2],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664*sqrt(2.),res[0][3],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664*sqrt(2.),res[1][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0625*sqrt(2.),res[1][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.020833333333333343*sqrt(2.),res[1][3],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.020833333333333343*sqrt(2.),res[2][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0625*sqrt(2.),res[2][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664*sqrt(2.),res[2][3],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0625*sqrt(2.),res[3][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.125*sqrt(2.),res[3][2],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0625*sqrt(2.),res[3][3],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.041666666666666664*sqrt(2.),res[4][0],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.020833333333333343*sqrt(2.),res[4][1],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.020833333333333343*sqrt(2.),res[4][2],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(0.16666666666666666*sqrt(2.),res[4][3],1e-12);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(1.*sqrt(2.),sumAll(res),1e-12);
-      res.clear();
-    }
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-#include <iomanip>
-void MEDCouplingBasicsTest::test3DInterpP1P0Bary_1()
-{
-  MEDCouplingUMesh *sourceMesh=build3DSourceMesh_2();
-  MEDCouplingUMesh *targetMesh=build3DTargetMesh_2();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3D myInterpolator;
-  myInterpolator.setP1P0BaryMethod(true);
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P0");
-  CPPUNIT_ASSERT_EQUAL(5,(int)res.size());
-
-  double res3D[5][28]={{104166.66658918398, 885416.666685817763, 135416.666666666541, 36458.3333333335031, 31249.9999999999018, 145833.333333333256, 41666.6666666667516, 124999.999999999971, 177083.333326388849, 0.0, 31249.9999999999636, 0.0, 41666.666620792399, 159722.22229009436, 0.0, 0.0, 41666.6666631944681, 125000, 43499.2283723790752, 164351.851924000395, 36458.3333372396883, 0.0, 0.0, 125000.000001736029, 34722.2221800900952, 13599.5370788455439, 0.0, 167438.27159690368},
-                       {0.0, 41666.6664479170649, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 125000.000161457952, 0.0, 0.0, 0.0, 0.0, 111111.11112005508, 0.0, 0.0, 291666.666656249959, 41666.6666666666933, 6944.4444415638809, 270833.333520485845, 0.0, 0.0, 124999.999989583303, 41666.6665798612958, 20833.3333186342825, 145833.333354303701, 83333.3333263888198, 27777.7777501651799},
-                       {0.0, 93750.0000000000728, 125000.000000000058, 0.0, 0.0, 72916.666666666526, 291666.666666666628, 41666.6666666667152, 197916.66666666657, 166666.666666666802, 218750.000000000116, 41666.6666666665697, 0.0, 0.0, 0.0, 0.0, 0.0, 41666.6666666666861, 0.0, 0.0, 0.0, 0.0, 0.0, 41666.6666666666642, 0.0, 0.0, 0.0, 0.0},
-                       {72916.6666484848247, 82465.2777799315081, 0.0, 0.0, 217447.916666666686, 197916.666666666802, 0.0, 41666.6666666666715, 0.0, 0.0, 0.0, 0.0, 290364.583310396119, 125000.000018181803, 41666.6666666666351, 166666.666666666599, 0.0, 41666.6666666665551, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 27777.7777734705051, 0.0, 0.0, 27777.7778028684952},
-                       {72916.6666461071727, 172309.027782170655, 70312.5000000000437, 253906.250000000029, 0.0, 0.0, 0.0, 41666.666666666657, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 258246.527775988478, 71180.5555571812583, 253906.250006944378, 41666.6666666666861, 0.0, 41666.6666649305407, 20833.3333186342534, 6944.44445267237552, 0.0, 27777.7777953707919}};
-
-  double sum = 0;
-  int i=0;
-  for(std::vector<std::map<int,double> >::const_iterator iter1=res.begin();iter1!=res.end();iter1++,i++)
-    {
-      for(int j=0;j<28;j++)
-        {
-          std::map<int,double>::const_iterator iter2=(*iter1).find(j);
-          if(iter2!=(*iter1).end())
-            {
-              sum += iter2->second;
-              CPPUNIT_ASSERT_DOUBLES_EQUAL(res3D[i][j],(*iter2).second,1.e-5);
-            }
-          else
-            {
-              CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,res3D[i][j],1e-14);
-            }
-        }
-    }
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(8000000,sum,1.e-5);
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3DTo1DInterpP0P0PL_1()
-{
-  MEDCouplingUMesh *sourceMesh=build3DTargetMesh_1();
-  MEDCouplingUMesh *targetMesh=build1DTargetMesh_1();
-  //
-  MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3D myInterpolator;
-  std::vector<std::map<int,double> > res;
-  myInterpolator.setPrecision(1e-12);
-  myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-  CPPUNIT_ASSERT_EQUAL(8,(int)res.size());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[0][0],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[1][4],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[2][1],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[3][5],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[4][2],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[5][6],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[6][3],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,res[7][7],1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(8.,sumAll(res),1e-12);
-  //
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test1DInterp_1()
-{
-  //      c1   c0    c2    - pay attention to cell order!
-  // S: o---o------o---o
-  // T:   o---o------o---o
-  //      n0  n1     n2  n3
-  //
-  // ---+---+------+---+---> X
-  //    0.  1.     3.  4.   
-  MEDCouplingUMesh *sourceMesh=build1DMesh(0);
-  MEDCouplingUMesh *targetMesh=build1DMesh(0.5);
-  //
-  MEDCouplingNormalizedUnstructuredMesh<1,1> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<1,1> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation1D myInterpolator;
-  const double precis = 1e-13;
-  myInterpolator.setPrecision(precis);
-
-  // P0P0
-  std::vector<std::map<int,double> > res;
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-  CPPUNIT_ASSERT_EQUAL( 3, int( res.size()) );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.5, res[0][0], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5, res[0][2], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5, res[1][0], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5, res[1][1], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5, res[2][2], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 3.5, sumAll(res), precis);
-
-  // P1P0
-  res.clear();
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P0");
-  CPPUNIT_ASSERT_EQUAL( 3, int( res.size()) );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5, res[0][1], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.5, res[0][2], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0, res[1][1], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5, res[2][3], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 3.5, sumAll(res), precis);
-
-  // P0P1
-  res.clear();
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P1");
-
-  CPPUNIT_ASSERT_EQUAL( 4, int( res.size()) );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5, res[0][1], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.5, res[1][0], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5, res[2][0], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0, res[2][2], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 3.5, sumAll(res), precis);
-
-  // P1P1
-  res.clear();
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P1");
-  CPPUNIT_ASSERT_EQUAL( 4, int( res.size()) );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5, res[0][1], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0, res[1][1], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5, res[1][2], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0, res[2][2], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5, res[2][3], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 3.5, sumAll(res), precis);
-
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test2DCurveInterpP0P0_1()
-{
-  // coincident meshes
-  MEDCouplingUMesh *sourceMesh=build2DCurveMesh(0,0);
-  MEDCouplingUMesh *targetMesh=build2DCurveMesh(0,0);
-  //
-  MEDCouplingNormalizedUnstructuredMesh<2,1> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<2,1> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2DCurve myInterpolator;
-  const double precis = 1e-13;
-  myInterpolator.setPrecision(precis);
-  std::vector<std::map<int,double> > res;
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-
-  CPPUNIT_ASSERT_EQUAL( 2, int( res.size()) );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( sqrt(2.),res[0][0], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 1., res[1][1], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.+sqrt(2.), sumAll(res), precis);
-
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test2DCurveInterpP0P0_2()
-{
-  // equal meshes shifted one from another along X by 0.5
-  MEDCouplingUMesh *sourceMesh=build2DCurveMesh(0.5,0);
-  MEDCouplingUMesh *targetMesh=build2DCurveMesh(0,0);
-  //
-  MEDCouplingNormalizedUnstructuredMesh<2,1> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<2,1> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2DCurve myInterpolator;
-  const double precis = 1e-13;
-  myInterpolator.setPrecision(precis);
-  myInterpolator.setMedianPlane(1.);// median line on target
-  std::vector<std::map<int,double> > res;
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0");
-
-  double tolInters = myInterpolator.getBoundingBoxAdjustmentAbs() * sqrt(2.);
-  CPPUNIT_ASSERT_EQUAL( 2, int( res.size()) );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0,res[0][0], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( tolInters,res[0][1], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5, res[1][1], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5+tolInters, sumAll(res), precis);
-
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test2DCurveInterpP0P1_1()
-{
-  // coincident meshes
-  MEDCouplingUMesh *sourceMesh=build2DCurveMesh(0,0);
-  MEDCouplingUMesh *targetMesh=build2DCurveMesh(0,0);
-  //
-  MEDCouplingNormalizedUnstructuredMesh<2,1> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<2,1> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2DCurve myInterpolator;
-  const double precis = 1e-13;
-  myInterpolator.setPrecision(precis);
-  std::vector<std::map<int,double> > res;
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P1");
-
-  const double len1 = 1., len0 = sqrt(2.);
-  CPPUNIT_ASSERT_EQUAL( 3, int( res.size()) );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5*len1, res[0][1], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5*len0, res[1][0], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5*len1, res[1][1], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5*len0, res[2][0], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( len0+len1, sumAll(res), precis);
-
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test2DCurveInterpP1P0_1()
-{
-  // coincident meshes
-  MEDCouplingUMesh *sourceMesh=build2DCurveMesh(0,0);
-  MEDCouplingUMesh *targetMesh=build2DCurveMesh(0,0);
-  //
-  MEDCouplingNormalizedUnstructuredMesh<2,1> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<2,1> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2DCurve myInterpolator;
-  const double precis = 1e-13;
-  myInterpolator.setPrecision(precis);
-  std::vector<std::map<int,double> > res;
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P0");
-
-  const double len1 = 1., len0 = sqrt(2.);
-  CPPUNIT_ASSERT_EQUAL( 2, int( res.size()) );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5*len1, res[1][0], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5*len0, res[0][1], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5*len1, res[1][1], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5*len0, res[0][2], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( len0+len1, sumAll(res), precis);
-
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test2DCurveInterpP1P1_1()
-{
-  // coincident meshes
-  MEDCouplingUMesh *sourceMesh=build2DCurveMesh(0,0);
-  MEDCouplingUMesh *targetMesh=build2DCurveMesh(0,0);
-  //
-  MEDCouplingNormalizedUnstructuredMesh<2,1> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<2,1> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2DCurve myInterpolator;
-  const double precis = 1e-13;
-  myInterpolator.setPrecision(precis);
-  std::vector<std::map<int,double> > res;
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P1");
-
-  const double len1 = 1., len0 = sqrt(2.);
-  CPPUNIT_ASSERT_EQUAL( 3, int( res.size()) );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5*len1, res[0][0], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5*(len0+len1), res[1][1], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5*len0, res[2][2], precis);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( len0+len1, sumAll(res), precis);
-
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
diff --git a/src/MEDCoupling/Test/MEDCouplingRemapperTest.cxx b/src/MEDCoupling/Test/MEDCouplingRemapperTest.cxx
deleted file mode 100644
index b7c30b712..000000000
--- a/src/MEDCoupling/Test/MEDCouplingRemapperTest.cxx
+++ /dev/null
@@ -1,986 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "MEDCouplingRemapperTest.hxx"
-#include "MEDCouplingUMesh.hxx"
-#include "MEDCouplingExtrudedMesh.hxx"
-#include "MEDCouplingFieldDouble.hxx"
-#include "MEDCouplingMemArray.hxx"
-#include "MEDCouplingRemapper.hxx"
-
-#include "MEDCouplingBasicsTest.hxx"
-
-#include <cmath>
-#include <numeric>
-
-using namespace ParaMEDMEM;
-
-void MEDCouplingRemapperTest::test2DInterpP0P0_1()
-{
-  MEDCouplingUMesh *sourceMesh=MEDCouplingBasicsTest::build2DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=MEDCouplingBasicsTest::build2DTargetMesh_1();
-  //
-  MEDCouplingRemapper remapper;
-  remapper.setPrecision(1e-12);
-  remapper.setIntersectionType(INTERP_KERNEL::Triangulation);
-  CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(sourceMesh,targetMesh,"P0P0"));
-  
-  MEDCouplingFieldDouble *srcField=MEDCouplingFieldDouble::New(ON_CELLS);
-  srcField->setNature(ConservativeVolumic);
-  srcField->setMesh(sourceMesh);
-  DataArrayDouble *array=DataArrayDouble::New();
-  array->alloc(sourceMesh->getNumberOfCells(),1);
-  srcField->setArray(array);
-  double *ptr=array->getPointer();
-  for(int i=0;i<sourceMesh->getNumberOfCells();i++)
-    ptr[i]=(double)(i+7);
-  array->decrRef();
-  MEDCouplingFieldDouble *trgfield=remapper.transferField(srcField,4.57);
-  const double *values=trgfield->getArray()->getConstPointer();
-  const double valuesExpected[5]={7.5 ,7. ,7.,8.,7.5};
-  CPPUNIT_ASSERT_EQUAL(5,trgfield->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgfield->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<5;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected[i0],values[i0],1e-12);
-  trgfield->decrRef();
-  //
-  srcField->setNature(IntegralGlobConstraint);
-  trgfield=remapper.transferField(srcField,4.57);
-  values=trgfield->getArray()->getConstPointer();
-  const double valuesExpected2[5]={3.75 ,1.75 ,1.75,4.,3.75};
-  CPPUNIT_ASSERT_EQUAL(5,trgfield->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgfield->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<5;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected2[i0],values[i0],1e-12);
-  trgfield->decrRef();
-  //
-  srcField->setNature(ConservativeVolumic);
-  trgfield=remapper.transferField(srcField,4.57);
-  values=trgfield->getArray()->getConstPointer();
-  CPPUNIT_ASSERT_EQUAL(5,trgfield->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgfield->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<5;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected[i0],values[i0],1e-12);
-  trgfield->decrRef();
-  //
-  srcField->setNature(IntegralGlobConstraint);
-  trgfield=remapper.transferField(srcField,4.57);
-  values=trgfield->getArray()->getConstPointer();
-  CPPUNIT_ASSERT_EQUAL(5,trgfield->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgfield->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<5;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected2[i0],values[i0],1e-12);
-  trgfield->decrRef();
-  //
-  srcField->setNature(Integral);
-  trgfield=remapper.transferField(srcField,4.57);
-  values=trgfield->getArray()->getConstPointer();
-  CPPUNIT_ASSERT_EQUAL(5,trgfield->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgfield->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<5;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected2[i0],values[i0],1e-12);
-  trgfield->decrRef();
-  //
-  srcField->setNature(RevIntegral);
-  trgfield=remapper.transferField(srcField,4.57);
-  values=trgfield->getArray()->getConstPointer();
-  CPPUNIT_ASSERT_EQUAL(5,trgfield->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgfield->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<5;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected[i0],values[i0],1e-12);
-  trgfield->decrRef();
-  //
-  srcField->decrRef();
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingRemapperTest::test2DInterpP0P0R_1()
-{
-  MEDCouplingUMesh *sourceMesh=MEDCouplingBasicsTest::build2DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=MEDCouplingBasicsTest::build2DTargetMesh_1();
-  //
-  MEDCouplingRemapper remapper;
-  remapper.setPrecision(1e-12);
-  remapper.setIntersectionType(INTERP_KERNEL::Triangulation);
-  CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(sourceMesh,targetMesh,"P0P0"));
-  
-  MEDCouplingFieldDouble *targetField=MEDCouplingFieldDouble::New(ON_CELLS);
-  targetField->setNature(ConservativeVolumic);
-  targetField->setMesh(sourceMesh);
-  DataArrayDouble *array=DataArrayDouble::New();
-  array->alloc(targetMesh->getNumberOfCells(),1);
-  targetField->setArray(array);
-  double *ptr=array->getPointer();
-  for(int i=0;i<targetMesh->getNumberOfCells();i++)
-    ptr[i]=(double)(i+7);
-  array->decrRef();
-  //
-  MEDCouplingFieldDouble *srcfield=remapper.reverseTransferField(targetField,4.57);
-  const double *values=srcfield->getArray()->getConstPointer();
-  const double valuesExpected[2]={8.75 ,9.5};
-  CPPUNIT_ASSERT_EQUAL(2,srcfield->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,srcfield->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<2;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected[i0],values[i0],1e-12);
-  srcfield->decrRef();
-  //
-  targetField->setNature(IntegralGlobConstraint);
-  srcfield=remapper.reverseTransferField(targetField,4.57);
-  values=srcfield->getArray()->getConstPointer();
-  const double valuesExpected2[2]={26., 19.};
-  CPPUNIT_ASSERT_EQUAL(2,srcfield->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,srcfield->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<2;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected2[i0],values[i0],1e-12);
-  srcfield->decrRef();
-  //
-  targetField->decrRef();
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingRemapperTest::test2DInterpMultiMethods()
-{
-  MEDCouplingUMesh *sourceMesh=MEDCouplingBasicsTest::build2DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=MEDCouplingBasicsTest::build2DTargetMesh_1();
-  //
-  MEDCouplingRemapper remapper;
-  remapper.setPrecision(1e-12);
-  remapper.setIntersectionType(INTERP_KERNEL::Triangulation);
-  CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(sourceMesh,targetMesh,"P0P0"));
-  
-  MEDCouplingFieldDouble *srcField=MEDCouplingFieldDouble::New(ON_CELLS);
-  srcField->setNature(ConservativeVolumic);
-  srcField->setMesh(sourceMesh);
-  DataArrayDouble *array=DataArrayDouble::New();
-  array->alloc(sourceMesh->getNumberOfCells(),1);
-  srcField->setArray(array);
-  double *ptr=array->getPointer();
-  for(int i=0;i<sourceMesh->getNumberOfCells();i++)
-    ptr[i]=(double)(i+7);
-  array->decrRef();
-  MEDCouplingFieldDouble *trgfield=remapper.transferField(srcField,4.57);
-  const double *values=trgfield->getArray()->getConstPointer();
-  const double valuesExpected[5]={7.5 ,7. ,7.,8.,7.5};
-  CPPUNIT_ASSERT_EQUAL(5,trgfield->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgfield->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<5;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected[i0],values[i0],1e-12);
-  trgfield->decrRef();
-  srcField->decrRef();
-  //
-  CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(sourceMesh,targetMesh,"P1P0"));
-  srcField=MEDCouplingFieldDouble::New(ON_NODES);
-  srcField->setNature(ConservativeVolumic);
-  srcField->setMesh(sourceMesh);
-  array=DataArrayDouble::New();
-  array->alloc(sourceMesh->getNumberOfNodes(),1);
-  srcField->setArray(array);
-  ptr=array->getPointer();
-  for(int i=0;i<sourceMesh->getNumberOfNodes();i++)
-    ptr[i]=(double)(i+7);
-  array->decrRef();
-  trgfield=remapper.transferField(srcField,4.57);
-  values=trgfield->getArray()->getConstPointer();
-  const double valuesExpected2[5]={7.,7.666666666666667,8.6666666666666661,8.8333333333333339,10.};
-  CPPUNIT_ASSERT_EQUAL(5,trgfield->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgfield->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<5;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected2[i0],values[i0],1e-12);
-  trgfield->decrRef();
-  srcField->decrRef();
-  //
-  CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(targetMesh,sourceMesh,"P0P1"));
-  srcField=MEDCouplingFieldDouble::New(ON_CELLS);
-  srcField->setNature(ConservativeVolumic);
-  srcField->setMesh(targetMesh);
-  array=DataArrayDouble::New();
-  array->alloc(targetMesh->getNumberOfCells(),1);
-  srcField->setArray(array);
-  ptr=array->getPointer();
-  for(int i=0;i<targetMesh->getNumberOfCells();i++)
-    ptr[i]=(double)(i+7);
-  array->decrRef();
-  trgfield=remapper.transferField(srcField,4.57);
-  values=trgfield->getArray()->getConstPointer();
-  const double valuesExpected3[4]={7.5,8.5,10.,10.625};
-  CPPUNIT_ASSERT_EQUAL(4,trgfield->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgfield->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<4;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected3[i0],values[i0],1e-12);
-  trgfield->decrRef();
-  srcField->decrRef();
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-  //
-  sourceMesh=MEDCouplingBasicsTest::build2DSourceMesh_1();
-  targetMesh=MEDCouplingBasicsTest::build2DTargetMesh_2();
-  CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(sourceMesh,targetMesh,"P1P1"));
-  srcField=MEDCouplingFieldDouble::New(ON_NODES);
-  srcField->setNature(ConservativeVolumic);
-  srcField->setMesh(sourceMesh);
-  array=DataArrayDouble::New();
-  array->alloc(sourceMesh->getNumberOfNodes(),1);
-  srcField->setArray(array);
-  ptr=array->getPointer();
-  for(int i=0;i<sourceMesh->getNumberOfNodes();i++)
-    ptr[i]=(double)(i+7);
-  array->decrRef();
-  trgfield=remapper.transferField(srcField,4.57);
-  values=trgfield->getArray()->getConstPointer();
-  const double valuesExpected4[9]={ 7.,7.35,8.,7.7,8.2857142857142865,
-                                    9.5333333333333332,9.,9.7666666666666657,10.};
-  CPPUNIT_ASSERT_EQUAL(9,trgfield->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgfield->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<9;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected4[i0],values[i0],1e-12);
-  trgfield->decrRef();
-  srcField->decrRef();
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingRemapperTest::testMultiDimCombi()
-{
-  // ------------- 2D
-  MEDCouplingUMesh *sourceMesh=MEDCouplingBasicsTest::build2DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=MEDCouplingBasicsTest::build2DTargetMesh_1();
-  //
-  MEDCouplingRemapper remapper;
-  remapper.setPrecision(1e-12);
-  remapper.setIntersectionType(INTERP_KERNEL::Triangulation);
-  CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(sourceMesh,targetMesh,"P0P0"));
-  MEDCouplingFieldDouble *srcField=MEDCouplingFieldDouble::New(ON_CELLS);
-  srcField->setNature(ConservativeVolumic);
-  srcField->setMesh(sourceMesh);
-  DataArrayDouble *array=DataArrayDouble::New();
-  array->alloc(sourceMesh->getNumberOfCells(),1);
-  srcField->setArray(array);
-  double *ptr=array->getPointer();
-  for(int i=0;i<sourceMesh->getNumberOfCells();i++)
-    ptr[i]=(double)(i+7);
-  array->decrRef();
-  MEDCouplingFieldDouble *trgField=remapper.transferField(srcField,4.57);
-  const double *values=trgField->getArray()->getConstPointer();
-  const double valuesExpected[5]={7.5 ,7. ,7.,8.,7.5};
-  CPPUNIT_ASSERT_EQUAL(5,trgField->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgField->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<5;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected[i0],values[i0],1e-12);
-  trgField->decrRef();
-  srcField->decrRef();
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-  // ------------- 3D Surf
-  sourceMesh=MEDCouplingBasicsTest::build3DSurfSourceMesh_1();
-  targetMesh=MEDCouplingBasicsTest::build3DSurfTargetMesh_1();
-  CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(sourceMesh,targetMesh,"P0P0"));
-  srcField=MEDCouplingFieldDouble::New(ON_CELLS);
-  srcField->setNature(ConservativeVolumic);
-  srcField->setMesh(sourceMesh);
-  array=DataArrayDouble::New();
-  array->alloc(sourceMesh->getNumberOfCells(),1);
-  srcField->setArray(array);
-  ptr=array->getPointer();
-  for(int i=0;i<sourceMesh->getNumberOfCells();i++)
-    ptr[i]=(double)(i+8);
-  array->decrRef();
-  trgField=remapper.transferField(srcField,4.57);
-  CPPUNIT_ASSERT_EQUAL(5,trgField->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgField->getArray()->getNumberOfComponents());
-  const double valuesExpected2[5]={8.5,8.,8.,9.,8.5};
-  values=trgField->getArray()->getConstPointer();
-  for(int i0=0;i0<5;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected2[i0],values[i0],1e-12);
-  trgField->decrRef();
-  srcField->decrRef();
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-  // ------------- 3D
-  sourceMesh=MEDCouplingBasicsTest::build3DSourceMesh_1();
-  targetMesh=MEDCouplingBasicsTest::build3DTargetMesh_1();
-  CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(sourceMesh,targetMesh,"P0P0"));
-  srcField=MEDCouplingFieldDouble::New(ON_CELLS);
-  srcField->setNature(ConservativeVolumic);
-  srcField->setMesh(sourceMesh);
-  array=DataArrayDouble::New();
-  array->alloc(sourceMesh->getNumberOfCells(),1);
-  srcField->setArray(array);
-  ptr=array->getPointer();
-  for(int i=0;i<sourceMesh->getNumberOfCells();i++)
-    ptr[i]=(double)(i+7);
-  array->decrRef();
-  trgField=remapper.transferField(srcField,4.57);
-  CPPUNIT_ASSERT_EQUAL(8,trgField->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgField->getArray()->getNumberOfComponents());
-  const double valuesExpected3[8]={13.166666666666668, 13.888888888888888, 10.722222222222223, 10.870370370370372,
-                                   14.555555555555555, 13.888888888888889, 14.444444444444443, 11.72222222222222};
-  values=trgField->getArray()->getConstPointer();
-  for(int i0=0;i0<8;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected3[i0],values[i0],1e-12);
-  trgField->decrRef();
-  srcField->decrRef();
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-  // ------------- 3D -> 1D
-  sourceMesh=MEDCouplingBasicsTest::build3DTargetMesh_1();
-  targetMesh=MEDCouplingBasicsTest::build1DTargetMesh_1();
-  remapper.setIntersectionType(INTERP_KERNEL::PointLocator);
-  CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(sourceMesh,targetMesh,"P0P0"));
-  srcField=MEDCouplingFieldDouble::New(ON_CELLS);
-  srcField->setNature(ConservativeVolumic);
-  srcField->setMesh(sourceMesh);
-  array=DataArrayDouble::New();
-  array->alloc(sourceMesh->getNumberOfCells(),1);
-  srcField->setArray(array);
-  ptr=array->getPointer();
-  for(int i=0;i<sourceMesh->getNumberOfCells();i++)
-    ptr[i]=(double)(i+7);
-  array->decrRef();
-  trgField=remapper.transferField(srcField,4.57);
-  CPPUNIT_ASSERT_EQUAL(8,trgField->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgField->getArray()->getNumberOfComponents());
-  const double valuesExpected4[8]={7.,11.,8.,12.,9.,13.,10.,14.};
-  values=trgField->getArray()->getConstPointer();
-  for(int i0=0;i0<8;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected4[i0],values[i0],1e-12);
-  trgField->decrRef();
-  srcField->decrRef();
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-  // ------------- 1D -> 3D
-  sourceMesh=MEDCouplingBasicsTest::build1DTargetMesh_1();
-  targetMesh=MEDCouplingBasicsTest::build3DTargetMesh_1();
-  remapper.setIntersectionType(INTERP_KERNEL::PointLocator);
-  CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(sourceMesh,targetMesh,"P0P0"));
-  srcField=MEDCouplingFieldDouble::New(ON_CELLS);
-  srcField->setNature(ConservativeVolumic);
-  srcField->setMesh(sourceMesh);
-  array=DataArrayDouble::New();
-  array->alloc(sourceMesh->getNumberOfCells(),1);
-  srcField->setArray(array);
-  ptr=array->getPointer();
-  for(int i=0;i<sourceMesh->getNumberOfCells();i++)
-    ptr[i]=(double)(i+7);
-  array->decrRef();
-  trgField=remapper.transferField(srcField,4.57);
-  CPPUNIT_ASSERT_EQUAL(8,trgField->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgField->getArray()->getNumberOfComponents());
-  const double valuesExpected5[8]={7.,9.,11.,13.,8.,10.,12.,14.};
-  values=trgField->getArray()->getConstPointer();
-  for(int i0=0;i0<8;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected5[i0],values[i0],1e-12);
-  trgField->decrRef();
-  srcField->decrRef();
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-  // ------------- 2D -> 1D
-  sourceMesh=MEDCouplingBasicsTest::build2DTargetMesh_1();
-  targetMesh=build1DTargetMesh_2();
-  remapper.setIntersectionType(INTERP_KERNEL::PointLocator);
-  CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(sourceMesh,targetMesh,"P0P0"));
-  srcField=MEDCouplingFieldDouble::New(ON_CELLS);
-  srcField->setNature(ConservativeVolumic);
-  srcField->setMesh(sourceMesh);
-  array=DataArrayDouble::New();
-  array->alloc(sourceMesh->getNumberOfCells(),1);
-  srcField->setArray(array);
-  ptr=array->getPointer();
-  for(int i=0;i<sourceMesh->getNumberOfCells();i++)
-    ptr[i]=(double)(i+7);
-  array->decrRef();
-  trgField=remapper.transferField(srcField,4.57);
-  const double valuesExpected8[5]={9.,8.,11.,7.,11.};
-  values=trgField->getArray()->getConstPointer();
-  for(int i0=0;i0<5;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected8[i0],values[i0],1e-12);
-  trgField->decrRef();
-  srcField->decrRef();
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-  // ------------- 1D -> 2D
-  sourceMesh=build1DTargetMesh_2();
-  targetMesh=MEDCouplingBasicsTest::build2DTargetMesh_1();
-  remapper.setIntersectionType(INTERP_KERNEL::PointLocator);
-  CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(sourceMesh,targetMesh,"P0P0"));
-  srcField=MEDCouplingFieldDouble::New(ON_CELLS);
-  srcField->setNature(ConservativeVolumic);
-  srcField->setMesh(sourceMesh);
-  array=DataArrayDouble::New();
-  array->alloc(sourceMesh->getNumberOfCells(),1);
-  srcField->setArray(array);
-  ptr=array->getPointer();
-  for(int i=0;i<sourceMesh->getNumberOfCells();i++)
-    ptr[i]=(double)(i+7);
-  array->decrRef();
-  trgField=remapper.transferField(srcField,4.57);
-  const double valuesExpected9[5]={10.,8.,7.,4.57,10.};
-  values=trgField->getArray()->getConstPointer();
-  for(int i0=0;i0<5;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected9[i0],values[i0],1e-12);
-  trgField->decrRef();
-  srcField->decrRef();
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-  // ------------- 2D -> -1D
-  sourceMesh=MEDCouplingBasicsTest::build2DTargetMesh_1();
-  targetMesh=MEDCouplingUMesh::New("an example of -1 D mesh",-1);
-  srcField=MEDCouplingFieldDouble::New(ON_CELLS);
-  srcField->setNature(ConservativeVolumic);
-  srcField->setMesh(sourceMesh);
-  array=DataArrayDouble::New();
-  array->alloc(sourceMesh->getNumberOfCells(),1);
-  srcField->setArray(array);
-  ptr=array->getPointer();
-  for(int i=0;i<sourceMesh->getNumberOfCells();i++)
-    ptr[i]=(double)(i+7);
-  array->decrRef();
-  CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(sourceMesh,targetMesh,"P0P0"));
-  trgField=remapper.transferField(srcField,4.57);
-  values=trgField->getArray()->getConstPointer();
-  CPPUNIT_ASSERT_EQUAL(1,trgField->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgField->getNumberOfComponents());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(9.125,values[0],1e-14);
-  srcField->decrRef();
-  srcField=remapper.reverseTransferField(trgField,4.220173);
-  CPPUNIT_ASSERT_EQUAL(5,srcField->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,srcField->getNumberOfComponents());
-  values=srcField->getArray()->getConstPointer();
-  for(int i0=0;i0<5;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(9.125,values[i0],1e-14);
-  srcField->decrRef();
-  trgField->setNature(Integral);
-  srcField=remapper.reverseTransferField(trgField,4.220173);
-  CPPUNIT_ASSERT_EQUAL(5,srcField->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,srcField->getNumberOfComponents());
-  values=srcField->getArray()->getConstPointer();
-  const double valuesExpected6[5]={2.28125,1.140625,1.140625,2.28125,2.28125};
-  for(int i0=0;i0<5;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected6[i0],values[i0],1e-14);
-  srcField->decrRef();
-  trgField->decrRef();
-  // ------------- -1D -> 2D
-  CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(targetMesh,sourceMesh,"P0P0"));
-  trgField=MEDCouplingFieldDouble::New(ON_CELLS);
-  trgField->setNature(ConservativeVolumic);
-  trgField->setMesh(targetMesh);
-  array=DataArrayDouble::New();
-  array->alloc(targetMesh->getNumberOfCells(),1);
-  trgField->setArray(array);
-  ptr=array->getPointer();
-  ptr[0]=7.;
-  array->decrRef();
-  srcField=remapper.transferField(trgField,4.221073);
-  values=srcField->getArray()->getConstPointer();
-  for(int i0=0;i0<5;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(7.,values[i0],1e-14);
-  srcField->decrRef();
-  trgField->setNature(IntegralGlobConstraint);
-  srcField=remapper.transferField(trgField,4.221073);
-  values=srcField->getArray()->getConstPointer();
-  const double valuesExpected7[5]={1.75,0.875,0.875,1.75,1.75};
-  for(int i0=0;i0<5;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected7[i0],values[i0],1e-14);
-  srcField->decrRef();
-  trgField->setNature(Integral);
-  srcField=remapper.transferField(trgField,4.221073);
-  values=srcField->getArray()->getConstPointer();
-  for(int i0=0;i0<5;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected7[i0],values[i0],1e-14);
-  //
-  srcField->decrRef();
-  trgField->decrRef();
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingRemapperTest::testNatureOfField()
-{
-  MEDCouplingUMesh *sourceMesh=MEDCouplingBasicsTest::build2DSourceMesh_1();
-  MEDCouplingUMesh *targetMesh=build2DTargetMesh_3();
-  //
-  MEDCouplingRemapper remapper;
-  remapper.setPrecision(1e-12);
-  remapper.setIntersectionType(INTERP_KERNEL::Triangulation);
-  CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(sourceMesh,targetMesh,"P0P0"));
-  MEDCouplingFieldDouble *srcField=MEDCouplingFieldDouble::New(ON_CELLS);
-  srcField->setNature(ConservativeVolumic);
-  srcField->setMesh(sourceMesh);
-  DataArrayDouble *array=DataArrayDouble::New();
-  array->alloc(sourceMesh->getNumberOfCells(),1);
-  srcField->setArray(array);
-  double *ptr=array->getPointer();
-  for(int i=0;i<sourceMesh->getNumberOfCells();i++)
-    ptr[i]=(double)(i+7);
-  array->decrRef();
-  MEDCouplingFieldDouble *trgfield=remapper.transferField(srcField,4.220173);
-  const double *values=trgfield->getArray()->getConstPointer();
-  const double valuesExpected[4]={7.75, 7.0625, 4.220173,8.0};
-  CPPUNIT_ASSERT_EQUAL(4,trgfield->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgfield->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<4;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected[i0],values[i0],1e-12);
-  trgfield->decrRef();
-  //
-  srcField->setNature(IntegralGlobConstraint);
-  trgfield=remapper.transferField(srcField,4.220173);
-  values=trgfield->getArray()->getConstPointer();
-  const double valuesExpected2[4]={2.8374999999999999, 7.3624999999999998, 4.220173, 4.7999999999999998};
-  CPPUNIT_ASSERT_EQUAL(4,trgfield->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgfield->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<4;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected2[i0],values[i0],1e-12);
-  trgfield->decrRef();
-  //
-  srcField->setNature(Integral);
-  trgfield=remapper.transferField(srcField,4.220173);
-  values=trgfield->getArray()->getConstPointer();
-  const double valuesExpected3[4]={1.24, 4.5199999999999996, 4.220173, 1.9199999999999999};
-  CPPUNIT_ASSERT_EQUAL(4,trgfield->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgfield->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<4;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected3[i0],values[i0],1e-12);
-  trgfield->decrRef();
-  //
-  srcField->setNature(RevIntegral);
-  trgfield=remapper.transferField(srcField,4.220173);
-  values=trgfield->getArray()->getConstPointer();
-  const double valuesExpected9[4]={2.48, 3.766666666666666, 4.220173, 1.9199999999999999};
-  CPPUNIT_ASSERT_EQUAL(4,trgfield->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgfield->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<4;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected9[i0],values[i0],1e-12);
-  trgfield->decrRef();
-  //
-  srcField->decrRef();
-  // REVERSE ***********
-  trgfield=MEDCouplingFieldDouble::New(ON_CELLS);
-  trgfield->setNature(ConservativeVolumic);
-  trgfield->setMesh(targetMesh);
-  array=DataArrayDouble::New();
-  array->alloc(targetMesh->getNumberOfCells(),1);
-  trgfield->setArray(array);
-  ptr=array->getPointer();
-  for(int i=0;i<targetMesh->getNumberOfCells();i++)
-    ptr[i]=(double)(i+7);
-  array->decrRef();
-  srcField=remapper.reverseTransferField(trgfield,4.220173);
-  values=srcField->getArray()->getConstPointer();
-  const double valuesExpected4[2]={7.9375, 8.9};
-  CPPUNIT_ASSERT_EQUAL(2,srcField->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,srcField->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<2;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected4[i0],values[i0],1e-12);
-  srcField->decrRef();
-  //
-  trgfield->decrRef();
-  //
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-  // REVERSE ALL
-  sourceMesh=build2DTargetMesh_3();
-  targetMesh=MEDCouplingBasicsTest::build2DSourceMesh_1();
-  //
-  CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(sourceMesh,targetMesh,"P0P0"));
-  srcField=MEDCouplingFieldDouble::New(ON_CELLS);
-  srcField->setNature(ConservativeVolumic);
-  srcField->setMesh(sourceMesh);
-  array=DataArrayDouble::New();
-  array->alloc(sourceMesh->getNumberOfCells(),1);
-  srcField->setArray(array);
-  ptr=array->getPointer();
-  for(int i=0;i<sourceMesh->getNumberOfCells();i++)
-    ptr[i]=(double)(i+7);
-  array->decrRef();
-  trgfield=remapper.transferField(srcField,4.220173);
-  values=trgfield->getArray()->getConstPointer();
-  const double valuesExpected5[2]={7.9375, 8.9};
-  CPPUNIT_ASSERT_EQUAL(2,trgfield->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgfield->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<2;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected5[i0],values[i0],1e-12);
-  trgfield->decrRef();
-  //
-  srcField->setNature(IntegralGlobConstraint);
-  trgfield=remapper.transferField(srcField,4.220173);
-  values=trgfield->getArray()->getConstPointer();
-  const double valuesExpected6[4]={9.25, 15.75};
-  CPPUNIT_ASSERT_EQUAL(2,trgfield->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgfield->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<2;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected6[i0],values[i0],1e-12);
-  trgfield->decrRef();
-  //
-  srcField->setNature(Integral);
-  trgfield=remapper.transferField(srcField,4.220173);
-  values=trgfield->getArray()->getConstPointer();
-  const double valuesExpected7[2]={4.56, 4.3466666666666667};
-  CPPUNIT_ASSERT_EQUAL(2,trgfield->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgfield->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<2;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected7[i0],values[i0],1e-12);
-  trgfield->decrRef();
-  //
-  srcField->setNature(RevIntegral);
-  trgfield=remapper.transferField(srcField,4.220173);
-  values=trgfield->getArray()->getConstPointer();
-  const double valuesExpected10[2]={5.08, 3.56};
-  CPPUNIT_ASSERT_EQUAL(2,trgfield->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,trgfield->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<2;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected10[i0],values[i0],1e-12);
-  trgfield->decrRef();
-  //
-  srcField->decrRef();
-  // REVERSE ***********
-  trgfield=MEDCouplingFieldDouble::New(ON_CELLS);
-  trgfield->setNature(ConservativeVolumic);
-  trgfield->setMesh(targetMesh);
-  array=DataArrayDouble::New();
-  array->alloc(targetMesh->getNumberOfCells(),1);
-  trgfield->setArray(array);
-  ptr=array->getPointer();
-  for(int i=0;i<targetMesh->getNumberOfCells();i++)
-    ptr[i]=(double)(i+7);
-  array->decrRef();
-  srcField=remapper.reverseTransferField(trgfield,4.220173);
-  values=srcField->getArray()->getConstPointer();
-  const double valuesExpected8[4]={7.75, 7.0625,4.220173, 8.0};
-  CPPUNIT_ASSERT_EQUAL(4,srcField->getArray()->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,srcField->getArray()->getNumberOfComponents());
-  for(int i0=0;i0<4;i0++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected8[i0],values[i0],1e-12);
-  srcField->decrRef();
-  //
-  trgfield->decrRef();
-  //
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingRemapperTest::testExtruded()
-{
-  MEDCouplingUMesh *mesh2DS=0;
-  MEDCouplingUMesh *mesh3DS=build3DExtrudedUMesh_1(mesh2DS);
-  MEDCouplingExtrudedMesh *extS=MEDCouplingExtrudedMesh::New(mesh3DS,mesh2DS,1);
-  mesh3DS->decrRef();
-  mesh2DS->decrRef();
-  MEDCouplingUMesh *mesh2DT=0;
-  MEDCouplingUMesh *mesh3DT=build3DExtrudedUMesh_1(mesh2DT);
-  MEDCouplingExtrudedMesh *extT=MEDCouplingExtrudedMesh::New(mesh3DT,mesh2DT,1);
-  //
-  //
-  mesh3DT->decrRef();
-  mesh2DT->decrRef();
-  //
-  extS->decrRef();
-  extT->decrRef();
-}
-
-void MEDCouplingRemapperTest::testExtruded2()
-{
-  MEDCouplingUMesh *meshN,*meshTT,*meshTF;
-  MEDCouplingBasicsTest::build3DExtrudedUMesh_2(meshN,meshTT,meshTF);
-  std::vector<int> n;
-  double pt[3]={300.,300.,0.};
-  double v[3]={0.,0.,2.};
-  meshN->findNodesOnPlane(pt,v,1e-12,n);
-  MEDCouplingUMesh *meshN2D=(MEDCouplingUMesh *)meshN->buildFacePartOfMySelfNode(&n[0],&n[0]+n.size(),true);
-  n.clear();
-  bool b=false;
-  DataArrayInt *da=meshTT->mergeNodes(1e-12,b);
-  CPPUNIT_ASSERT(b);
-  da->decrRef();
-  meshTT->findNodesOnPlane(pt,v,1e-12,n);
-  MEDCouplingUMesh *meshTT2D=(MEDCouplingUMesh *)meshTT->buildFacePartOfMySelfNode(&n[0],&n[0]+n.size(),true);
-  n.clear();
-  meshTF->findNodesOnPlane(pt,v,1e-12,n);
-  MEDCouplingUMesh *meshTF2D=(MEDCouplingUMesh *)meshTF->buildFacePartOfMySelfNode(&n[0],&n[0]+n.size(),true);
-  n.clear();
-  //
-  MEDCouplingExtrudedMesh *meshNE=MEDCouplingExtrudedMesh::New(meshN,meshN2D,0);
-  MEDCouplingExtrudedMesh *meshTTE=MEDCouplingExtrudedMesh::New(meshTT,meshTT2D,0);
-  MEDCouplingExtrudedMesh *meshTFE=MEDCouplingExtrudedMesh::New(meshTF,meshTF2D,0);
-  //
-  MEDCouplingRemapper remapper;
-  remapper.setPrecision(1e-12);
-  remapper.setIntersectionType(INTERP_KERNEL::Geometric2D);
-  CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(meshNE,meshTTE,"P0P0"));
-  MEDCouplingFieldDouble *srcField=MEDCouplingFieldDouble::New(ON_CELLS);
-  srcField->setNature(IntegralGlobConstraint);
-  srcField->setMesh(meshNE);
-  DataArrayDouble *array=DataArrayDouble::New();
-  array->alloc(meshNE->getNumberOfCells(),1);
-  srcField->setArray(array);
-  double vals1[40]={
-    1000.,1000.,1020.,1030.,1040.,1000.,1000.,1070.,1080.,1090.,1000.,1000.,1120.,1130.,1140.,1000.,1000.,1170.,1180.,1190.,
-    2000.,2000.,2020.,2030.,2040.,2000.,2000.,2070.,2080.,2090.,2000.,2000.,2120.,2130.,2140.,2000.,2000.,2170.,2180.,2190.,
-  };
-  CPPUNIT_ASSERT_EQUAL((int)(sizeof(vals1)/sizeof(double)),meshNE->getNumberOfCells());
-  std::copy(vals1,vals1+meshNE->getNumberOfCells(),array->getPointer());
-  array->decrRef();
-  MEDCouplingFieldDouble *trgField=remapper.transferField(srcField,4.220173);
-  double expected1[200]={
-    800.,800.,800.,800.,800.,800.,800.,800.,800.,800.,1600.,1600.,1600.,1600.,1600.,1600.,1600.,1600.,1600.,1600.,
-    102.,102.,102.,102.,102.,102.,102.,102.,102.,102.,202.,202.,202.,202.,202.,202.,202.,202.,202.,202.,
-    103.,103.,103.,103.,103.,103.,103.,103.,103.,103.,203.,203.,203.,203.,203.,203.,203.,203.,203.,203.,
-    104.,104.,104.,104.,104.,104.,104.,104.,104.,104.,204.,204.,204.,204.,204.,204.,204.,204.,204.,204.,
-    219.,219.,219.,219.,219.,219.,219.,219.,219.,219.,419.,419.,419.,419.,419.,419.,419.,419.,419.,419.,
-    221.,221.,221.,221.,221.,221.,221.,221.,221.,221.,421.,421.,421.,421.,421.,421.,421.,421.,421.,421.,
-    223.,223.,223.,223.,223.,223.,223.,223.,223.,223.,423.,423.,423.,423.,423.,423.,423.,423.,423.,423.,
-    117.,117.,117.,117.,117.,117.,117.,117.,117.,117.,217.,217.,217.,217.,217.,217.,217.,217.,217.,217.,
-    118.,118.,118.,118.,118.,118.,118.,118.,118.,118.,218.,218.,218.,218.,218.,218.,218.,218.,218.,218.,
-    119.,119.,119.,119.,119.,119.,119.,119.,119.,119.,219.,219.,219.,219.,219.,219.,219.,219.,219.,219.
-    };
-  for(int i=0;i<200;i++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],trgField->getArray()->getConstPointer()[i],1e-3);//1e-3 precision due to non coincidence in 1D mesh
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(std::accumulate(expected1,expected1+200,0.),std::accumulate(vals1,vals1+40,0.),1e-10);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(std::accumulate(expected1,expected1+200,0.),std::accumulate(trgField->getArray()->getConstPointer(),trgField->getArray()->getConstPointer()+200,0.),1e-10);
-  trgField->decrRef();
-  //
-  CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(meshNE,meshTFE,"P0P0"));
-  trgField=remapper.transferField(srcField,4.220173);
-  double expected2[340]={25.5, 51.25, 51.75, 26., 79., 158.75, 160.25, 80.5, 85.25, 171.25, 172.75, 86.75, 29.25, 58.75, 59.25, 29.75, 25.5, 51.25, 51.75, 26., 79., 158.75,
-                         160.25, 80.5, 85.25, 171.25, 172.75, 86.75, 29.25, 58.75, 59.25, 29.75, 25.5, 51.25, 51.75, 26., 79., 158.75, 160.25, 80.5, 85.25, 171.25, 172.75, 86.75,
-                         29.25, 58.75, 59.25, 29.75, 25.5, 51.25, 51.75, 26., 79., 158.75, 160.25, 80.5, 85.25, 171.25, 172.75, 86.75, 29.25, 58.75, 59.25, 29.75, 25.5, 51.25, 51.75,
-                         26., 79., 158.75, 160.25, 80.5, 85.25, 171.25, 172.75, 86.75, 29.25, 58.75, 59.25, 29.75, 25.5, 51.25, 51.75, 26., 79., 158.75, 160.25, 80.5, 85.25, 171.25,
-                         172.75, 86.75, 29.25, 58.75, 59.25, 29.75, 25.5, 51.25, 51.75, 26., 79., 158.75, 160.25, 80.5, 85.25, 171.25, 172.75, 86.75, 29.25, 58.75, 59.25, 29.75, 25.5,
-                         51.25, 51.75, 26., 79., 158.75, 160.25, 80.5, 85.25, 171.25, 172.75, 86.75, 29.25, 58.75, 59.25, 29.75, 25.5, 51.25, 51.75, 26., 79., 158.75, 160.25, 80.5,
-                         85.25, 171.25, 172.75, 86.75, 29.25, 58.75, 59.25, 29.75, 25.5, 51.25, 51.75, 26., 79., 158.75, 160.25, 80.5, 85.25, 171.25, 172.75, 86.75, 29.25, 58.75, 59.25,
-                         29.75, 50.5, 101.25, 101.75, 51., 154., 308.75, 310.25, 155.5, 160.25, 321.25, 322.75, 161.75, 54.25, 108.75, 109.25, 54.75, 50.5, 101.25, 101.75, 51., 154.,
-                         308.75, 310.25, 155.5, 160.25, 321.25, 322.75, 161.75, 54.25, 108.75, 109.25, 54.75, 50.5, 101.25, 101.75, 51., 154., 308.75, 310.25, 155.5, 160.25, 321.25, 322.75,
-                         161.75, 54.25, 108.75, 109.25, 54.75, 50.5, 101.25, 101.75, 51., 154., 308.75, 310.25, 155.5, 160.25, 321.25, 322.75, 161.75, 54.25, 108.75, 109.25, 54.75, 50.5,
-                         101.25, 101.75, 51., 154., 308.75, 310.25, 155.5, 160.25, 321.25, 322.75, 161.75, 54.25, 108.75, 109.25, 54.75, 50.5, 101.25, 101.75, 51., 154., 308.75, 310.25,
-                         155.5, 160.25, 321.25, 322.75, 161.75, 54.25, 108.75, 109.25, 54.75, 50.5, 101.25, 101.75, 51., 154., 308.75, 310.25, 155.5, 160.25, 321.25, 322.75, 161.75, 54.25,
-                         108.75, 109.25, 54.75, 50.5, 101.25, 101.75, 51., 154., 308.75, 310.25, 155.5, 160.25, 321.25, 322.75, 161.75, 54.25, 108.75, 109.25, 54.75, 50.5, 101.25, 101.75,
-                         51., 154., 308.75, 310.25, 155.5, 160.25, 321.25, 322.75, 161.75, 54.25, 108.75, 109.25, 54.75, 50.5, 101.25, 101.75, 51., 154., 308.75, 310.25, 155.5, 160.25, 321.25,
-                         322.75, 161.75, 54.25, 108.75, 109.25, 54.75, 800., 800., 800., 800., 800., 800., 800., 800., 800., 800., 1600., 1600., 1600., 1600., 1600., 1600., 1600.,
-                         1600., 1600., 1600.};
-  for(int i=0;i<340;i++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(expected2[i],trgField->getArray()->getConstPointer()[i],1e-3);//1e-3 precision due to non coincidence in 1D mesh
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(std::accumulate(expected2,expected2+340,0.),std::accumulate(vals1,vals1+40,0.),1e-10);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(std::accumulate(expected2,expected2+340,0.),std::accumulate(trgField->getArray()->getConstPointer(),trgField->getArray()->getConstPointer()+340,0.),1e-10);
-  trgField->decrRef();
-  srcField->decrRef();
-  //
-  double vals2[200]={
-    100., 200., 300., 400., 500., 600., 700., 800., 900., 1000., 1100., 1200., 1300., 1400., 1500., 1600., 1700., 1800., 1900., 2000,
-    101., 201., 301., 401., 501., 601., 701., 801., 901., 1001., 1101., 1201., 1301., 1401., 1501., 1601., 1701., 1801., 1901., 2001,
-    102., 202., 302., 402., 502., 602., 702., 802., 902., 1002., 1102., 1202., 1302., 1402., 1502., 1602., 1702., 1802., 1902., 2002,
-    103., 203., 303., 403., 503., 603., 703., 803., 903., 1003., 1103., 1203., 1303., 1403., 1503., 1603., 1703., 1803., 1903., 2003,
-    104., 204., 304., 404., 504., 604., 704., 804., 904., 1004., 1104., 1204., 1304., 1404., 1504., 1604., 1704., 1804., 1904., 2004,
-    105., 205., 305., 405., 505., 605., 705., 805., 905., 1005., 1105., 1205., 1305., 1405., 1505., 1605., 1705., 1805., 1905., 2005,
-    106., 206., 306., 406., 506., 606., 706., 806., 906., 1006., 1106., 1206., 1306., 1406., 1506., 1606., 1706., 1806., 1906., 2006,
-    107., 207., 307., 407., 507., 607., 707., 807., 907., 1007., 1107., 1207., 1307., 1407., 1507., 1607., 1707., 1807., 1907., 2007,
-    108., 208., 308., 408., 508., 608., 708., 808., 908., 1008., 1108., 1208., 1308., 1408., 1508., 1608., 1708., 1808., 1908., 2008,
-    109., 209., 309., 409., 509., 609., 709., 809., 909., 1009., 1109., 1209., 1309., 1409., 1509., 1609., 1709., 1809., 1909., 2009.
-  };
-  CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(meshNE,meshTTE,"P0P0"));
-  trgField=MEDCouplingFieldDouble::New(ON_CELLS);
-  trgField->setNature(ConservativeVolumic);
-  trgField->setMesh(meshTTE);
-  array=DataArrayDouble::New();
-  array->alloc(meshTTE->getNumberOfCells(),1);
-  trgField->setArray(array);
-  std::copy(vals2,vals2+meshTTE->getNumberOfCells(),array->getPointer());
-  array->decrRef();
-  srcField=remapper.reverseTransferField(trgField,4.220173);
-  double expected3[40]={
-    550.,550.,551.,552.,553.,550.,550.,554.,555.,556.,550.,550.,554.,555.,556.,550.,550.,557.,558.,559.,
-    1550.,1550.,1551.,1552.,1553.,1550.,1550.,1554.,1555.,1556.,1550.,1550.,1554.,1555.,1556.,1550.,1550.,1557.,1558.,1559.
-  };
-  for(int i=0;i<40;i++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(expected3[i],srcField->getArray()->getConstPointer()[i],1e-3);//1e-3 precision due to non coincidence in 1D mesh
-  srcField->decrRef();
-  trgField->decrRef();
-  //
-  double vals3[340]={
-    100., 101., 102., 103., 104., 105., 106., 107., 108., 109., 110., 111., 112., 113., 114., 115.,
-    200., 201., 202., 203., 204., 205., 206., 207., 208., 209., 210., 211., 212., 213., 214., 215.,
-    300., 301., 302., 303., 304., 305., 306., 307., 308., 309., 310., 311., 312., 313., 314., 315.,
-    400., 401., 402., 403., 404., 405., 406., 407., 408., 409., 410., 411., 412., 413., 414., 415.,
-    500., 501., 502., 503., 504., 505., 506., 507., 508., 509., 510., 511., 512., 513., 514., 515.,
-    600., 601., 602., 603., 604., 605., 606., 607., 608., 609., 610., 611., 612., 613., 614., 615.,
-    700., 701., 702., 703., 704., 705., 706., 707., 708., 709., 710., 711., 712., 713., 714., 715.,
-    800., 801., 802., 803., 804., 805., 806., 807., 808., 809., 810., 811., 812., 813., 814., 815.,
-    900., 901., 902., 903., 904., 905., 906., 907., 908., 909., 910., 911., 912., 913., 914., 915.,
-    1000., 1001., 1002., 1003., 1004., 1005., 1006., 1007., 1008., 1009., 1010., 1011., 1012., 1013., 1014., 1015.,
-    1100., 1101., 1102., 1103., 1104., 1105., 1106., 1107., 1108., 1109., 1110., 1111., 1112., 1113., 1114., 1115.,
-    1200., 1201., 1202., 1203., 1204., 1205., 1206., 1207., 1208., 1209., 1210., 1211., 1212., 1213., 1214., 1215.,
-    1300., 1301., 1302., 1303., 1304., 1305., 1306., 1307., 1308., 1309., 1310., 1311., 1312., 1313., 1314., 1315.,
-    1400., 1401., 1402., 1403., 1404., 1405., 1406., 1407., 1408., 1409., 1410., 1411., 1412., 1413., 1414., 1415.,
-    1500., 1501., 1502., 1503., 1504., 1505., 1506., 1507., 1508., 1509., 1510., 1511., 1512., 1513., 1514., 1515.,
-    1600., 1601., 1602., 1603., 1604., 1605., 1606., 1607., 1608., 1609., 1610., 1611., 1612., 1613., 1614., 1615.,
-    1700., 1701., 1702., 1703., 1704., 1705., 1706., 1707., 1708., 1709., 1710., 1711., 1712., 1713., 1714., 1715.,
-    1800., 1801., 1802., 1803., 1804., 1805., 1806., 1807., 1808., 1809., 1810., 1811., 1812., 1813., 1814., 1815.,
-    1900., 1901., 1902., 1903., 1904., 1905., 1906., 1907., 1908., 1909., 1910., 1911., 1912., 1913., 1914., 1915.,
-    2000., 2001., 2002., 2003., 2004., 2005., 2006., 2007., 2008., 2009., 2010., 2011., 2012., 2013., 2014., 2015.,
-    116.,216.,316.,416.,516.,616.,716.,816.,916.,1016.,1116.,1216.,1316.,1416.,1516.,1616.,1716.,1816.,1916.,2016.
-  };
-  CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(meshNE,meshTFE,"P0P0"));
-  trgField=MEDCouplingFieldDouble::New(ON_CELLS);
-  trgField->setNature(ConservativeVolumic);
-  trgField->setMesh(meshTFE);
-  array=DataArrayDouble::New();
-  array->alloc(meshTFE->getNumberOfCells(),1);
-  trgField->setArray(array);
-  std::copy(vals3,vals3+meshTFE->getNumberOfCells(),array->getPointer());
-  array->decrRef();
-  srcField=remapper.reverseTransferField(trgField,4.220173);
-  double expected4[40]={
-    566.,566.,552.5,553.5,554.5,566.,566.,554.5,555.5,556.5,566.,566.,558.5,559.5,560.5,566.,566.,560.5,561.5,562.5,
-    1566.,1566.,1552.5,1553.5,1554.5,1566.,1566.,1554.5,1555.5,1556.5,1566.,1566.,1558.5,1559.5,1560.5,1566.,1566.,1560.5,1561.5,1562.5
-  };
-  for(int i=0;i<40;i++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(expected4[i],srcField->getArray()->getConstPointer()[i],1e-3);//1e-3 precision due to non coincidence in 1D mesh
-  srcField->decrRef();
-  trgField->decrRef();
-  //
-  meshN2D->decrRef();
-  meshTT2D->decrRef();
-  meshTF2D->decrRef();
-  meshNE->decrRef();
-  meshTTE->decrRef();
-  meshTFE->decrRef();
-  meshN->decrRef();
-  meshTT->decrRef();
-  meshTF->decrRef();
-}
-
-MEDCouplingUMesh *MEDCouplingRemapperTest::build1DTargetMesh_2()
-{
-  double targetCoords[20]={
-    0.59,0.09, 0.69,0.19, 0.21,-0.29,0.31,-0.19, 0.45,0.25,0.65,0.45,
-    -0.2,-0.2,0.11,0.11, 0.25,0.25, 0.45,0.45
-  };
-  int targetConn[10]={0,1, 2,3, 4,5, 6,7, 8,9};
-
-  MEDCouplingUMesh *targetMesh=MEDCouplingUMesh::New("my name of mesh 1D 2",1);
-  targetMesh->allocateCells(5);
-  for(int i=0;i<5;i++)
-    targetMesh->insertNextCell(INTERP_KERNEL::NORM_SEG2,2,targetConn+2*i);
-  targetMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(10,2);
-  std::copy(targetCoords,targetCoords+20,myCoords->getPointer());
-  targetMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return targetMesh;
-}
-
-MEDCouplingUMesh *MEDCouplingRemapperTest::build2DTargetMesh_3()
-{
-  double targetCoords[20]={-0.6,-0.4, -0.1,-0.4, 1.1,-0.4, 2.1,-0.4,
-                           -0.6,0.1,  -0.1,0.1,  1.1,0.1,  2.1,0.1,
-                           -0.6,1.1,  -0.1,1.1};
-  int targetConn[16]={0,4,5,1, 1,5,6,2, 2,6,7,3, 4,8,9,5};
-  MEDCouplingUMesh *targetMesh=MEDCouplingUMesh::New();
-  targetMesh->setMeshDimension(2);
-  targetMesh->allocateCells(4);
-  for(int i=0;i<4;i++)
-    targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+4*i);
-  targetMesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(10,2);
-  std::copy(targetCoords,targetCoords+20,myCoords->getPointer());
-  targetMesh->setCoords(myCoords);
-  myCoords->decrRef();
-  return targetMesh;
-}
-
-MEDCouplingUMesh *MEDCouplingRemapperTest::build3DExtrudedUMesh_1(MEDCouplingUMesh *&mesh2D)
-{
-  double coords[180]={
-    0.,0.,0., 1.,1.,0., 1.,1.25,0., 0.,1.,0., 1.,1.5,0., 2.,0.,0., 2.,1.,0., 1.,2.,0., 0.,2.,0., 3.,1.,0.,
-    3.,2.,0., 0.,1.,0., 1.,3.,0., 2.,2.,0., 2.,3.,0.,
-    0.,0.,1., 1.,1.,1., 1.,1.25,1., 0.,1.,1., 1.,1.5,1., 2.,0.,1., 2.,1.,1., 1.,2.,1., 0.,2.,1., 3.,1.,1.,
-    3.,2.,1., 0.,1.,1., 1.,3.,1., 2.,2.,1., 2.,3.,1.,
-    0.,0.,2., 1.,1.,2., 1.,1.25,2., 0.,1.,2., 1.,1.5,2., 2.,0.,2., 2.,1.,2., 1.,2.,2., 0.,2.,2., 3.,1.,2.,
-    3.,2.,2., 0.,1.,2., 1.,3.,2., 2.,2.,2., 2.,3.,2.,
-    0.,0.,3., 1.,1.,3., 1.,1.25,3., 0.,1.,3., 1.,1.5,3., 2.,0.,3., 2.,1.,3., 1.,2.,3., 0.,2.,3., 3.,1.,3.,
-    3.,2.,3., 0.,1.,3., 1.,3.,3., 2.,2.,3., 2.,3.,3.};
-
-  int conn[354]={
-    // 0
-    0,11,1,3,15,26,16,18,   1,2,4,7,13,6,-1,1,16,21,6,-1,6,21,28,13,-1,13,7,22,28,-1,7,4,19,22,-1,4,2,17,19,-1,2,1,16,17,-1,16,21,28,22,19,17,
-    1,6,5,3,16,21,20,18,   13,10,9,6,28,25,24,21,
-    11,8,7,4,2,1,-1,11,26,16,1,-1,1,16,17,2,-1,2,17,19,4,-1,4,19,22,7,-1,7,8,23,22,-1,8,11,26,23,-1,26,16,17,19,22,23,
-    7,12,14,13,22,27,29,28,
-    // 1
-    15,26,16,18,30,41,31,33,   16,17,19,22,28,21,-1,16,31,36,21,-1,21,36,43,28,-1,28,22,37,43,-1,22,19,34,37,-1,19,17,32,34,-1,17,16,31,32,-1,31,36,43,37,34,32,
-    16,21,20,18,31,36,35,33,   28,25,24,21,43,40,39,36,
-    26,23,22,19,17,16,-1,26,41,31,16,-1,16,31,32,17,-1,17,32,34,19,-1,19,34,37,22,-1,22,23,38,37,-1,23,26,41,38,-1,41,31,32,34,37,38,
-    22,27,29,28,37,42,44,43,
-    // 2
-    30,41,31,33,45,56,46,48,  31,32,34,37,43,36,-1,31,46,51,36,-1,36,51,58,43,-1,43,37,52,58,-1,37,34,49,52,-1,34,32,47,49,-1,32,31,46,47,-1,46,51,58,52,49,47,
-    31,36,35,33,46,51,50,48,  43,40,39,36,58,55,54,51,
-    41,38,37,34,32,31,-1,41,56,46,31,-1,31,46,47,32,-1,32,47,49,34,-1,34,49,52,37,-1,37,38,53,52,-1,38,41,56,53,-1,56,46,47,49,52,53,
-    37,42,44,43,52,57,59,58
-  };
-  int conn2[28]={7,12,14,13, 11,8,7,4,2,1, 13,10,9,6, 1,6,5,3, 1,2,4,7,13,6, 0,11,1,3};
-  //
-  MEDCouplingUMesh *ret=MEDCouplingUMesh::New();
-  ret->setMeshDimension(3);
-  ret->allocateCells(18);
-  //
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn);
-  ret->insertNextCell(INTERP_KERNEL::NORM_POLYHED,43,conn+8);
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+51);
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+59);
-  ret->insertNextCell(INTERP_KERNEL::NORM_POLYHED,43,conn+67);
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+110);
-  //
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+118);
-  ret->insertNextCell(INTERP_KERNEL::NORM_POLYHED,43,conn+126);
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+169);
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+177);
-  ret->insertNextCell(INTERP_KERNEL::NORM_POLYHED,43,conn+185);
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+228);
-  //
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+236);
-  ret->insertNextCell(INTERP_KERNEL::NORM_POLYHED,43,conn+244);
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+287);
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+295);
-  ret->insertNextCell(INTERP_KERNEL::NORM_POLYHED,43,conn+303);
-  ret->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+346);
-  //
-  ret->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(60,3);
-  std::copy(coords,coords+180,myCoords->getPointer());
-  ret->setCoords(myCoords);
-  //
-  mesh2D=MEDCouplingUMesh::New();
-  mesh2D->setMeshDimension(2);
-  mesh2D->allocateCells(6);
-  mesh2D->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn2);
-  mesh2D->insertNextCell(INTERP_KERNEL::NORM_POLYGON,6,conn2+4);
-  mesh2D->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn2+10);
-  mesh2D->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn2+14);
-  mesh2D->insertNextCell(INTERP_KERNEL::NORM_POLYGON,6,conn2+18);
-  mesh2D->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn2+24);
-  mesh2D->setCoords(myCoords);
-  myCoords->decrRef();
-  return ret;
-}
diff --git a/src/MEDCoupling/Test/MEDCouplingRemapperTest.hxx b/src/MEDCoupling/Test/MEDCouplingRemapperTest.hxx
deleted file mode 100644
index 61dc0e701..000000000
--- a/src/MEDCoupling/Test/MEDCouplingRemapperTest.hxx
+++ /dev/null
@@ -1,58 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __MEDCOUPLINGREMAPPERTEST_HXX__
-#define __MEDCOUPLINGREMAPPERTEST_HXX__
-
-#include <cppunit/extensions/HelperMacros.h>
-
-#include <map>
-#include <vector>
-
-namespace ParaMEDMEM
-{
-  class MEDCouplingUMesh;
-
-  class MEDCouplingRemapperTest : public CppUnit::TestFixture
-  {
-    CPPUNIT_TEST_SUITE(MEDCouplingRemapperTest);
-    CPPUNIT_TEST( test2DInterpP0P0_1 );
-    CPPUNIT_TEST( test2DInterpP0P0R_1 );
-    CPPUNIT_TEST( test2DInterpMultiMethods );
-    CPPUNIT_TEST( testMultiDimCombi );
-    CPPUNIT_TEST( testNatureOfField );
-    CPPUNIT_TEST( testExtruded );
-    CPPUNIT_TEST( testExtruded2 );
-    CPPUNIT_TEST_SUITE_END();
-  public:
-    void test2DInterpP0P0_1();
-    void test2DInterpP0P0R_1();
-    void test2DInterpMultiMethods();
-    void testMultiDimCombi();
-    void testNatureOfField();
-    void testExtruded();
-    void testExtruded2();
-  private:
-    static MEDCouplingUMesh *build1DTargetMesh_2();
-    static MEDCouplingUMesh *build2DTargetMesh_3();
-    static MEDCouplingUMesh *build3DExtrudedUMesh_1(MEDCouplingUMesh *&mesh2D);
-  };
-}
-
-#endif
diff --git a/src/MEDCoupling/Test/TestMEDCouplingRemapper.cxx b/src/MEDCoupling/Test/TestMEDCouplingRemapper.cxx
deleted file mode 100644
index 80b233001..000000000
--- a/src/MEDCoupling/Test/TestMEDCouplingRemapper.cxx
+++ /dev/null
@@ -1,25 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "CppUnitTest.hxx"
-#include "MEDCouplingRemapperTest.hxx"
-
-CPPUNIT_TEST_SUITE_REGISTRATION( ParaMEDMEM::MEDCouplingRemapperTest );
-
-#include "BasicMainTest.hxx"
diff --git a/src/MEDCoupling/MEDCouplingTimeLabel.cxx b/src/MEDCoupling/TimeLabel.cxx
similarity index 91%
rename from src/MEDCoupling/MEDCouplingTimeLabel.cxx
rename to src/MEDCoupling/TimeLabel.cxx
index dad0d5900..df03416ec 100644
--- a/src/MEDCoupling/MEDCouplingTimeLabel.cxx
+++ b/src/MEDCoupling/TimeLabel.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,8 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-#include "MEDCouplingTimeLabel.hxx"
+#include "TimeLabel.hxx"
 
 using namespace ParaMEDMEM;
 
@@ -25,10 +24,6 @@ unsigned int TimeLabel::GLOBAL_TIME=0;
 
 TimeLabel::TimeLabel():_time(GLOBAL_TIME++)
 {
-}
-
-TimeLabel::~TimeLabel()
-{
 }
 
  TimeLabel& TimeLabel::operator=(const TimeLabel& other)
diff --git a/src/MEDCoupling/MEDCouplingTimeLabel.hxx b/src/MEDCoupling/TimeLabel.hxx
similarity index 88%
rename from src/MEDCoupling/MEDCouplingTimeLabel.hxx
rename to src/MEDCoupling/TimeLabel.hxx
index 2a8facca7..f0fd6e71f 100644
--- a/src/MEDCoupling/MEDCouplingTimeLabel.hxx
+++ b/src/MEDCoupling/TimeLabel.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,19 +16,16 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #ifndef __PARAMEDMEM_TIMELABEL_HXX__
 #define __PARAMEDMEM_TIMELABEL_HXX__
 
-#include "MEDCoupling.hxx"
-
 namespace ParaMEDMEM
 {
   /*!
    * Class representing a label of time of the lastely modified part of this.
    * More _time is high more the object has been modified recently.
    */
-  class MEDCOUPLING_EXPORT TimeLabel
+  class TimeLabel
   {
   public:
     TimeLabel& operator=(const TimeLabel& other);
@@ -36,10 +33,8 @@ namespace ParaMEDMEM
     void declareAsNew();
     //! This method should be called on high level classes as Field or Mesh to take into acount modifications done in aggragates objects.
     virtual void updateTime() = 0;
-    unsigned int getTimeOfThis() const { return _time; }
   protected:
     TimeLabel();
-    virtual ~TimeLabel();
     void updateTimeWith(const TimeLabel& other);
   private:
     static unsigned int GLOBAL_TIME;
diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py
deleted file mode 100644
index 98db6b0d5..000000000
--- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py
+++ /dev/null
@@ -1,85 +0,0 @@
-#  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2010  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
-#
-
-from libMEDCoupling_Swig import *
-import unittest
-
-class MEDCouplingBasicsTest(unittest.TestCase):
-    def testMesh(self):
-        tab4=[1, 2, 8, 7, 2, 3, 9, 8, 3,
-              4, 10, 9, 4, 5, 11, 10, 5,
-              0, 6, 11, 0, 1, 7, 6 ]
-        nbOfNodes=12
-        nbOfCells=6
-        coords=[ 0.024155, 0.04183768725682622, -0.305, 0.04831000000000001, -1.015761910347357e-17,
-                 -0.305, 0.09662000000000001, -1.832979297858306e-18, -0.305, 0.120775, 0.04183768725682623,
-                 -0.305, 0.09662000000000001, 0.08367537451365245, -0.305, 0.04831000000000001, 0.08367537451365246,
-                 -0.305, 0.024155, 0.04183768725682622, -0.2863, 0.04831000000000001, -1.015761910347357e-17, -0.2863, 
-                 0.09662000000000001, -1.832979297858306e-18, -0.2863, 0.120775, 0.04183768725682623, -0.2863, 0.09662000000000001,
-                 0.08367537451365245, -0.2863, 0.04831000000000001, 0.08367537451365246, -0.2863 ]
-        mesh=MEDCouplingUMesh.New()
-        mesh.setMeshDimension(2)
-        mesh.allocateCells(8);
-        mesh.setName("mesh1")
-        self.failUnless(mesh.getName()=="mesh1")
-        for i in range(nbOfCells):
-            mesh.insertNextCell(NORM_QUAD4,4,tab4[4*i:4*(i+1)]);
-            pass
-        mesh.finishInsertingCells()
-        self.failUnless(mesh.getNumberOfCells()==nbOfCells)
-        self.failUnless(mesh.getNodalConnectivity().getNbOfElems()==30)
-        self.failUnless(mesh.getNodalConnectivityIndex().getNbOfElems()==nbOfCells+1)
-        myCoords=DataArrayDouble.New()
-        myCoords.setValues(coords,nbOfNodes,3);
-        self.failUnless(myCoords.getIJ(3,2)==-0.305)
-        mesh.setCoords(myCoords);
-        mesh.checkCoherency();
-        self.failUnless(mesh.getAllTypes()==[4])
-        myFalseConn=DataArrayInt.New()
-        myFalseConn.setValues(tab4,6,4)
-        self.failUnless(myFalseConn.getIJ(1,1)==3)
-        #
-        field=MEDCouplingFieldDouble.New(ON_CELLS)
-        field.setMesh(mesh)
-        field.setNature(Integral)
-        myCoords=DataArrayDouble.New()
-        sampleTab=[]
-        for i in range(nbOfCells*9):
-            sampleTab.append(float(i))
-        myCoords.setValues(sampleTab,nbOfCells,9);
-        field.setArray(myCoords)
-        self.failUnless(3==mesh.getSpaceDimension())
-        field.checkCoherency()
-        mesh2=mesh.clone(False)
-        mesh3=mesh.clone(True)
-        mesh3=0
-        mesh2=0
-        ## deep full recursively copy of field -> both field and mesh underneath copied
-        field2=field.clone(True)
-        field2.setMesh(field.getMesh().clone(True))
-        mesh3=mesh.clone(True)
-        field3=mesh3.fillFromAnalytic(ON_CELLS,2,"x*IVec+(y+z)*JVec")
-        field3.applyFunc("u*u*u+cos(u)")
-        pass
-    def setUp(self):
-        pass
-    pass
-
-unittest.main()
diff --git a/src/MEDCoupling_Swig/MEDCouplingRemapperTest.py b/src/MEDCoupling_Swig/MEDCouplingRemapperTest.py
deleted file mode 100644
index 4be38ae90..000000000
--- a/src/MEDCoupling_Swig/MEDCouplingRemapperTest.py
+++ /dev/null
@@ -1,86 +0,0 @@
-#  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2010  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
-#
-
-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/MEDCouplingTypemaps.i b/src/MEDCoupling_Swig/MEDCouplingTypemaps.i
deleted file mode 100644
index 4b8e950b2..000000000
--- a/src/MEDCoupling_Swig/MEDCouplingTypemaps.i
+++ /dev/null
@@ -1,128 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-static PyObject* convertMesh(ParaMEDMEM::MEDCouplingMesh* mesh, int owner)
-{
-  PyObject *ret;
-  if(dynamic_cast<ParaMEDMEM::MEDCouplingUMesh *>(mesh))
-    ret=SWIG_NewPointerObj((void*)mesh,SWIGTYPE_p_ParaMEDMEM__MEDCouplingUMesh,owner);
-  return ret;
-}
-
-static PyObject *convertIntArrToPyList(const int *ptr, int size)
-{
-  PyObject *ret=PyList_New(size);
-  for(int i=0;i<size;i++)
-    PyList_SetItem(ret,i,PyInt_FromLong(ptr[i]));
-  return ret;
-}
-
-static int *convertPyToNewIntArr(PyObject *pyLi, int size)
-{
-  if(PyList_Check(pyLi))
-    {
-      int *tmp=new int[size];
-      for(int i=0;i<size;i++)
-        {
-          PyObject *o=PyList_GetItem(pyLi,i);
-          if(PyInt_Check(o))
-            {
-              int val=(int)PyInt_AS_LONG(o);
-              tmp[i]=val;
-            }
-          else
-            {
-              PyErr_SetString(PyExc_TypeError,"list must contain integers only");
-              return NULL;
-            }
-        }
-      return tmp;
-    }
-  else
-    {
-      PyErr_SetString(PyExc_TypeError,"convertPyToNewIntArr : not a list");
-      return 0;
-    }
-}
-
-static int *convertPyToNewIntArr2(PyObject *pyLi)
-{
-  if(PyList_Check(pyLi))
-    {
-      int size=PyList_Size(pyLi);
-      int *tmp=new int[size];
-      for(int i=0;i<size;i++)
-        {
-          PyObject *o=PyList_GetItem(pyLi,i);
-          if(PyInt_Check(o))
-            {
-              int val=(int)PyInt_AS_LONG(o);
-              tmp[i]=val;
-            }
-          else
-            {
-              PyErr_SetString(PyExc_TypeError,"list must contain integers only");
-              return NULL;
-            }
-        }
-      return tmp;
-    }
-  else
-    {
-      PyErr_SetString(PyExc_TypeError,"convertPyToNewIntArr : not a list");
-      return 0;
-    }
-}
-
-static PyObject *convertDblArrToPyList(const double *ptr, int size)
-{
-  PyObject *ret=PyList_New(size);
-  for(int i=0;i<size;i++)
-    PyList_SetItem(ret,i,PyFloat_FromDouble(ptr[i]));
-  return ret;
-}
-
-static double *convertPyToNewDblArr2(PyObject *pyLi)
-{
-  if(PyList_Check(pyLi))
-    {
-      int size=PyList_Size(pyLi);
-      double *tmp=new double[size];
-      for(int i=0;i<size;i++)
-        {
-          PyObject *o=PyList_GetItem(pyLi,i);
-          if(PyFloat_Check(o))
-            {
-              double val=PyFloat_AS_DOUBLE(o);
-              tmp[i]=val;
-            }
-          else
-            {
-              PyErr_SetString(PyExc_TypeError,"list must contain floats only");
-              return NULL;
-            }
-        }
-      return tmp;
-    }
-  else
-    {
-      PyErr_SetString(PyExc_TypeError,"convertPyToNewIntArr : not a list");
-      return 0;
-    }
-}
diff --git a/src/MEDCoupling_Swig/Makefile.am b/src/MEDCoupling_Swig/Makefile.am
deleted file mode 100644
index 483a7e8e1..000000000
--- a/src/MEDCoupling_Swig/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-#  Copyright (C) 2007-2010  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
-#
-
-#  MED MEDCoupling_Swig : binding of C++ implementation and Python
-#
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-lib_LTLIBRARIES = _libMEDCoupling_Swig.la _libMEDCouplingRemapper_Swig.la
-
-salomeinclude_HEADERS =  \
-	libMEDCoupling_Swig.i libMEDCouplingRemapper_Swig.i MEDCouplingTypemaps.i
-
-BUILT_SOURCES = libMEDCoupling_SwigWRAP.cxx libMEDCouplingRemapper_SwigWRAP.cxx
-
-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_SwigWRAP.cxx
-libMEDCoupling_Swig.py: libMEDCoupling_SwigWRAP.cxx
-
-libMEDCoupling_SwigWRAP.cxx: libMEDCoupling_Swig.i MEDCouplingTypemaps.i
-	$(SWIG) $(SWIG_FLAGS) -o $@  $<
-
-_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
-
-dist__libMEDCouplingRemapper_Swig_la_SOURCES   = libMEDCouplingRemapper_Swig.i
-nodist__libMEDCouplingRemapper_Swig_la_SOURCES = libMEDCouplingRemapper_SwigWRAP.cxx
-libMEDCouplingRemapper_Swig.py: libMEDCouplingRemapper_SwigWRAP.cxx
-
-libMEDCouplingRemapper_SwigWRAP.cxx: libMEDCouplingRemapper_Swig.i MEDCouplingTypemaps.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_SwigWRAP.cxx libMEDCoupling_Swig.py libMEDCouplingRemapper_SwigWRAP.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
deleted file mode 100644
index b46f81984..000000000
--- a/src/MEDCoupling_Swig/libMEDCouplingRemapper_Swig.i
+++ /dev/null
@@ -1,42 +0,0 @@
-//  Copyright (C) 2007-2010  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"
diff --git a/src/MEDCoupling_Swig/libMEDCoupling_Swig.i b/src/MEDCoupling_Swig/libMEDCoupling_Swig.i
deleted file mode 100644
index ec02326ac..000000000
--- a/src/MEDCoupling_Swig/libMEDCoupling_Swig.i
+++ /dev/null
@@ -1,242 +0,0 @@
-//  Copyright (C) 2007-2010  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 libMEDCoupling_Swig
-
-#define MEDCOUPLING_EXPORT
-
-%{
-#include "MEDCouplingMemArray.hxx"
-#include "MEDCouplingUMesh.hxx"
-#include "MEDCouplingField.hxx"
-#include "MEDCouplingFieldDouble.hxx"
-#include "MEDCouplingTypemaps.i"
-
-using namespace ParaMEDMEM;
-using namespace INTERP_KERNEL;
-%}
-
-%typemap(out) ParaMEDMEM::MEDCouplingMesh*
-{
-  $result=convertMesh($1,$owner);
-}
-
-%newobject ParaMEDMEM::DataArrayDouble::New;
-%newobject ParaMEDMEM::DataArrayInt::New;
-%newobject ParaMEDMEM::MEDCouplingUMesh::New;
-%newobject ParaMEDMEM::MEDCouplingFieldDouble::New;
-%newobject ParaMEDMEM::MEDCouplingFieldDouble::mergeFields;
-%newobject ParaMEDMEM::MEDCouplingUMesh::clone;
-%newobject ParaMEDMEM::DataArrayDouble::deepCopy;
-%newobject ParaMEDMEM::DataArrayDouble::performCpy;
-%newobject ParaMEDMEM::DataArrayInt::deepCopy;
-%newobject ParaMEDMEM::DataArrayInt::performCpy;
-%newobject ParaMEDMEM::MEDCouplingFieldDouble::clone;
-%newobject ParaMEDMEM::MEDCouplingMesh::mergeMyselfWith;
-%newobject ParaMEDMEM::MEDCouplingMesh::fillFromAnalytic;
-%newobject ParaMEDMEM::MEDCouplingUMesh::buildPartOfMySelf;
-%newobject ParaMEDMEM::MEDCouplingPointSet::zipCoordsTraducer;
-%newobject ParaMEDMEM::MEDCouplingUMesh::getMeasureField;
-%newobject ParaMEDMEM::MEDCouplingUMesh::mergeUMeshes;
-%feature("unref") DataArrayDouble "$this->decrRef();"
-%feature("unref") MEDCouplingUMesh "$this->decrRef();"
-%feature("unref") DataArrayInt "$this->decrRef();"
-%feature("unref") MEDCouplingFieldDouble "$this->decrRef();"
-
-%ignore ParaMEDMEM::TimeLabel::operator=;
-%ignore ParaMEDMEM::MemArray::operator=;
-%ignore ParaMEDMEM::MemArray::operator[];
-
-%nodefaultctor;
-%include "MEDCouplingTimeLabel.hxx"
-%include "MEDCouplingRefCountObject.hxx"
-%include "MEDCouplingMesh.hxx"
-%include "MEDCouplingPointSet.hxx"
-%include "MEDCouplingMemArray.hxx"
-%include "MEDCouplingMesh.hxx"
-%include "NormalizedUnstructuredMesh.hxx"
-%include "MEDCouplingField.hxx"
-%include "MEDCouplingNatureOfField.hxx"
-
-namespace ParaMEDMEM
-{
-  class MEDCouplingUMesh : public ParaMEDMEM::MEDCouplingPointSet
-  {
-  public:
-    static MEDCouplingUMesh *New();
-    static MEDCouplingUMesh *New(const char *meshName, int meshDim);
-    MEDCouplingUMesh *clone(bool recDeepCpy) const;
-    void updateTime();
-    void checkCoherency() const throw(INTERP_KERNEL::Exception);
-    void setMeshDimension(int meshDim);
-    void allocateCells(int nbOfCells);
-    void setCoords(DataArrayDouble *coords);
-    DataArrayDouble *getCoords() const;
-    void finishInsertingCells();
-    void setConnectivity(DataArrayInt *conn, DataArrayInt *connIndex, bool isComputingTypes=true);
-    DataArrayInt *getNodalConnectivity() const;
-    DataArrayInt *getNodalConnectivityIndex() const;
-    INTERP_KERNEL::NormalizedCellType getTypeOfCell(int cellId) const;
-    int getNumberOfNodesInCell(int cellId) const;
-    bool isStructured() const;
-    int getNumberOfCells() const;
-    int getNumberOfNodes() const;
-    int getSpaceDimension() const;
-    int getMeshDimension() const;
-    int getMeshLength() const;
-    //tools
-    void zipCoords();
-    DataArrayInt *zipCoordsTraducer();
-    void getReverseNodalConnectivity(DataArrayInt *revNodal, DataArrayInt *revNodalIndx) const;
-    MEDCouplingUMesh *buildPartOfMySelf(const int *start, const int *end, bool keepCoords) const;
-    %extend {
-      void insertNextCell(INTERP_KERNEL::NormalizedCellType type, int size, PyObject *li)
-      {
-        int *tmp=convertPyToNewIntArr(li,size);
-        self->insertNextCell(type,size,tmp);
-        delete [] tmp;
-      }
-      PyObject *getAllTypes() const
-      {
-        std::set<INTERP_KERNEL::NormalizedCellType> result=self->getAllTypes();
-        std::set<INTERP_KERNEL::NormalizedCellType>::const_iterator iL=result.begin();
-        PyObject *res = PyList_New(result.size());
-        for (int i=0;iL!=result.end(); i++, iL++)
-          PyList_SetItem(res,i,PyInt_FromLong(*iL));
-        return res;
-      }
-      PyObject *mergeNodes(double precision)
-      {
-        bool ret1;
-        DataArrayInt *ret0=self->mergeNodes(precision,ret1);
-        PyObject *res = PyList_New(2);
-        PyList_SetItem(res,0,SWIG_NewPointerObj(SWIG_as_voidptr(ret0),SWIGTYPE_p_ParaMEDMEM__DataArrayInt, SWIG_POINTER_OWN | 0 ));
-        PyList_SetItem(res,1,SWIG_From_bool(ret1));
-        return res;
-      }
-    }
-    MEDCouplingFieldDouble *getMeasureField(bool isAbs) const;
-    static MEDCouplingUMesh *mergeUMeshes(const MEDCouplingUMesh *mesh1, const MEDCouplingUMesh *mesh2);
-  };
-}
-
-%extend ParaMEDMEM::DataArrayDouble
- {
-   void setValues(PyObject *li, int nbOfTuples, int nbOfElsPerTuple)
-   {
-     double *tmp=convertPyToNewDblArr2(li);
-     self->useArray(tmp,true,CPP_DEALLOC,nbOfTuples,nbOfElsPerTuple);
-   }
-
-   PyObject *getValues()
-   {
-     const double *vals=self->getPointer();
-     return convertDblArrToPyList(vals,self->getNbOfElems());
-   }
- };
-
-%extend ParaMEDMEM::DataArrayInt
- {
-   void setValues(PyObject *li, int nbOfTuples, int nbOfElsPerTuple)
-   {
-     int *tmp=convertPyToNewIntArr2(li);
-     self->useArray(tmp,true,CPP_DEALLOC,nbOfTuples,nbOfElsPerTuple);
-   }
-
-   PyObject *getValues()
-   {
-     const int *vals=self->getPointer();
-     return convertIntArrToPyList(vals,self->getNbOfElems());
-   }
- };
-
-%include "MEDCouplingField.hxx"
-
-namespace ParaMEDMEM
-{
-  class MEDCouplingFieldDouble : public ParaMEDMEM::MEDCouplingField
-  {
-  public:
-    static MEDCouplingFieldDouble *New(TypeOfField type, TypeOfTimeDiscretization td=NO_TIME);
-    MEDCouplingFieldDouble *clone(bool recDeepCpy) const;
-    void checkCoherency() const throw(INTERP_KERNEL::Exception);
-    double getIJ(int tupleId, int compoId) const;
-    void setArray(DataArrayDouble *array);
-    void setTime(double val, int dt, int it);
-    void setStartTime(double val, int dt, int it);
-    void setEndTime(double val, int dt, int it);
-    DataArrayDouble *getArray() const { return _array; }
-    void applyLin(double a, double b, int compoId);
-    int getNumberOfComponents() const;
-    int getNumberOfTuples() const throw(INTERP_KERNEL::Exception);
-    NatureOfField getNature() const { return _nature; }
-    void setNature(NatureOfField nat) throw(INTERP_KERNEL::Exception);
-    void updateTime();
-    bool mergeNodes(double eps);
-    void applyFunc(int nbOfComp, const char *func);
-    void applyFunc(const char *func);
-    static MEDCouplingFieldDouble *mergeFields(const MEDCouplingFieldDouble *f1, const MEDCouplingFieldDouble *f2);
-    %extend {
-      void setValues(PyObject *li)
-      {
-        if(self->getArray()!=0)
-          {
-            double *tmp=convertPyToNewDblArr2(li);
-            int nbTuples=self->getArray()->getNumberOfTuples();
-            int nbOfCompo=self->getArray()->getNumberOfComponents();
-            self->getArray()->useArray(tmp,true,CPP_DEALLOC,nbTuples,nbOfCompo);
-          }
-        else
-          PyErr_SetString(PyExc_TypeError,"setValuesCpy : field must contain an array behind");
-      }
-      PyObject *getTime()
-      {
-        int tmp1,tmp2;
-        double tmp0=self->getTime(tmp1,tmp2);
-        PyObject *res = PyList_New(3);
-        PyList_SetItem(res,0,SWIG_From_double(tmp0));
-        PyList_SetItem(res,1,SWIG_From_int(tmp1));
-        PyList_SetItem(res,2,SWIG_From_int(tmp2));
-        return res;
-      }
-
-      PyObject *getStartTime()
-      {
-        int tmp1,tmp2;
-        double tmp0=self->getStartTime(tmp1,tmp2);
-        PyObject *res = PyList_New(3);
-        PyList_SetItem(res,0,SWIG_From_double(tmp0));
-        PyList_SetItem(res,1,SWIG_From_int(tmp1));
-        PyList_SetItem(res,2,SWIG_From_int(tmp2));
-        return res;
-      }
-
-      PyObject *getEndTime()
-      {
-        int tmp1,tmp2;
-        double tmp0=self->getEndTime(tmp1,tmp2);
-        PyObject *res = PyList_New(3);
-        PyList_SetItem(res,0,SWIG_From_double(tmp0));
-        PyList_SetItem(res,1,SWIG_From_int(tmp1));
-        PyList_SetItem(res,2,SWIG_From_int(tmp2));
-        return res;
-      }
-    }
-  };
-}
diff --git a/src/MEDLoader/MEDLoader.cxx b/src/MEDLoader/MEDLoader.cxx
deleted file mode 100644
index f68192850..000000000
--- a/src/MEDLoader/MEDLoader.cxx
+++ /dev/null
@@ -1,1347 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "MEDLoader.hxx"
-#include "MEDLoaderBase.hxx"
-#include "CellModel.hxx"
-#include "MEDCouplingUMesh.hxx"
-#include "MEDCouplingMemArray.hxx"
-#include "MEDCouplingFieldDouble.hxx"
-
-extern "C"
-{
-#include "med.h"
-}
-
-#include <string>
-#include <cstring>
-#include <sstream>
-#include <fstream>
-#include <iterator>
-#include <algorithm>
-#include <numeric>
-
-med_geometrie_element typmai[MED_NBR_GEOMETRIE_MAILLE+2] = { MED_POINT1,
-                                                             MED_SEG2,
-                                                             MED_SEG3,
-                                                             MED_TRIA3,
-                                                             MED_TRIA6,
-                                                             MED_QUAD4,
-                                                             MED_QUAD8,
-                                                             MED_TETRA4,
-                                                             MED_TETRA10,
-                                                             MED_HEXA8,
-                                                             MED_HEXA20,
-                                                             MED_PENTA6,
-                                                             MED_PENTA15,
-                                                             MED_PYRA5,
-                                                             MED_PYRA13,
-                                                             MED_POLYGONE,
-                                                             MED_POLYEDRE };
-
-med_geometrie_element typmainoeud[1] = { MED_NONE };
-
-INTERP_KERNEL::NormalizedCellType typmai2[MED_NBR_GEOMETRIE_MAILLE+2] = { INTERP_KERNEL::NORM_ERROR,
-                                                                          INTERP_KERNEL::NORM_SEG2,
-                                                                          INTERP_KERNEL::NORM_SEG3,
-                                                                          INTERP_KERNEL::NORM_TRI3,
-                                                                          INTERP_KERNEL::NORM_TRI6,
-                                                                          INTERP_KERNEL::NORM_QUAD4,
-                                                                          INTERP_KERNEL::NORM_QUAD8,
-                                                                          INTERP_KERNEL::NORM_TETRA4,
-                                                                          INTERP_KERNEL::NORM_TETRA10,
-                                                                          INTERP_KERNEL::NORM_HEXA8,
-                                                                          INTERP_KERNEL::NORM_HEXA20,
-                                                                          INTERP_KERNEL::NORM_PENTA6,
-                                                                          INTERP_KERNEL::NORM_PENTA15,
-                                                                          INTERP_KERNEL::NORM_PYRA5,
-                                                                          INTERP_KERNEL::NORM_PYRA13,
-                                                                          INTERP_KERNEL::NORM_POLYGON,
-                                                                          INTERP_KERNEL::NORM_POLYHED };
-
-med_geometrie_element typmai3[32] = { MED_POINT1,//0
-                                      MED_SEG2,//1
-                                      MED_SEG3,//2
-                                      MED_TRIA3,//3
-                                      MED_QUAD4,//4
-                                      MED_POLYGONE,//5
-                                      MED_TRIA6,//6
-                                      MED_NONE,//7
-                                      MED_QUAD8,//8
-                                      MED_NONE,//9
-                                      MED_NONE,//10
-                                      MED_NONE,//11
-                                      MED_NONE,//12
-                                      MED_NONE,//13
-                                      MED_TETRA4,//14
-                                      MED_PYRA5,//15
-                                      MED_PENTA6,//16
-                                      MED_NONE,//17
-                                      MED_HEXA8,//18
-                                      MED_NONE,//19
-                                      MED_TETRA10,//20
-                                      MED_NONE,//21
-                                      MED_NONE,//22
-                                      MED_PYRA13,//23
-                                      MED_NONE,//24
-                                      MED_PENTA15,//25
-                                      MED_NONE,//26
-                                      MED_NONE,//27
-                                      MED_NONE,//28
-                                      MED_NONE,//29
-                                      MED_HEXA20,//30
-                                      MED_POLYEDRE//31
-};
-
-using namespace ParaMEDMEM;
-
-namespace MEDLoaderNS
-{
-  class FieldPerTypeCopier
-  {
-  public:
-    FieldPerTypeCopier(double *ptr):_ptr(ptr) { }
-    void operator()(const MEDLoader::MEDFieldDoublePerCellType& elt) { _ptr=std::copy(elt.getArray(),elt.getArray()+elt.getNbOfValues(),_ptr); }
-  private:
-    double *_ptr;
-  };
- 
-  class ConnReaderML
-  {
-  public:
-    ConnReaderML(const int *c, int val):_conn(c),_val(val) { }
-    bool operator() (const int& pos) { return _conn[pos]!=_val; }
-  private:
-    const int *_conn;
-    int _val;
-  };
-  
-  std::string buildStringFromFortran(const char *expr, int lgth);
-  std::vector<std::string> getMeshNamesFid(med_idt fid);
-  void readFieldDoubleDataInMedFile(const char *fileName, const char *meshName, const char *fieldName, std::list<MEDLoader::MEDFieldDoublePerCellType>& field,
-                                    int iteration, int order, ParaMEDMEM::TypeOfField typeOfOutField, double& time);
-  std::vector<int> getIdsFromFamilies(const char *fileName, const char *meshName, const std::vector<std::string>& fams);
-  std::vector<int> getIdsFromGroups(const char *fileName, const char *meshName, const std::vector<std::string>& grps);
-  med_int getIdFromMeshName(med_idt fid, const char *meshName, std::string& trueMeshName) throw(INTERP_KERNEL::Exception);
-  void dispatchElems(int nbOfElemCell, int nbOfElemFace, int& nbOfElem, med_entite_maillage& whichEntity);
-  void readUMeshDataInMedFile(med_idt fid, med_int meshId, double *&coords, int& nCoords, int& spaceDim, std::list<MEDLoader::MEDConnOfOneElemType>& conn);
-  int buildMEDSubConnectivityOfOneType(DataArrayInt *conn, DataArrayInt *connIndex, INTERP_KERNEL::NormalizedCellType type, std::vector<int>& conn4MEDFile,
-                                       std::vector<int>& connIndex4MEDFile, std::vector<int>& connIndexRk24MEDFile);
-  MEDCouplingUMesh *readUMeshFromFileLev1(const char *fileName, const char *meshName, int meshDimRelToMax, const std::vector<int>& ids,
-                                          const std::vector<INTERP_KERNEL::NormalizedCellType>& typesToKeep, unsigned& meshDimExtract) throw(INTERP_KERNEL::Exception);
-  void tradMEDFileCoreFrmt2MEDCouplingUMesh(const std::list<MEDLoader::MEDConnOfOneElemType>& medConnFrmt,
-                                            DataArrayInt* &conn,
-                                            DataArrayInt* &connIndex,
-                                            const std::vector<int>& familiesToKeep);
-  ParaMEDMEM::DataArrayDouble *buildArrayFromRawData(const std::list<MEDLoader::MEDFieldDoublePerCellType>& fieldPerType);
-  int buildMEDSubConnectivityOfOneTypesPolyg(DataArrayInt *conn, DataArrayInt *connIndex, std::vector<int>& conn4MEDFile, std::vector<int>& connIndex4MEDFile);
-  int buildMEDSubConnectivityOfOneTypesPolyh(DataArrayInt *conn, DataArrayInt *connIndex, std::vector<int>& conn4MEDFile,
-                                             std::vector<int>& connIndex4MEDFile, std::vector<int>& connIndexRk24MEDFile);
-  int buildMEDSubConnectivityOfOneTypeStaticTypes(DataArrayInt *conn, DataArrayInt *connIndex, INTERP_KERNEL::NormalizedCellType type, std::vector<int>& conn4MEDFile);
-  ParaMEDMEM::MEDCouplingFieldDouble *readFieldDoubleLev1(const char *fileName, const char *meshName, int meshDimRelToMax, const char *fieldName, int iteration, int order,
-                                                          ParaMEDMEM::TypeOfField typeOfOutField);
-  void appendFieldDirectly(const char *fileName, ParaMEDMEM::MEDCouplingFieldDouble *f);
-  void prepareCellFieldDoubleForWriting(const ParaMEDMEM::MEDCouplingFieldDouble *f, std::list<MEDLoader::MEDFieldDoublePerCellType>& split);
-  void writeUMeshDirectly(const char *fileName, ParaMEDMEM::MEDCouplingUMesh *mesh, bool forceFromScratch);
-  void writeFieldAndMeshDirectly(const char *fileName, ParaMEDMEM::MEDCouplingFieldDouble *f, bool forceFromScratch);
-}
-
-const char WHITE_SPACES[]=" \n";
-
-/*!
- * @param lgth is the size of fam tab. For classical types conn is size of 'lgth'*number_of_nodes_in_type.
- * @param index is optionnal only for polys. Set it to 0 if it is not the case.
- * @param connLgth is the size of conn in the case of poly. Unsued if it is not the case.
- */
-MEDLoader::MEDConnOfOneElemType::MEDConnOfOneElemType(INTERP_KERNEL::NormalizedCellType type, int *conn, int *index, int *fam, int lgth, int connLgth):_lgth(lgth),_fam(fam),
-                                                                                                                                                       _conn(conn),_index(index),
-                                                                                                                                                       _global(0),_type(type),
-                                                                                                                                                       _conn_lgth(connLgth)
-{
-}
-
-void MEDLoader::MEDConnOfOneElemType::setGlobal(int *global)
-{
-  if(_global!=global)
-    {
-      if(_global)
-        delete [] _global;
-      _global=global;
-    }
-}
-
-void MEDLoader::MEDConnOfOneElemType::releaseArray()
-{
-  delete [] _fam;
-  delete [] _conn;
-  delete [] _index;
-  delete [] _global;
-}
-
-MEDLoader::MEDFieldDoublePerCellType::MEDFieldDoublePerCellType(INTERP_KERNEL::NormalizedCellType type, double *values, int ncomp, int ntuple):_ntuple(ntuple),_ncomp(ncomp),_values(values),_type(type)
-{
-}
-
-void MEDLoader::MEDFieldDoublePerCellType::releaseArray()
-{
-  delete [] _values;
-}
-
-
-std::string MEDLoaderNS::buildStringFromFortran(const char *expr, int lgth)
-{
-  std::string ret(expr,lgth);
-  std::string whiteSpaces(WHITE_SPACES);
-  std::size_t lgthReal=strlen(ret.c_str());
-  std::string ret2=ret.substr(0,lgthReal);
-  std::size_t found=ret2.find_last_not_of(whiteSpaces);
-  if (found!=std::string::npos)
-    ret2.erase(found+1);
-  else
-    ret2.clear();//ret is all whitespace
-  return ret2;
-}
-
-std::vector<std::string> MEDLoaderNS::getMeshNamesFid(med_idt fid)
-{
-  med_maillage type_maillage;
-  char maillage_description[MED_TAILLE_DESC+1];
-  med_int dim;
-  char nommaa[MED_TAILLE_NOM+1];
-  med_int n=MEDnMaa(fid);
-  std::vector<std::string> ret(n);
-  for(int i=0;i<n;i++)
-    {
-      MEDmaaInfo(fid,i+1,nommaa,&dim,&type_maillage,maillage_description);
-      std::string cur=buildStringFromFortran(nommaa,sizeof(nommaa));
-      ret[i]=cur;
-    }
-  return ret;
-}
-
-std::vector<std::string> MEDLoader::GetMeshNames(const char *fileName)
-{
-  med_idt fid=MEDouvrir((char *)fileName,MED_LECTURE);
-  std::vector<std::string> ret=MEDLoaderNS::getMeshNamesFid(fid);
-  MEDfermer(fid);
-  return ret;
-}
-
-std::vector<std::string> MEDLoader::GetMeshFamilyNames(const char *fileName, const char *meshName)
-{
-  med_idt fid=MEDouvrir((char *)fileName,MED_LECTURE);
-  med_int nfam=MEDnFam(fid,(char *)meshName);
-  std::vector<std::string> ret(nfam);
-  char nomfam[MED_TAILLE_NOM+1];
-  med_int numfam;
-  for(int i=0;i<nfam;i++)
-    {
-      int ngro=MEDnGroupe(fid,(char *)meshName,i+1);
-      med_int natt=MEDnAttribut(fid,(char *)meshName,i+1);
-      med_int *attide=new int[natt];
-      med_int *attval=new int[natt];
-      char *attdes=new char[MED_TAILLE_DESC*natt+1];
-      char *gro=new char[MED_TAILLE_LNOM*ngro+1];
-      MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro);
-      std::string cur=MEDLoaderNS::buildStringFromFortran(nomfam,sizeof(nomfam));
-      ret[i]=cur;
-      delete [] attdes;
-      delete [] gro;
-      delete [] attide;
-      delete [] attval;
-    }
-  MEDfermer(fid);
-  return ret;
-}
-  
-std::vector<std::string> MEDLoader::GetMeshGroupsNames(const char *fileName, const char *meshName)
-{
-  med_idt fid=MEDouvrir((char *)fileName,MED_LECTURE);
-  med_int nfam=MEDnFam(fid,(char *)meshName);
-  std::vector<std::string> ret;
-  char nomfam[MED_TAILLE_NOM+1];
-  med_int numfam;
-  for(int i=0;i<nfam;i++)
-    {
-      int ngro=MEDnGroupe(fid,(char *)meshName,i+1);
-      med_int natt=MEDnAttribut(fid,(char *)meshName,i+1);
-      med_int *attide=new int[natt];
-      med_int *attval=new int[natt];
-      char *attdes=new char[MED_TAILLE_DESC*natt+1];
-      char *gro=new char[MED_TAILLE_LNOM*ngro+1];
-      MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro);
-      for(int j=0;j<ngro;j++)
-        {
-          std::string cur=MEDLoaderNS::buildStringFromFortran(gro+j*MED_TAILLE_LNOM,MED_TAILLE_LNOM);
-          if(std::find(ret.begin(),ret.end(),cur)==ret.end())
-            ret.push_back(cur);
-        }
-      delete [] attdes;
-      delete [] gro;
-      delete [] attide;
-      delete [] attval;
-    }
-  MEDfermer(fid);
-  return ret;
-}
-
-std::vector<std::string> MEDLoader::GetCellFieldNamesOnMesh(const char *fileName, const char *meshName)
-{
-  std::vector<std::string> ret;
-  med_idt fid=MEDouvrir((char *)fileName,MED_LECTURE);
-  med_int nbFields=MEDnChamp(fid,0);
-  //
-  med_type_champ typcha;
-  //med_int nbpdtnor=0,pflsize,*pflval,lnsize;
-  med_int ngauss=0;
-  med_int numdt=0,numo=0,nbrefmaa;
-  med_float dt=0.0;
-  med_booleen local;
-  //char pflname[MED_TAILLE_NOM+1]="";
-  //char locname[MED_TAILLE_NOM+1]="";
-  char maa_ass[MED_TAILLE_NOM+1]="";
-  char dt_unit[MED_TAILLE_PNOM+1]="";
-  char nomcha[MED_TAILLE_NOM+1]="";
-  //
-  for(int i=0;i<nbFields;i++)
-    {
-      med_int ncomp=MEDnChamp(fid,i+1);
-      char *comp=new char[ncomp*MED_TAILLE_PNOM+1];
-      char *unit=new char[ncomp*MED_TAILLE_PNOM+1];
-      MEDchampInfo(fid,i+1,nomcha,&typcha,comp,unit,ncomp);
-      std::string curFieldName=MEDLoaderNS::buildStringFromFortran(nomcha,MED_TAILLE_NOM+1);
-      delete [] comp;
-      delete [] unit;
-      bool found=false;
-      for(int j=0;j<MED_NBR_GEOMETRIE_MAILLE+2 && !found;j++)
-        {
-          med_int nbPdt=MEDnPasdetemps(fid,nomcha,MED_MAILLE,typmai[j]);
-          if(nbPdt>0)
-            {
-              MEDpasdetempsInfo(fid,nomcha,MED_MAILLE,typmai[j],1, &ngauss, &numdt, &numo, dt_unit,&dt, maa_ass, &local, &nbrefmaa);
-              std::string curMeshName=MEDLoaderNS::buildStringFromFortran(maa_ass,MED_TAILLE_NOM+1);
-              if(curMeshName==meshName)
-                {
-                  found=true;
-                  ret.push_back(curFieldName);
-                }
-            }
-        }
-    }
-  MEDfermer(fid);
-  return ret;
-}
-
-std::vector<std::string> MEDLoader::GetNodeFieldNamesOnMesh(const char *fileName, const char *meshName)
-{
-  std::vector<std::string> ret;
-  med_idt fid=MEDouvrir((char *)fileName,MED_LECTURE);
-  med_int nbFields=MEDnChamp(fid,0);
-  //
-  med_type_champ typcha;
-  med_int ngauss=0;
-  med_int numdt=0,numo=0,nbrefmaa;
-  med_float dt=0.0;
-  med_booleen local;
-  char maa_ass[MED_TAILLE_NOM+1]="";
-  char dt_unit[MED_TAILLE_PNOM+1]="";
-  char nomcha[MED_TAILLE_NOM+1]="";
-  //
-  for(int i=0;i<nbFields;i++)
-    {
-      med_int ncomp=MEDnChamp(fid,i+1);
-      char *comp=new char[ncomp*MED_TAILLE_PNOM+1];
-      char *unit=new char[ncomp*MED_TAILLE_PNOM+1];
-      MEDchampInfo(fid,i+1,nomcha,&typcha,comp,unit,ncomp);
-      std::string curFieldName=MEDLoaderNS::buildStringFromFortran(nomcha,MED_TAILLE_NOM+1);
-      delete [] comp;
-      delete [] unit;
-      bool found=false;
-      med_int nbPdt=MEDnPasdetemps(fid,nomcha,MED_NOEUD,MED_NONE);
-      if(nbPdt>0)
-        {
-          MEDpasdetempsInfo(fid,nomcha,MED_NOEUD,MED_NONE,1, &ngauss, &numdt, &numo, dt_unit,&dt, maa_ass, &local, &nbrefmaa);
-          std::string curMeshName=MEDLoaderNS::buildStringFromFortran(maa_ass,MED_TAILLE_NOM+1);
-          if(curMeshName==meshName)
-            {
-              found=true;
-              ret.push_back(curFieldName);
-            }
-        }
-    }
-  MEDfermer(fid);
-  return ret;
-}
-
-std::vector< std::pair<int,int> > MEDLoader::GetCellFieldIterations(const char *fileName, const char *fieldName)
-{
-  std::vector< std::pair<int,int> > ret;
-  med_idt fid=MEDouvrir((char *)fileName,MED_LECTURE);
-  med_int nbFields=MEDnChamp(fid,0);
-  //
-  med_type_champ typcha;
-  med_int ngauss=0;
-  med_int numdt=0,numo=0,nbrefmaa;
-  med_float dt=0.0;
-  med_booleen local;
-  char maa_ass[MED_TAILLE_NOM+1]="";
-  char dt_unit[MED_TAILLE_PNOM+1]="";
-  char nomcha[MED_TAILLE_NOM+1]="";
-  //
-  for(int i=0;i<nbFields;i++)
-    {
-      med_int ncomp=MEDnChamp(fid,i+1);
-      char *comp=new char[ncomp*MED_TAILLE_PNOM+1];
-      char *unit=new char[ncomp*MED_TAILLE_PNOM+1];
-      MEDchampInfo(fid,i+1,nomcha,&typcha,comp,unit,ncomp);
-      std::string curFieldName=MEDLoaderNS::buildStringFromFortran(nomcha,MED_TAILLE_NOM+1);
-      delete [] comp;
-      delete [] unit;
-      if(curFieldName==fieldName)
-        {
-          bool found=false;
-          for(int j=0;j<MED_NBR_GEOMETRIE_MAILLE+2 && !found;j++)
-            {
-              med_int nbPdt=MEDnPasdetemps(fid,nomcha,MED_MAILLE,typmai[j]);
-              for(int k=0;k<nbPdt;k++)
-                {
-                  MEDpasdetempsInfo(fid,nomcha,MED_MAILLE,typmai[j],k+1, &ngauss, &numdt, &numo, dt_unit,&dt, maa_ass, &local, &nbrefmaa);
-                  found=true;
-                  ret.push_back(std::make_pair(numdt,numo));
-                }
-            }
-        }
-    }
-  MEDfermer(fid);
-  return ret;
-}
-
-std::vector< std::pair<int,int> > MEDLoader::GetNodeFieldIterations(const char *fileName, const char *fieldName)
-{
-  std::vector< std::pair<int,int> > ret;
-  med_idt fid=MEDouvrir((char *)fileName,MED_LECTURE);
-  med_int nbFields=MEDnChamp(fid,0);
-  //
-  med_type_champ typcha;
-  med_int ngauss=0;
-  med_int numdt=0,numo=0,nbrefmaa;
-  med_float dt=0.0;
-  med_booleen local;
-  char maa_ass[MED_TAILLE_NOM+1]="";
-  char dt_unit[MED_TAILLE_PNOM+1]="";
-  char nomcha[MED_TAILLE_NOM+1]="";
-  //
-  for(int i=0;i<nbFields;i++)
-    {
-      med_int ncomp=MEDnChamp(fid,i+1);
-      char *comp=new char[ncomp*MED_TAILLE_PNOM+1];
-      char *unit=new char[ncomp*MED_TAILLE_PNOM+1];
-      MEDchampInfo(fid,i+1,nomcha,&typcha,comp,unit,ncomp);
-      std::string curFieldName=MEDLoaderNS::buildStringFromFortran(nomcha,MED_TAILLE_NOM+1);
-      delete [] comp;
-      delete [] unit;
-      if(curFieldName==fieldName)
-        {
-          med_int nbPdt=MEDnPasdetemps(fid,nomcha,MED_NOEUD,MED_NONE);
-          for(int k=0;k<nbPdt;k++)
-            {
-              MEDpasdetempsInfo(fid,nomcha,MED_NOEUD,MED_NONE,k+1, &ngauss, &numdt, &numo, dt_unit,&dt, maa_ass, &local, &nbrefmaa);
-              ret.push_back(std::make_pair(numdt,numo));
-            }
-        }
-    }
-  MEDfermer(fid);
-  return ret;
-}
-
-void MEDLoaderNS::readFieldDoubleDataInMedFile(const char *fileName, const char *meshName, const char *fieldName, std::list<MEDLoader::MEDFieldDoublePerCellType>& field,
-                                               int iteration, int order, ParaMEDMEM::TypeOfField typeOfOutField, double& time)
-{
-  time=0.;
-  med_idt fid=MEDouvrir((char *)fileName,MED_LECTURE);
-  med_int nbFields=MEDnChamp(fid,0);
-  //
-  med_type_champ typcha;
-  char nomcha[MED_TAILLE_NOM+1]="";
-  char pflname [MED_TAILLE_NOM+1]="";
-  char locname [MED_TAILLE_NOM+1]="";
-  std::map<ParaMEDMEM::TypeOfField, med_entite_maillage> tabEnt;
-  std::map<ParaMEDMEM::TypeOfField, med_geometrie_element *> tabType;
-  std::map<ParaMEDMEM::TypeOfField, int> tabTypeLgth;
-  tabEnt[ON_CELLS]=MED_MAILLE;
-  tabType[ON_CELLS]=typmai;
-  tabTypeLgth[ON_CELLS]=MED_NBR_GEOMETRIE_MAILLE+2;
-  tabEnt[ON_NODES]=MED_NOEUD;
-  tabType[ON_NODES]=typmainoeud;
-  tabTypeLgth[ON_NODES]=1;
-  //
-  for(int i=0;i<nbFields;i++)
-    {
-      med_int ncomp=MEDnChamp(fid,i+1);
-      char *comp=new char[ncomp*MED_TAILLE_PNOM+1];
-      char *unit=new char[ncomp*MED_TAILLE_PNOM+1];
-      MEDchampInfo(fid,i+1,nomcha,&typcha,comp,unit,ncomp);
-      std::string curFieldName=buildStringFromFortran(nomcha,MED_TAILLE_NOM+1);
-      delete [] comp;
-      delete [] unit;
-      if(curFieldName==fieldName)
-        {
-          bool found=false;
-          for(int j=0;j<tabTypeLgth[typeOfOutField] && !found;j++)
-            {
-              med_int nbPdt=MEDnPasdetemps(fid,nomcha,tabEnt[typeOfOutField],typmai[j]);
-              if(nbPdt>0)
-                {
-                  int nval=MEDnVal(fid,(char *)fieldName,tabEnt[typeOfOutField],tabType[typeOfOutField][j],iteration,order,(char *)meshName,MED_COMPACT);
-                  double *valr=new double[ncomp*nval];
-                  //
-                  med_int ngauss=0;
-                  med_int numdt=0,numo=0,nbrefmaa;
-                  char dt_unit[MED_TAILLE_PNOM+1]="";
-                  char maa_ass[MED_TAILLE_NOM+1]="";
-                  med_float dt=0.0;
-                  med_booleen local;
-                  med_int nbPdt=MEDnPasdetemps(fid,(char *)fieldName,MED_MAILLE,tabType[typeOfOutField][j]);
-                  bool found2=false;
-                  for(int k=0;k<nbPdt && !found2;k++)
-                    {
-                      MEDpasdetempsInfo(fid,(char *)fieldName,MED_MAILLE,tabType[typeOfOutField][j],k+1,&ngauss,
-                                        &numdt,&numo,dt_unit,&dt,maa_ass,&local,&nbrefmaa);
-                      found2=(numdt==iteration && numo==order);
-                      if(found2)
-                        time=dt;
-                    }
-                  MEDchampLire(fid,(char *)meshName,(char *)fieldName,(unsigned char*)valr,MED_FULL_INTERLACE,MED_ALL,locname,
-                               pflname,MED_COMPACT,tabEnt[typeOfOutField],tabType[typeOfOutField][j],iteration,order);
-                  field.push_back(MEDLoader::MEDFieldDoublePerCellType(typmai2[j],valr,ncomp,nval));
-                }
-            }
-        }
-    }
-  MEDfermer(fid);
-}
-
-std::vector<int> MEDLoaderNS::getIdsFromFamilies(const char *fileName, const char *meshName, const std::vector<std::string>& fams)
-{
-  std::vector<int> ret;
-  med_idt fid=MEDouvrir((char *)fileName,MED_LECTURE);
-  med_int nfam=MEDnFam(fid,(char *)meshName);
-  char nomfam[MED_TAILLE_NOM+1];
-  med_int numfam;
-  for(int i=0;i<nfam;i++)
-    {
-      int ngro=MEDnGroupe(fid,(char *)meshName,i+1);
-      med_int natt=MEDnAttribut(fid,(char *)meshName,i+1);
-      med_int *attide=new int[natt];
-      med_int *attval=new int[natt];
-      char *attdes=new char[MED_TAILLE_DESC*natt+1];
-      char *gro=new char[MED_TAILLE_LNOM*ngro+1];
-      MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro);
-      std::string cur=buildStringFromFortran(nomfam,sizeof(nomfam));
-      if(std::find(fams.begin(),fams.end(),cur)!=fams.end())
-        ret.push_back(numfam);
-      delete [] attdes;
-      delete [] gro;
-      delete [] attide;
-      delete [] attval;
-    }
-  MEDfermer(fid);
-  return ret;
-}
-
-std::vector<int> MEDLoaderNS::getIdsFromGroups(const char *fileName, const char *meshName, const std::vector<std::string>& grps)
-{
-  std::vector<int> ret;
-  med_idt fid=MEDouvrir((char *)fileName,MED_LECTURE);
-  med_int nfam=MEDnFam(fid,(char *)meshName);
-  char nomfam[MED_TAILLE_NOM+1];
-  med_int numfam;
-  for(int i=0;i<nfam;i++)
-    {
-      int ngro=MEDnGroupe(fid,(char *)meshName,i+1);
-      med_int natt=MEDnAttribut(fid,(char *)meshName,i+1);
-      med_int *attide=new int[natt];
-      med_int *attval=new int[natt];
-      char *attdes=new char[MED_TAILLE_DESC*natt+1];
-      char *gro=new char[MED_TAILLE_LNOM*ngro+1];
-      MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro);
-      std::string cur=buildStringFromFortran(nomfam,sizeof(nomfam));
-      for(int j=0;j<ngro;j++)
-        {
-          std::string cur=buildStringFromFortran(gro+j*MED_TAILLE_LNOM,MED_TAILLE_LNOM);
-          if(std::find(grps.begin(),grps.end(),cur)!=grps.end())
-            {
-              ret.push_back(numfam);
-              break;
-            }
-        }
-      delete [] attdes;
-      delete [] gro;
-      delete [] attide;
-      delete [] attval;
-    }
-  MEDfermer(fid);
-  return ret;
-}
-
-med_int MEDLoaderNS::getIdFromMeshName(med_idt fid, const char *meshName, std::string& trueMeshName) throw(INTERP_KERNEL::Exception)
-{
-  if(meshName==0)
-    {
-      std::vector<std::string> meshes=getMeshNamesFid(fid);
-      if(meshes.empty())
-        throw INTERP_KERNEL::Exception("No mesh in file");
-      trueMeshName=meshes[0];
-      return 1;
-    }
-  std::string meshNameStr(meshName);
-  std::vector<std::string> meshes=getMeshNamesFid(fid);
-  if(meshes.empty())
-    throw INTERP_KERNEL::Exception("No mesh in file");
-  std::vector<std::string>::iterator iter=std::find(meshes.begin(),meshes.end(),meshNameStr);
-  if(iter==meshes.end())
-    {
-      std::ostringstream os2;
-      os2 << "MeshName '" << meshName << "' not in file : meshes available : ";
-      std::copy(meshes.begin(),meshes.end(),std::ostream_iterator<std::string>(os2," "));
-      throw INTERP_KERNEL::Exception(os2.str().c_str());
-    }
-  trueMeshName=meshName;
-  return iter-meshes.begin()+1;
-}
-
-/*!
- * This methods allows to merger all entities and to considerate only cell types.
- */
-void MEDLoaderNS::dispatchElems(int nbOfElemCell, int nbOfElemFace, int& nbOfElem, med_entite_maillage& whichEntity)
-{
-  if(nbOfElemCell>=nbOfElemFace)
-    {
-      whichEntity=MED_MAILLE;
-      nbOfElem=nbOfElemCell;
-    }
-  else
-    {
-      whichEntity=MED_FACE;
-      nbOfElem=nbOfElemFace;
-    }
-}
-
-void MEDLoaderNS::readUMeshDataInMedFile(med_idt fid, med_int meshId, double *&coords, int& nCoords, int& spaceDim, std::list<MEDLoader::MEDConnOfOneElemType>& conn)
-{
-  char nommaa[MED_TAILLE_NOM+1];
-  char maillage_description[MED_TAILLE_DESC+1];
-  char comp[3*MED_TAILLE_PNOM+1];
-  char unit[3*MED_TAILLE_PNOM+1];
-  med_maillage type_maillage;
-  med_int Mdim;
-  MEDmaaInfo(fid,meshId,nommaa,&Mdim,&type_maillage,maillage_description);
-  spaceDim=(int)Mdim;
-  nCoords=MEDnEntMaa(fid,nommaa,MED_COOR,MED_NOEUD,(med_geometrie_element)0,(med_connectivite)0);
-  coords=new double[nCoords*spaceDim];
-  med_repere repere;
-  MEDcoordLire(fid,nommaa,Mdim,coords,MED_FULL_INTERLACE,MED_ALL,NULL,0,&repere,comp,unit);
-  med_booleen inoele, inuele;
-  for(int i=0;i<MED_NBR_GEOMETRIE_MAILLE;i++)
-    {
-      med_geometrie_element curMedType=typmai[i];
-      med_entite_maillage whichEntity;
-      int curNbOfElemM=MEDnEntMaa(fid,nommaa,MED_CONN,MED_MAILLE,curMedType,MED_NOD);
-      int curNbOfElemF=MEDnEntMaa(fid,nommaa,MED_CONN,MED_FACE,curMedType,MED_NOD);
-      int curNbOfElem;
-      MEDLoaderNS::dispatchElems(curNbOfElemM,curNbOfElemF,curNbOfElem,whichEntity);
-      if(curNbOfElem>0)
-        {
-          int *connTab=new int[(curMedType%100)*curNbOfElem];
-          int *fam=new int[curNbOfElem];
-          MEDLoader::MEDConnOfOneElemType elem(typmai2[i],connTab,0,fam,curNbOfElem,-1);
-          int *tmp=new int[curNbOfElem];
-          char *noms=new char[MED_TAILLE_PNOM*curNbOfElem+1];
-          MEDelementsLire(fid,nommaa,Mdim,connTab,MED_FULL_INTERLACE,noms,&inoele,tmp,&inuele,fam,curNbOfElem,whichEntity,curMedType,MED_NOD);
-          delete [] tmp;
-          delete [] noms;
-          //trying to read global numbering
-          int *globArr=new int[curNbOfElem];
-          if(MEDglobalNumLire(fid,nommaa,globArr,curNbOfElem,whichEntity,curMedType)==0)
-            elem.setGlobal(globArr);
-          else
-            delete [] globArr;
-          conn.push_back(elem);
-        }
-    }
-  int curNbOfPolyElem;
-  int curNbOfPolyElemM=MEDnEntMaa(fid,nommaa,MED_CONN,MED_MAILLE,MED_POLYGONE,MED_NOD);
-  int curNbOfPolyElemF=MEDnEntMaa(fid,nommaa,MED_CONN,MED_FACE,MED_POLYGONE,MED_NOD);
-  med_entite_maillage whichPolyEntity;
-  MEDLoaderNS::dispatchElems(curNbOfPolyElemM,curNbOfPolyElemF,curNbOfPolyElem,whichPolyEntity);
-  if(curNbOfPolyElem>0)
-    {
-      med_int arraySize;
-      MEDpolygoneInfo(fid,nommaa,whichPolyEntity,MED_NOD,&arraySize);
-      int *index=new int[curNbOfPolyElem+1];
-      int *locConn=new int[arraySize];
-      int *fam=new int[curNbOfPolyElem];
-      MEDLoader::MEDConnOfOneElemType elem(INTERP_KERNEL::NORM_POLYGON,locConn,index,fam,curNbOfPolyElem,arraySize);
-      MEDpolygoneConnLire(fid,nommaa,index,curNbOfPolyElem+1,locConn,whichPolyEntity,MED_NOD);
-      MEDfamLire(fid,nommaa,fam,curNbOfPolyElem,MED_MAILLE,MED_POLYGONE);
-      conn.push_back(elem);
-    }
-  curNbOfPolyElem=MEDnEntMaa(fid,nommaa,MED_CONN,MED_MAILLE,MED_POLYEDRE,MED_NOD);
-  if(curNbOfPolyElem>0)
-    {
-      med_int indexFaceLgth,connFaceLgth;
-      MEDpolyedreInfo(fid,nommaa,MED_NOD,&indexFaceLgth,&connFaceLgth);
-      int *index=new int[curNbOfPolyElem+1];
-      int *indexFace=new int[indexFaceLgth];
-      int *locConn=new int[connFaceLgth];
-      int *fam=new int[curNbOfPolyElem];
-      MEDpolyedreConnLire(fid,nommaa,index,curNbOfPolyElem+1,indexFace,indexFaceLgth,locConn,MED_NOD);
-      MEDfamLire(fid,nommaa,fam,curNbOfPolyElem,MED_MAILLE,MED_POLYEDRE);
-      int arraySize=connFaceLgth;
-      for(int i=0;i<curNbOfPolyElem;i++)
-        arraySize+=index[i+1]-index[i]-1;
-      int *finalConn=new int[arraySize];
-      int *finalIndex=new int[curNbOfPolyElem+1];
-      finalIndex[0]=1;
-      int *wFinalConn=finalConn;
-      for(int i=0;i<curNbOfPolyElem;i++)
-        {
-          finalIndex[i+1]=finalIndex[i]+index[i+1]-index[i]-1+indexFace[index[i+1]-1]-indexFace[index[i]-1];
-          wFinalConn=std::copy(locConn+indexFace[index[i]-1]-1,locConn+indexFace[index[i]]-1,wFinalConn);
-          for(int j=index[i];j<index[i+1]-1;j++)
-            {
-              *wFinalConn++=0;
-              wFinalConn=std::copy(locConn+indexFace[j]-1,locConn+indexFace[j+1]-1,wFinalConn);
-            }
-        }
-      delete [] index;
-      delete [] locConn;
-      delete [] indexFace;
-      MEDLoader::MEDConnOfOneElemType elem(INTERP_KERNEL::NORM_POLYHED,finalConn,finalIndex,fam,curNbOfPolyElem,arraySize);
-      conn.push_back(elem);
-    }
-}
-
-namespace MEDLoaderNS
-{
-  template<class T>
-  unsigned calculateHighestMeshDim(const std::list<T>& conn)
-  {
-    unsigned ret=0;
-    for(typename std::list<T>::const_iterator iter=conn.begin();iter!=conn.end();iter++)
-      {
-        unsigned curDim=INTERP_KERNEL::CellModel::getCellModel((*iter).getType()).getDimension();
-        if(ret<curDim)
-          ret=curDim;
-      }
-    return ret;
-  }
-  
-  template<class T>
-  void keepSpecifiedMeshDim(typename std::list<T>& conn, unsigned meshDim)
-  {
-    for(typename std::list<T>::iterator iter=conn.begin();iter!=conn.end();)
-      {
-        unsigned curDim=INTERP_KERNEL::CellModel::getCellModel((*iter).getType()).getDimension();
-        if(curDim!=meshDim)
-          {
-            (*iter).releaseArray();
-            iter=conn.erase(iter);
-          }
-        else
-          iter++;
-      }
-  }
-  
-  template<class T>
-  void keepTypes(typename std::list<T>& conn, const std::vector<INTERP_KERNEL::NormalizedCellType>& typesToKeep)
-  {
-    if(!typesToKeep.empty())
-      {
-        for(typename std::list<T>::iterator iter=conn.begin();iter!=conn.end();)
-          {
-            INTERP_KERNEL::NormalizedCellType curType=(*iter).getType();
-            if(std::find(typesToKeep.begin(),typesToKeep.end(),curType)==typesToKeep.end())
-              {
-                (*iter).releaseArray();
-                iter=conn.erase(iter);
-              }
-            else
-              iter++;
-          }
-      }
-  }
-}
-
-class FieldPerTypeAccumulator
-{
-public:
-  int operator()(int res, const MEDLoader::MEDFieldDoublePerCellType& elt) { return res+elt.getNbOfTuple(); }
-};
-
-ParaMEDMEM::DataArrayDouble *MEDLoaderNS::buildArrayFromRawData(const std::list<MEDLoader::MEDFieldDoublePerCellType>& fieldPerType)
-{
-  ParaMEDMEM::DataArrayDouble *ret=ParaMEDMEM::DataArrayDouble::New();
-  int totalNbOfTuple=std::accumulate(fieldPerType.begin(),fieldPerType.end(),0,FieldPerTypeAccumulator());
-  int nbOfComp=(*fieldPerType.begin()).getNbComp();
-  double *ptr=new double[nbOfComp*totalNbOfTuple];
-  ret->useArray(ptr,true,ParaMEDMEM::CPP_DEALLOC,totalNbOfTuple,nbOfComp);
-  std::for_each(fieldPerType.begin(),fieldPerType.end(),FieldPerTypeCopier(ptr));
-  return ret;
-}
-
-class PolyCounterForFams
-{
-public:
-  PolyCounterForFams(int id, const int *index):_id(id),_index(index),_count(0),_sigma(0) { }
-  void operator()(int val) { if(val==_id) _sigma+=_index[_count+1]-_index[_count]; _count++; }
-  int getSigma() const { return _sigma; }
-private:
-  int _id;
-  const int *_index;
-  int _count;
-  int _sigma;
-};
-
-void MEDLoaderNS::tradMEDFileCoreFrmt2MEDCouplingUMesh(const std::list<MEDLoader::MEDConnOfOneElemType>& medConnFrmt,
-                                                       DataArrayInt* &conn,
-                                                       DataArrayInt* &connIndex,
-                                                       const std::vector<int>& familiesToKeep)
-{
-  bool keepAll=familiesToKeep.empty();
-  if(medConnFrmt.empty())
-    {
-      conn=0;
-      connIndex=0;
-      return ;
-    }
-  std::list<MEDLoader::MEDConnOfOneElemType>::const_iterator iter=medConnFrmt.begin();
-  int totalNbOfCells=0;
-  int totalNbOfMedConn=0;
-  for(;iter!=medConnFrmt.end();iter++)
-    {
-      const INTERP_KERNEL::CellModel& cellMod=INTERP_KERNEL::CellModel::getCellModel((*iter).getType());
-      if(keepAll)
-        totalNbOfCells+=(*iter).getLength();
-      else
-        for(std::vector<int>::const_iterator iter2=familiesToKeep.begin();iter2!=familiesToKeep.end();iter2++)
-          totalNbOfCells+=std::count((*iter).getFam(),(*iter).getFam()+(*iter).getLength(),*iter2);
-      if(!cellMod.isDynamic())
-        if(keepAll)
-          totalNbOfMedConn+=(*iter).getLength()*cellMod.getNumberOfNodes();
-        else
-          for(std::vector<int>::const_iterator iter2=familiesToKeep.begin();iter2!=familiesToKeep.end();iter2++)
-            totalNbOfMedConn+=std::count((*iter).getFam(),(*iter).getFam()+(*iter).getLength(),*iter2)*cellMod.getNumberOfNodes();
-      else
-        if(keepAll)
-          totalNbOfMedConn+=(*iter).getConnLength();
-        else
-          for(std::vector<int>::const_iterator iter2=familiesToKeep.begin();iter2!=familiesToKeep.end();iter2++)
-            {
-              PolyCounterForFams res=std::for_each((*iter).getFam(),(*iter).getFam()+(*iter).getLength(),PolyCounterForFams(*iter2,(*iter).getIndex()));
-              totalNbOfMedConn+=res.getSigma();
-            }
-    }
-  connIndex=DataArrayInt::New();
-  conn=DataArrayInt::New();
-  connIndex->alloc(totalNbOfCells+1,1);
-  int *connIdxPtr=connIndex->getPointer();
-  int connFillId=0;
-  conn->alloc(totalNbOfMedConn+totalNbOfCells,1);
-  int *connPtr=conn->getPointer();
-  for(iter=medConnFrmt.begin();iter!=medConnFrmt.end();iter++)
-    {
-      INTERP_KERNEL::NormalizedCellType type=(*iter).getType();
-      const int *sourceConn=(*iter).getArray();
-      const int *sourceIndex=(*iter).getIndex();
-      const INTERP_KERNEL::CellModel& cellMod=INTERP_KERNEL::CellModel::getCellModel(type);
-      int nbOfCellsInCurType;
-      int nbOfNodesIn1Cell=cellMod.getNumberOfNodes();
-      nbOfCellsInCurType=(*iter).getLength();
-      bool isDyn=cellMod.isDynamic();
-      int *tmpConnPtr;
-      for(int i=0;i<nbOfCellsInCurType;i++)
-        {
-          if(keepAll)
-            {
-              *connIdxPtr=connFillId;
-              *connPtr++=type;
-              if(!isDyn)
-                tmpConnPtr=std::transform(sourceConn,sourceConn+nbOfNodesIn1Cell,connPtr,std::bind2nd(std::minus<int>(),1));
-              else
-                tmpConnPtr=std::transform(sourceConn,sourceConn+sourceIndex[i+1]-sourceIndex[i],connPtr,std::bind2nd(std::minus<int>(),1));
-              connIdxPtr++;
-              nbOfNodesIn1Cell=tmpConnPtr-connPtr;
-              connFillId+=nbOfNodesIn1Cell+1;
-              connPtr=tmpConnPtr;
-            }
-          else if(std::find(familiesToKeep.begin(),familiesToKeep.end(),(*iter).getFam()[i])!=familiesToKeep.end())
-            {
-              *connIdxPtr=connFillId;
-              *connPtr++=type;
-              if(!isDyn)
-                tmpConnPtr=std::transform(sourceConn,sourceConn+nbOfNodesIn1Cell,connPtr,std::bind2nd(std::minus<int>(),1));
-              else
-                tmpConnPtr=std::transform(sourceConn,sourceConn+sourceIndex[i+1]-sourceIndex[i],connPtr,std::bind2nd(std::minus<int>(),1));
-              connIdxPtr++;
-              nbOfNodesIn1Cell=tmpConnPtr-connPtr;
-              connFillId+=nbOfNodesIn1Cell+1;
-              connPtr=tmpConnPtr;
-            }
-          sourceConn+=nbOfNodesIn1Cell;
-        }
-      *connIdxPtr=connFillId;
-    }
-}
-
-namespace MEDLoaderNS
-{
-  template<class T>
-  void releaseMEDFileCoreFrmt(typename std::list<T>& medConnFrmt)
-  {
-    for(typename std::list<T>::iterator iter=medConnFrmt.begin();iter!=medConnFrmt.end();iter++)
-      (*iter).releaseArray();
-    medConnFrmt.clear();
-  }
-}
-
-/*!
- * This method builds a sub set of connectivity for a given type 'type'.
- * @param conn input containing connectivity with MEDCoupling format.
- * @param connIndex input containing connectivity index in MEDCoupling format.
- * @param type input specifying which cell types will be extracted in conn4MEDFile. 
- * @param conn4MEDFile output containing the connectivity directly understandable by MEDFile; conn4MEDFile has to be empty before this method called.
- * @param connIndex4MEDFile output containing index connectivity understandable by MEDFile; only used by polygons and polyhedrons (it is face nodal connec).
- * @param connIndexRk24MEDFile output containing index of rank 2 understandable by MEDFile; only used by polyhedrons.
- * @return nb of elements extracted.
- */
-int MEDLoaderNS::buildMEDSubConnectivityOfOneTypeStaticTypes(DataArrayInt *conn, DataArrayInt *connIndex, INTERP_KERNEL::NormalizedCellType type, std::vector<int>& conn4MEDFile)
-{
-  int ret=0;
-  int nbOfElem=connIndex->getNbOfElems()-1;
-  const int *connPtr=conn->getPointer();
-  const int *connIdxPtr=connIndex->getPointer();
-  for(int i=0;i<nbOfElem;i++)
-    {
-      int delta=connIdxPtr[1]-connIdxPtr[0];
-      if(*connPtr==type)
-        {
-          conn4MEDFile.insert(conn4MEDFile.end(),connPtr+1,connPtr+delta);
-          ret++;
-        }
-      connIdxPtr++;
-      connPtr+=delta;
-    }
-  std::transform(conn4MEDFile.begin(),conn4MEDFile.end(),conn4MEDFile.begin(),std::bind2nd(std::plus<int>(),1));
-  return ret;
-}
-
-int MEDLoaderNS::buildMEDSubConnectivityOfOneTypesPolyg(DataArrayInt *conn, DataArrayInt *connIndex, std::vector<int>& conn4MEDFile, std::vector<int>& connIndex4MEDFile)
-{
-  int ret=0;
-  int nbOfElem=connIndex->getNbOfElems()-1;
-  const int *connPtr=conn->getPointer();
-  const int *connIdxPtr=connIndex->getPointer();
-  connIndex4MEDFile.push_back(1);
-  for(int i=0;i<nbOfElem;i++)
-    {
-      int delta=connIdxPtr[1]-connIdxPtr[0];
-      if(*connPtr==INTERP_KERNEL::NORM_POLYGON)
-        {
-          conn4MEDFile.insert(conn4MEDFile.end(),connPtr+1,connPtr+delta);
-          connIndex4MEDFile.push_back(connIndex4MEDFile.back()+delta-1);
-          ret++;
-        }
-      connIdxPtr++;
-      connPtr+=delta;
-    }
-  std::transform(conn4MEDFile.begin(),conn4MEDFile.end(),conn4MEDFile.begin(),std::bind2nd(std::plus<int>(),1));
-  return ret;
-}
-  
-int MEDLoaderNS::buildMEDSubConnectivityOfOneTypesPolyh(DataArrayInt *conn, DataArrayInt *connIndex, std::vector<int>& conn4MEDFile, std::vector<int>& connIndex4MEDFile, std::vector<int>& connIndexRk24MEDFile)
-{
-  return 0;
-}
-  
-/*!
- * This method builds a sub set of connectivity for a given type 'type'.
- * @param conn input containing connectivity with MEDCoupling format.
- * @param connIndex input containing connectivity index in MEDCoupling format.
- * @param type input specifying which cell types will be extracted in conn4MEDFile. 
- * @param conn4MEDFile output containing the connectivity directly understandable by MEDFile; conn4MEDFile has to be empty before this method called.
- * @param connIndex4MEDFile output containing index connectivity understandable by MEDFile; only used by polygons and polyhedrons (it is face nodal connec).
- * @param connIndexRk24MEDFile output containing index of rank 2 understandable by MEDFile; only used by polyhedrons.
- * @return nb of elements extracted.
- */
-int MEDLoaderNS::buildMEDSubConnectivityOfOneType(DataArrayInt *conn, DataArrayInt *connIndex, INTERP_KERNEL::NormalizedCellType type, std::vector<int>& conn4MEDFile,
-                                                  std::vector<int>& connIndex4MEDFile, std::vector<int>& connIndexRk24MEDFile)
-{
-    
-  const INTERP_KERNEL::CellModel& cellMod=INTERP_KERNEL::CellModel::getCellModel(type);
-  if(!cellMod.isDynamic())
-    return buildMEDSubConnectivityOfOneTypeStaticTypes(conn,connIndex,type,conn4MEDFile);
-  else
-    {
-      if(type==INTERP_KERNEL::NORM_POLYGON)
-        return buildMEDSubConnectivityOfOneTypesPolyg(conn,connIndex,conn4MEDFile,connIndex4MEDFile);
-      else
-        return buildMEDSubConnectivityOfOneTypesPolyh(conn,connIndex,conn4MEDFile,connIndex4MEDFile,connIndexRk24MEDFile);
-    }
-}
-  
-/*!
- * @param ids is a in vector containing families ids whose cells have to be kept. If empty all cells are kept.
- * @param typesToKeep is a in vector that indicates which types to keep after dimension filtering.
- * @param meshDimExtract out parameter that gives the mesh dimension.
- */
-MEDCouplingUMesh *MEDLoaderNS::readUMeshFromFileLev1(const char *fileName, const char *meshName, int meshDimRelToMax, const std::vector<int>& ids,
-                                                     const std::vector<INTERP_KERNEL::NormalizedCellType>& typesToKeep, unsigned& meshDimExtract) throw(INTERP_KERNEL::Exception)
-{
-  //Extraction data from MED file.
-  med_idt fid=MEDouvrir((char *)fileName,MED_LECTURE);
-  std::string trueMeshName;
-  med_int mid=getIdFromMeshName(fid,meshName,trueMeshName);
-  double *coords;
-  int nCoords;
-  int spaceDim;
-  std::list<MEDLoader::MEDConnOfOneElemType> conn;
-  readUMeshDataInMedFile(fid,mid,coords,nCoords,spaceDim,conn);
-  meshDimExtract=MEDLoaderNS::calculateHighestMeshDim<MEDLoader::MEDConnOfOneElemType>(conn);
-  meshDimExtract=meshDimExtract+meshDimRelToMax;
-  MEDLoaderNS::keepSpecifiedMeshDim<MEDLoader::MEDConnOfOneElemType>(conn,meshDimExtract);
-  MEDLoaderNS::keepTypes<MEDLoader::MEDConnOfOneElemType>(conn,typesToKeep);
-  MEDfermer(fid);
-  //Put data in returned data structure.
-  MEDCouplingUMesh *ret=MEDCouplingUMesh::New();
-  ret->setName(trueMeshName.c_str());
-  ret->setMeshDimension(meshDimExtract);
-  //
-  DataArrayDouble *coordsArr=DataArrayDouble::New();
-  coordsArr->useArray(coords,true,ParaMEDMEM::CPP_DEALLOC,nCoords,spaceDim);
-  ret->setCoords(coordsArr);
-  coordsArr->decrRef();
-  //
-  DataArrayInt *connArr,*connIndexArr;
-  tradMEDFileCoreFrmt2MEDCouplingUMesh(conn,connArr,connIndexArr,ids);
-  ret->setConnectivity(connArr,connIndexArr);
-  //clean-up
-  if(connArr)
-    connArr->decrRef();
-  if(connIndexArr)
-    connIndexArr->decrRef();
-  releaseMEDFileCoreFrmt<MEDLoader::MEDConnOfOneElemType>(conn);
-  return ret;
-}
-
-ParaMEDMEM::MEDCouplingFieldDouble *MEDLoaderNS::readFieldDoubleLev1(const char *fileName, const char *meshName, int meshDimRelToMax, const char *fieldName, int iteration, int order,
-                                                                     ParaMEDMEM::TypeOfField typeOfOutField)
-{
-  std::list<MEDLoader::MEDFieldDoublePerCellType> fieldPerCellType;
-  double time;
-  readFieldDoubleDataInMedFile(fileName,meshName,fieldName,fieldPerCellType,iteration,order,typeOfOutField,time);
-  std::vector<int> familiesToKeep;
-  std::vector<INTERP_KERNEL::NormalizedCellType> typesToKeep;
-  if(typeOfOutField==ON_CELLS)
-    for(std::list<MEDLoader::MEDFieldDoublePerCellType>::const_iterator iter=fieldPerCellType.begin();iter!=fieldPerCellType.end();iter++)
-      typesToKeep.push_back((*iter).getType());
-  unsigned meshDim;
-  ParaMEDMEM::MEDCouplingUMesh *mesh=readUMeshFromFileLev1(fileName,meshName,meshDimRelToMax,familiesToKeep,typesToKeep,meshDim);
-  if(typeOfOutField==ON_CELLS)
-    MEDLoaderNS::keepSpecifiedMeshDim<MEDLoader::MEDFieldDoublePerCellType>(fieldPerCellType,meshDim);
-  ParaMEDMEM::MEDCouplingFieldDouble *ret=ParaMEDMEM::MEDCouplingFieldDouble::New(typeOfOutField,ONE_TIME);
-  ret->setName(fieldName);
-  ret->setTime(time,iteration,order);
-  ret->setMesh(mesh);
-  mesh->decrRef();
-  ParaMEDMEM::DataArrayDouble *arr=buildArrayFromRawData(fieldPerCellType);
-  ret->setArray(arr);
-  arr->decrRef();
-  releaseMEDFileCoreFrmt<MEDLoader::MEDFieldDoublePerCellType>(fieldPerCellType);
-  return ret;
-}
-
-MEDCouplingUMesh *MEDLoader::ReadUMeshFromFile(const char *fileName, const char *meshName, int meshDimRelToMax) throw(INTERP_KERNEL::Exception)
-{
-  std::vector<int> familiesToKeep;
-  std::vector<INTERP_KERNEL::NormalizedCellType> typesToKeep;
-  unsigned meshDim;
-  return MEDLoaderNS::readUMeshFromFileLev1(fileName,meshName,meshDimRelToMax,familiesToKeep,typesToKeep,meshDim);
-}
-
-ParaMEDMEM::MEDCouplingUMesh *MEDLoader::ReadUMeshFromFile(const char *fileName, int meshDimRelToMax) throw(INTERP_KERNEL::Exception)
-{
-  std::vector<int> familiesToKeep;
-  std::vector<INTERP_KERNEL::NormalizedCellType> typesToKeep;
-  unsigned meshDim;
-  return MEDLoaderNS::readUMeshFromFileLev1(fileName,0,meshDimRelToMax,familiesToKeep,typesToKeep,meshDim);
-}
-
-ParaMEDMEM::MEDCouplingUMesh *MEDLoader::ReadUMeshFromFamilies(const char *fileName, const char *meshName, int meshDimRelToMax, const std::vector<std::string>& fams)
-{
-  std::vector<int> familiesToKeep=MEDLoaderNS::getIdsFromFamilies(fileName,meshName,fams);
-  std::vector<INTERP_KERNEL::NormalizedCellType> typesToKeep;
-  unsigned meshDim;
-  return MEDLoaderNS::readUMeshFromFileLev1(fileName,meshName,meshDimRelToMax,familiesToKeep,typesToKeep,meshDim);
-}
-
-ParaMEDMEM::MEDCouplingUMesh *MEDLoader::ReadUMeshFromGroups(const char *fileName, const char *meshName, int meshDimRelToMax, const std::vector<std::string>& grps)
-{
-  std::vector<int> familiesToKeep=MEDLoaderNS::getIdsFromGroups(fileName,meshName,grps);
-  std::vector<INTERP_KERNEL::NormalizedCellType> typesToKeep;
-  unsigned meshDim;
-  return MEDLoaderNS::readUMeshFromFileLev1(fileName,meshName,meshDimRelToMax,familiesToKeep,typesToKeep,meshDim);
-}
-
-ParaMEDMEM::MEDCouplingFieldDouble *MEDLoader::ReadFieldDoubleCell(const char *fileName, const char *meshName, int meshDimRelToMax, const char *fieldName, int iteration, int order)
-{
-  return MEDLoaderNS::readFieldDoubleLev1(fileName,meshName,meshDimRelToMax,fieldName,iteration,order,ON_CELLS);
-}
-
-ParaMEDMEM::MEDCouplingFieldDouble *MEDLoader::ReadFieldDoubleNode(const char *fileName, const char *meshName, int meshDimRelToMax, const char *fieldName, int iteration, int order)
-{
-  return MEDLoaderNS::readFieldDoubleLev1(fileName,meshName,meshDimRelToMax,fieldName,iteration,order,ON_NODES);
-}
-
-void MEDLoaderNS::writeUMeshDirectly(const char *fileName, ParaMEDMEM::MEDCouplingUMesh *mesh, bool forceFromScratch)
-{
-  med_idt fid=MEDouvrir((char *)fileName,forceFromScratch?MED_CREATION:MED_LECTURE_ECRITURE);
-  std::string meshName(mesh->getName());
-  if(meshName=="")
-    {
-      MEDfermer(fid);
-      throw INTERP_KERNEL::Exception("MEDCouplingMesh must have a not null name !");
-    }
-  char maa[MED_TAILLE_NOM+1];
-  strcpy(maa,meshName.c_str());
-  MEDmaaCr(fid,maa,mesh->getSpaceDimension(),MED_NON_STRUCTURE,maa);
-  std::set<INTERP_KERNEL::NormalizedCellType> allTypes(mesh->getAllTypes());
-  DataArrayInt *conn=mesh->getNodalConnectivity();
-  DataArrayInt *connIndex=mesh->getNodalConnectivityIndex();
-  char familyName[MED_TAILLE_NOM+1];
-  std::fill(familyName,familyName+MED_TAILLE_NOM+1,'\0');
-  const char DftFamilyName[]="DftFamily";
-  std::copy(DftFamilyName,DftFamilyName+sizeof(DftFamilyName),familyName);
-  for(int i=0;i<MED_NBR_GEOMETRIE_MAILLE+2;i++)
-    {
-      med_geometrie_element curMedType=typmai[i];
-      INTERP_KERNEL::NormalizedCellType curType=typmai2[i];
-      if(allTypes.find(curType)!=allTypes.end())
-        {
-          std::vector<int> medConn;
-          std::vector<int> medConnIndex;
-          std::vector<int> medConnIndex2;
-          int nbOfElt=MEDLoaderNS::buildMEDSubConnectivityOfOneType(conn,connIndex,curType,medConn,medConnIndex,medConnIndex2);
-          if(curMedType!=MED_POLYGONE && curMedType!=MED_POLYEDRE)
-            MEDconnEcr(fid,maa,mesh->getMeshDimension(),&medConn[0],MED_FULL_INTERLACE,nbOfElt,MED_MAILLE,curMedType,MED_NOD);
-          else
-            {
-              if(curMedType==MED_POLYGONE)
-                MEDpolygoneConnEcr(fid,maa,&medConnIndex[0],medConnIndex.size(),&medConn[0],MED_MAILLE,MED_NOD);
-            }
-        }
-    }
-  MEDfamCr(fid,maa,familyName,0,0,0,0,0,0,0);
-  DataArrayDouble *arr=mesh->getCoords();
-  char comp[2*MED_TAILLE_PNOM+1];
-  char unit[2*MED_TAILLE_PNOM+1];
-  std::fill(comp,comp+2*MED_TAILLE_PNOM,' ');
-  comp[2*MED_TAILLE_PNOM]='\0';
-  char *work=comp;
-  for(int i=0;i<mesh->getSpaceDimension();i++,work+=3)
-    *work='X'+i;
-  std::fill(unit,unit+2*MED_TAILLE_PNOM+1,'\0');
-  MEDcoordEcr(fid,maa,mesh->getSpaceDimension(),arr->getPointer(),MED_FULL_INTERLACE,mesh->getNumberOfNodes(),MED_CART,comp,unit);
-  MEDfermer(fid);
-}
-
-void MEDLoaderNS::appendFieldDirectly(const char *fileName, ParaMEDMEM::MEDCouplingFieldDouble *f)
-{
-  med_idt fid=MEDouvrir((char *)fileName,MED_LECTURE_ECRITURE);
-  int nbComp=f->getNumberOfComponents();
-  char *comp=new char[nbComp*MED_TAILLE_PNOM+1];
-  std::fill(comp,comp+nbComp*MED_TAILLE_PNOM,' ');
-  comp[nbComp*MED_TAILLE_PNOM]='\0';
-  char *unit=new char[nbComp*MED_TAILLE_PNOM+1];
-  std::fill(unit,unit+nbComp*MED_TAILLE_PNOM,' ');
-  unit[nbComp*MED_TAILLE_PNOM]='\0';
-  MEDchampCr(fid,(char *)f->getName(),MED_FLOAT64,comp,unit,nbComp);
-  med_int numdt,numo;
-  med_float dt;
-  ParaMEDMEM::TypeOfTimeDiscretization td=f->getTimeDiscretization();
-  if(td==ParaMEDMEM::NO_TIME)
-    {
-      numdt=MED_NOPDT; numo=MED_NONOR; dt=0.0;
-    }
-  else if(td==ParaMEDMEM::ONE_TIME)
-    {
-      int tmp1,tmp2;
-      double tmp0=f->getTime(tmp1,tmp2);
-      numdt=(med_int)tmp1; numo=(med_int)tmp2;
-      dt=(med_float)tmp0;
-    }
-  const double *pt=f->getArray()->getConstPointer();
-  switch(f->getTypeOfField())
-    {
-    case ParaMEDMEM::ON_CELLS:
-      {
-        std::list<MEDLoader::MEDFieldDoublePerCellType> split;
-        prepareCellFieldDoubleForWriting(f,split);
-        for(std::list<MEDLoader::MEDFieldDoublePerCellType>::const_iterator iter=split.begin();iter!=split.end();iter++)
-          {
-            char nommaa[MED_TAILLE_NOM+1];
-            std::fill(nommaa,nommaa+MED_TAILLE_NOM,' '); nommaa[MED_TAILLE_NOM]='\0';
-            strcpy(nommaa,f->getMesh()->getName());
-            MEDchampEcr(fid,(char *)nommaa,(char *)f->getName(),(unsigned char*)pt,MED_FULL_INTERLACE,(*iter).getNbOfTuple(),
-                        (char *)MED_NOGAUSS,MED_ALL,(char *)MED_NOPFL,MED_NO_PFLMOD,MED_MAILLE,
-                        typmai3[(int)(*iter).getType()],numdt,(char *)"",dt,numo);
-            pt+=(*iter).getNbOfTuple()*nbComp;
-          }
-        break;
-      }
-    case ParaMEDMEM::ON_NODES:
-      {
-        int nbOfTuples=f->getArray()->getNumberOfTuples();
-        MEDchampEcr(fid,(char *)f->getMesh()->getName(),(char *)f->getName(),(unsigned char*)pt,MED_FULL_INTERLACE,nbOfTuples,(char *)MED_NOGAUSS,
-                    MED_ALL,(char *)MED_NOPFL,MED_NO_PFLMOD,MED_NOEUD,MED_NONE,numdt,(char *)"",dt,numo);
-        break;
-      }
-    default:
-      throw INTERP_KERNEL::Exception("Not managed this type of FIELD !");
-    }
-  delete [] comp;
-  delete [] unit;
-  MEDfermer(fid);
-}
-
-void MEDLoaderNS::prepareCellFieldDoubleForWriting(const ParaMEDMEM::MEDCouplingFieldDouble *f, std::list<MEDLoader::MEDFieldDoublePerCellType>& split)
-{
-  int nbComp=f->getNumberOfComponents();
-  const MEDCouplingMesh *mesh=f->getMesh();
-  const MEDCouplingUMesh *meshC=dynamic_cast<const MEDCouplingUMesh *>(mesh);
-  if(!meshC)
-    throw INTERP_KERNEL::Exception("Not implemented yet for not unstructured mesh !");
-  if(!meshC->checkConsecutiveCellTypes())
-    throw INTERP_KERNEL::Exception("Unstructuded mesh has not consecutive cell types !");
-  const int *connI=meshC->getNodalConnectivityIndex()->getConstPointer();
-  const int *conn=meshC->getNodalConnectivity()->getConstPointer();
-  int nbOfCells=meshC->getNumberOfCells();
-  INTERP_KERNEL::NormalizedCellType curType;
-  for(const int *pt=connI;pt!=connI+nbOfCells;)
-    {
-      curType=(INTERP_KERNEL::NormalizedCellType)conn[*pt];
-      const int *pt2=std::find_if(pt+1,connI+nbOfCells,ConnReaderML(conn,(int)curType));
-      split.push_back(MEDLoader::MEDFieldDoublePerCellType(curType,0,nbComp,pt2-pt));
-      pt=pt2;
-    }
-}
-
-void MEDLoaderNS::writeFieldAndMeshDirectly(const char *fileName, ParaMEDMEM::MEDCouplingFieldDouble *f, bool forceFromScratch)
-{
-  std::string meshName(f->getMesh()->getName());
-  if(meshName.empty())
-    throw INTERP_KERNEL::Exception("Trying to write a mesh (f->getMesh()) with no name ! MED file format needs a not empty mesh name !");
-  std::string fieldName(f->getName());
-  if(fieldName.empty())
-    throw INTERP_KERNEL::Exception("Trying to write a field with no name ! MED file format needs a not empty field name !");
-  MEDCouplingUMesh *mesh=dynamic_cast<MEDCouplingUMesh *>((MEDCouplingMesh *)f->getMesh());
-  writeUMeshDirectly(fileName,mesh,forceFromScratch);
-  appendFieldDirectly(fileName,f);
-}
-
-void MEDLoader::WriteUMesh(const char *fileName, ParaMEDMEM::MEDCouplingUMesh *mesh, bool writeFromScratch)
-{
-  std::string meshName(mesh->getName());
-  if(meshName.empty())
-    throw INTERP_KERNEL::Exception("Trying to write a unstructured mesh with no name ! MED file format needs a not empty mesh name !");
-  int status=MEDLoaderBase::getStatusOfFile(fileName);
-  if(status!=MEDLoaderBase::EXIST_RW && status!=MEDLoaderBase::NOT_EXIST)
-    {
-      std::ostringstream oss; oss << "File with name \'" << fileName << "\' has not valid permissions !";
-      throw INTERP_KERNEL::Exception(oss.str().c_str());
-    }
-  if(writeFromScratch)
-    {
-      MEDLoaderNS::writeUMeshDirectly(fileName,mesh,true);
-      return ;
-    }
-  if(status==MEDLoaderBase::NOT_EXIST)
-    {
-      MEDLoaderNS::writeUMeshDirectly(fileName,mesh,true);
-      return;
-    }
-  else
-    {
-      std::vector<std::string> meshNames=GetMeshNames(fileName);
-      std::string fileNameCpp(mesh->getName());
-      if(std::find(meshNames.begin(),meshNames.end(),fileNameCpp)==meshNames.end())
-        MEDLoaderNS::writeUMeshDirectly(fileName,mesh,false);
-      else
-        {
-          std::ostringstream oss; oss << "File \'" << fileName << "\' already exists and has already a mesh called \"";
-          oss << fileNameCpp << "\" !";
-          throw INTERP_KERNEL::Exception(oss.str().c_str());
-        }
-    }
-}
-
-void MEDLoader::WriteField(const char *fileName, ParaMEDMEM::MEDCouplingFieldDouble *f, bool writeFromScratch)
-{
-  int status=MEDLoaderBase::getStatusOfFile(fileName);
-  if(status!=MEDLoaderBase::EXIST_RW && status!=MEDLoaderBase::NOT_EXIST)
-    {
-      std::ostringstream oss; oss << "File with name \'" << fileName << "\' has not valid permissions !";
-      throw INTERP_KERNEL::Exception(oss.str().c_str());
-    }
-  if(writeFromScratch)
-    {
-      MEDLoaderNS::writeFieldAndMeshDirectly(fileName,f,true);
-     return ;
-    }
-  if(status==MEDLoaderBase::NOT_EXIST)
-    {
-     MEDLoaderNS::writeFieldAndMeshDirectly(fileName,f,true);
-     return ;
-    }
-  else
-    {
-      std::vector<std::string> meshNames=GetMeshNames(fileName);
-      std::string fileNameCpp(f->getMesh()->getName());
-      if(std::find(meshNames.begin(),meshNames.end(),fileNameCpp)==meshNames.end())
-        MEDLoaderNS::writeFieldAndMeshDirectly(fileName,f,false);
-      else
-        {
-          std::ostringstream oss; oss << "File \'" << fileName << "\' already exists and has already a mesh called \"";
-          oss << fileNameCpp << "\" !";
-          throw INTERP_KERNEL::Exception(oss.str().c_str()); 
-        }
-    }
-}
-
-void MEDLoader::WriteFieldUsingAlreadyWrittenMesh(const char *fileName, ParaMEDMEM::MEDCouplingFieldDouble *f)
-{
-  f->checkCoherency();
-  int status=MEDLoaderBase::getStatusOfFile(fileName);
-  if(status!=MEDLoaderBase::EXIST_RW)
-    {
-      std::ostringstream oss; oss << "File with name \'" << fileName << "\' has not valid permissions or not exists !";
-      throw INTERP_KERNEL::Exception(oss.str().c_str());
-    }
-  MEDLoaderNS::appendFieldDirectly(fileName,f);
-}
diff --git a/src/MEDLoader/MEDLoader.hxx b/src/MEDLoader/MEDLoader.hxx
deleted file mode 100644
index cb2f74381..000000000
--- a/src/MEDLoader/MEDLoader.hxx
+++ /dev/null
@@ -1,98 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __MEDLOADER_HXX__
-#define __MEDLOADER_HXX__
-
-#include "InterpKernelException.hxx"
-#include "NormalizedUnstructuredMesh.hxx"
-
-#include <list>
-#include <vector>
-
-namespace ParaMEDMEM
-{
-  class DataArrayInt;
-  class MEDCouplingUMesh;
-  class MEDCouplingFieldDouble;
-}
-
-class MEDLoader
-{
-public:
-  class MEDConnOfOneElemType
-  {
-  public:
-    MEDConnOfOneElemType(INTERP_KERNEL::NormalizedCellType type, int *conn, int *index, int *fam, int lgth, int connLgth);
-    INTERP_KERNEL::NormalizedCellType getType() const { return _type; }
-    int getLength() const { return _lgth; }
-    int getConnLength() const { return _conn_lgth; }
-    int *getArray() const { return _conn; }
-    int *getIndex() const { return _index; }
-    int *getFam() const { return _fam; }
-    void setGlobal(int *global);
-    void releaseArray();
-  private:
-    int _lgth;
-    int *_fam;
-    int *_conn;
-    int *_index;
-    int *_global;
-    int _conn_lgth;
-    INTERP_KERNEL::NormalizedCellType _type;
-  };
-
-  class MEDFieldDoublePerCellType
-  {
-  public:
-    MEDFieldDoublePerCellType(INTERP_KERNEL::NormalizedCellType type, double *values, int ncomp, int ntuple);
-    INTERP_KERNEL::NormalizedCellType getType() const { return _type; }
-    int getNbComp() const { return _ncomp; }
-    int getNbOfTuple() const { return _ntuple; }
-    int getNbOfValues() const { return _ncomp*_ntuple; }
-    double *getArray() const { return _values; }
-    void releaseArray();
-  private:
-    int _ntuple;
-    int _ncomp;
-    double *_values;
-    INTERP_KERNEL::NormalizedCellType _type;
-  };
-  //
-  static std::vector<std::string> GetMeshNames(const char *fileName);
-  static std::vector<std::string> GetMeshGroupsNames(const char *fileName, const char *meshName);
-  static std::vector<std::string> GetMeshFamilyNames(const char *fileName, const char *meshName);
-  static std::vector<std::string> GetCellFieldNamesOnMesh(const char *fileName, const char *meshName);
-  static std::vector<std::string> GetNodeFieldNamesOnMesh(const char *fileName, const char *meshName);
-  static std::vector< std::pair<int,int> > GetCellFieldIterations(const char *fileName, const char *fieldName);
-  static std::vector< std::pair<int,int> > GetNodeFieldIterations(const char *fileName, const char *fieldName);
-  static ParaMEDMEM::MEDCouplingUMesh *ReadUMeshFromFamilies(const char *fileName, const char *meshName, int meshDimRelToMax, const std::vector<std::string>& fams);
-  static ParaMEDMEM::MEDCouplingUMesh *ReadUMeshFromGroups(const char *fileName, const char *meshName, int meshDimRelToMax, const std::vector<std::string>& grps);
-  static ParaMEDMEM::MEDCouplingUMesh *ReadUMeshFromFile(const char *fileName, const char *meshName, int meshDimRelToMax=0) throw(INTERP_KERNEL::Exception);
-  static ParaMEDMEM::MEDCouplingUMesh *ReadUMeshFromFile(const char *fileName, int meshDimRelToMax=0) throw(INTERP_KERNEL::Exception);
-  static ParaMEDMEM::MEDCouplingFieldDouble *ReadFieldDoubleCell(const char *fileName, const char *meshName, int meshDimRelToMax, const char *fieldName, int iteration, int order);
-  static ParaMEDMEM::MEDCouplingFieldDouble *ReadFieldDoubleNode(const char *fileName, const char *meshName, int meshDimRelToMax, const char *fieldName, int iteration, int order);
-  static void WriteUMesh(const char *fileName, ParaMEDMEM::MEDCouplingUMesh *mesh, bool writeFromScratch);
-  static void WriteField(const char *fileName, ParaMEDMEM::MEDCouplingFieldDouble *f, bool writeFromScratch);
-  static void WriteFieldUsingAlreadyWrittenMesh(const char *fileName, ParaMEDMEM::MEDCouplingFieldDouble *f);
-private:
-  MEDLoader();
-};
-
-#endif
diff --git a/src/MEDLoader/MEDLoaderBase.cxx b/src/MEDLoader/MEDLoaderBase.cxx
deleted file mode 100644
index ec50466fd..000000000
--- a/src/MEDLoader/MEDLoaderBase.cxx
+++ /dev/null
@@ -1,61 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "MEDLoaderBase.hxx"
-#include "InterpKernelException.hxx"
-
-#include <fstream>
-
-int MEDLoaderBase::getStatusOfFile(const char *fileName)
-{
-  std::ifstream ifs;
-  ifs.open(fileName);
-  unsigned int res=0;
-  if((ifs.rdstate() & std::ifstream::failbit)!=0)
-    {
-      res+=1;
-      ifs.close();
-    }
-  std::ofstream ofs(fileName,std::ios_base::app);
-  if((ofs.rdstate() & std::ofstream::failbit)!=0)
-    {
-      ofs.close();
-      res+=2;
-    }
-  switch(res)
-    {
-    case 0:
-      return EXIST_RW;
-    case 1:
-      {
-        std::ifstream ifs2;
-        ifs2.open(fileName);
-        if((ifs2.rdstate() & std::ifstream::failbit)!=0)
-          return EXIST_WRONLY;
-        else
-          return NOT_EXIST;
-      }
-    case 2:
-      return EXIST_RDONLY;
-    case 3:
-      return DIR_LOCKED;
-    default:
-      throw INTERP_KERNEL::Exception("Internal error !");
-    }
-}
diff --git a/src/MEDLoader/MEDLoaderBase.hxx b/src/MEDLoader/MEDLoaderBase.hxx
deleted file mode 100644
index 06df9422b..000000000
--- a/src/MEDLoader/MEDLoaderBase.hxx
+++ /dev/null
@@ -1,35 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __MEDLOADERBASE_HXX__
-#define __MEDLOADERBASE_HXX__
-
-class MEDLoaderBase
-{
-public:
-  static int getStatusOfFile(const char *fileName);
-public:
-  static const int EXIST_RW=0;
-  static const int NOT_EXIST=1;
-  static const int EXIST_RDONLY=2;
-  static const int EXIST_WRONLY=3;
-  static const int DIR_LOCKED=4;
-};
-
-#endif
diff --git a/src/MEDLoader/Makefile.am b/src/MEDLoader/Makefile.am
deleted file mode 100755
index bc5acc7e0..000000000
--- a/src/MEDLoader/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-#  Copyright (C) 2007-2010  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
-#
-
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-if !MED_ENABLE_MICROMED
-  SUBDIRS = . Swig
-endif
-
-#DIST_SUBDIRS = Swig
-
-lib_LTLIBRARIES = libmedloader.la
-
-salomeinclude_HEADERS= \
-MEDLoader.hxx MEDLoaderBase.hxx
-
-dist_libmedloader_la_SOURCES= \
-MEDLoader.cxx MEDLoaderBase.cxx
-
-libmedloader_la_CPPFLAGS= $(MPI_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
-	-I$(srcdir)/../INTERP_KERNEL \
-	-I$(srcdir)/../INTERP_KERNEL/Geometric2D \
-	-I$(srcdir)/../INTERP_KERNEL/Bases \
-	-I$(srcdir)/../MEDCoupling
-
-# change motivated by the bug KERNEL4778.
-libmedloader_la_LDFLAGS= ../MEDCoupling/libmedcoupling.la \
-../INTERP_KERNEL/libinterpkernel.la $(MPI_LIBS) $(MED2_LIBS) $(HDF5_LIBS)
diff --git a/src/MEDLoader/Swig/Makefile.am b/src/MEDLoader/Swig/Makefile.am
deleted file mode 100644
index eda6669e2..000000000
--- a/src/MEDLoader/Swig/Makefile.am
+++ /dev/null
@@ -1,54 +0,0 @@
-#  Copyright (C) 2007-2010  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
-#
-
-#  MED MEDMEM_SWIG : binding of C++ implementation and Python
-#
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-lib_LTLIBRARIES = _libMEDLoader_Swig.la
-
-salomeinclude_HEADERS =  \
-	libMEDLoader_Swig.i
-
-SWIG_DEF = libMEDLoader_Swig.i
-
-SWIG_FLAGS = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../../MEDCoupling -I$(srcdir)/../../MEDCoupling_Swig \
-	-I$(srcdir)/../../INTERP_KERNEL -I$(srcdir)/../../INTERP_KERNEL/Bases
-
-dist__libMEDLoader_Swig_la_SOURCES   = $(SWIG_DEF)
-nodist__libMEDLoader_Swig_la_SOURCES = libMEDLoader_Swig_wrap.cxx
-libMEDLoader_Swig.py: libMEDLoader_Swig_wrap.cxx
-
-libMEDLoader_Swig_wrap.cxx: $(SWIG_DEF)
-	$(SWIG) $(SWIG_FLAGS) -o $@  $<
-
-_libMEDLoader_Swig_la_CPPFLAGS = $(PYTHON_INCLUDES) \
-	$(MED2_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
-	-I$(srcdir)/../../INTERP_KERNEL \
-	-I$(srcdir)/.. -I$(srcdir)/../../MEDCoupling_Swig -I$(srcdir)/../../INTERP_KERNEL/Bases \
-	-I$(srcdir)/../../MEDCoupling
-
-_libMEDLoader_Swig_la_LDFLAGS  = -module $(MED2_LIBS) $(HDF5_LIBS) $(PYTHON_LIBS) \
-	../../MEDCoupling/libmedcoupling.la ../../INTERP_KERNEL/libinterpkernel.la \
-	../libmedloader.la
-
-CLEANFILES = libMEDLoader_Swig_wrap.cxx libMEDLoader_Swig.py
-
-dist_salomescript_DATA= libMEDLoader_Swig.py
-
diff --git a/src/MEDLoader/Swig/libMEDLoader_Swig.i b/src/MEDLoader/Swig/libMEDLoader_Swig.i
deleted file mode 100644
index 5a5b6087a..000000000
--- a/src/MEDLoader/Swig/libMEDLoader_Swig.i
+++ /dev/null
@@ -1,71 +0,0 @@
-//  Copyright (C) 2007-2010  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 libMEDLoader_Swig
-
-%include std_vector.i
-%include std_string.i
-
-%include "MEDCouplingTypemaps.i"
-%include "libMEDCoupling_Swig.i"
-
-%{
-#include "MEDLoader.hxx"
-%}
-
-#if SWIG_VERSION >= 0x010329
-%template()  std::vector<std::string>;
-#endif
-
-%newobject MEDLoader::ReadUMeshFromFile;
-%newobject MEDLoader::ReadFieldDoubleCell;
-
-class MEDLoader
-{
-public:
-  static std::vector<std::string> GetMeshNames(const char *fileName);
-  static std::vector<std::string> GetMeshGroupsNames(const char *fileName, const char *meshName);
-  static std::vector<std::string> GetMeshFamilyNames(const char *fileName, const char *meshName);
-  static std::vector<std::string> GetCellFieldNamesOnMesh(const char *fileName, const char *meshName);
-  static std::vector<std::string> GetNodeFieldNamesOnMesh(const char *fileName, const char *meshName);
-  %extend
-     {
-       static PyObject *GetCellFieldIterations(const char *fileName, const char *fieldName)
-       {
-         std::vector< std::pair<int,int> > res=MEDLoader::GetCellFieldIterations(fileName,fieldName);
-         PyObject *ret=PyList_New(res.size());
-         int rk=0;
-         for(std::vector< std::pair<int,int> >::const_iterator iter=res.begin();iter!=res.end();iter++,rk++)
-           {
-             PyObject *elt=PyTuple_New(2);
-             PyTuple_SetItem(elt,0,SWIG_From_int((*iter).first));
-             PyTuple_SetItem(elt,1,SWIG_From_int((*iter).second));
-             PyList_SetItem(ret,rk,elt);
-           }
-         return ret;
-       }
-     }
-  //std::vector< std::pair<int,int> > GetNodeFieldIterations(const char *fileName, const char *fieldName);
-  static ParaMEDMEM::MEDCouplingUMesh *ReadUMeshFromFile(const char *fileName, const char *meshName, int meshDimRelToMax=0) throw(INTERP_KERNEL::Exception);
-  static ParaMEDMEM::MEDCouplingUMesh *ReadUMeshFromFile(const char *fileName, int meshDimRelToMax=0) throw(INTERP_KERNEL::Exception);
-  static ParaMEDMEM::MEDCouplingFieldDouble *ReadFieldDoubleCell(const char *fileName, const char *meshName, int meshDimRelToMax, const char *fieldName, int iteration, int order);
-  static void WriteUMesh(const char *fileName, ParaMEDMEM::MEDCouplingUMesh *mesh, bool writeFromScratch);
-  static void WriteField(const char *fileName, ParaMEDMEM::MEDCouplingFieldDouble *f, bool writeFromScratch);
-  static void WriteFieldUsingAlreadyWrittenMesh(const char *fileName, ParaMEDMEM::MEDCouplingFieldDouble *f);
-};
diff --git a/src/ParaMEDLoader/ParaMEDLoader.cxx b/src/ParaMEDLoader/ParaMEDLoader.cxx
deleted file mode 100644
index 6aa090c71..000000000
--- a/src/ParaMEDLoader/ParaMEDLoader.cxx
+++ /dev/null
@@ -1,64 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "ParaMEDLoader.hxx"
-#include "MEDLoader.hxx"
-#include "ParaMESH.hxx"
-#include "BlockTopology.hxx"
-#include "MEDCouplingUMesh.hxx"
-
-#include <fstream>
-
-using namespace ParaMEDMEM;
-
-ParaMEDLoader::ParaMEDLoader()
-{
-}
-
-void ParaMEDLoader::WriteParaMesh(const char *fileName, ParaMEDMEM::ParaMESH *mesh)
-{
-  if(!mesh->getBlockTopology()->getProcGroup()->containsMyRank())
-    return ;
-  int myRank=mesh->getBlockTopology()->getProcGroup()->myRank();
-  int nbDomains=mesh->getBlockTopology()->getProcGroup()->size();
-  std::vector<std::string> fileNames(nbDomains);
-  for(int i=0;i<nbDomains;i++)
-    {
-      std::ostringstream sstr;
-      sstr << fileName << i+1 << ".med";
-      fileNames[i]=sstr.str();
-    }
-  if(myRank==0)
-    WriteMasterFile(fileName,fileNames,mesh->getCellMesh()->getName());
-  MEDLoader::WriteUMesh(fileNames[myRank].c_str(),dynamic_cast<MEDCouplingUMesh *>(mesh->getCellMesh()),true);
-}
-
-/*!
- * This method builds the master file 'fileName' of a parallel MED file defined in 'fileNames'.
- */
-void ParaMEDLoader::WriteMasterFile(const char *fileName, const std::vector<std::string>& fileNames, const char *meshName)
-{
-  int nbOfDom=fileNames.size();
-  std::ofstream fs(fileName);
-  fs << "#MED Fichier V 2.3" << " " << std::endl;
-  fs << "#"<<" " << std::endl;
-  fs << nbOfDom <<" " << std::endl;
-  for(int i=0;i<nbOfDom;i++)
-    fs << meshName << " " << i+1 << " " << meshName << "_" << i+1 << " localhost " << fileNames[i] << " " << std::endl;
-}
diff --git a/src/ParaMEDLoader/ParaMEDLoader.hxx b/src/ParaMEDLoader/ParaMEDLoader.hxx
deleted file mode 100644
index da127d8c0..000000000
--- a/src/ParaMEDLoader/ParaMEDLoader.hxx
+++ /dev/null
@@ -1,41 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef __PARAMEDLOADER_HXX__
-#define __PARAMEDLOADER_HXX__
-
-#include <string>
-#include <vector>
-
-namespace ParaMEDMEM
-{
-  class ParaMESH;
-  class ParaFIELD;
-}
-
-class ParaMEDLoader
-{
-public:
-  static void WriteParaMesh(const char *fileName, ParaMEDMEM::ParaMESH *mesh);
-  static void WriteMasterFile(const char *fileName, const std::vector<std::string>& fileNames, const char *meshName);
-private:
-  ParaMEDLoader();
-};
-
-#endif
diff --git a/src/ParaMEDMEM/ICoCoField.cxx b/src/ParaMEDMEM/ICoCoField.cxx
deleted file mode 100644
index 973376921..000000000
--- a/src/ParaMEDMEM/ICoCoField.cxx
+++ /dev/null
@@ -1,51 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-//////////////////////////////////////////////////////////////////////////////
-// File:        ICoCoField.cpp
-// Directory:   $TRIO_U_ROOT/Kernel/ICoCo
-// Version:     /main/1
-//////////////////////////////////////////////////////////////////////////////
-
-#include <ICoCoField.hxx>
-#include <string>
-#include <stdlib.h>
-
-using namespace ICoCo;
-using std::string;
-
-Field::Field() {
-  _name=new string;
-}
-
-Field::~Field() {
-  delete _name;
-}
-
-void Field::setName(const string& name) {
-  *_name=name;
-}
-
-const string& Field::getName() const {
-  return *_name;
-}
-
-const char* Field::getCharName() const {
-  return _name->c_str();
-}
diff --git a/src/ParaMEDMEM/ICoCoTrioField.cxx b/src/ParaMEDMEM/ICoCoTrioField.cxx
deleted file mode 100644
index 1e5a14d22..000000000
--- a/src/ParaMEDMEM/ICoCoTrioField.cxx
+++ /dev/null
@@ -1,265 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-//////////////////////////////////////////////////////////////////////////////
-// File:        ICoCoTrioField.cpp
-// Directory:   $TRIO_U_ROOT/Kernel/Framework
-// Version:     
-//////////////////////////////////////////////////////////////////////////////
-
-#include <ICoCoTrioField.hxx>
-#include <string.h>
-#include <iostream>
-#include <stdlib.h>
-
-using namespace ICoCo;
-using namespace std;
-
-TrioField::TrioField() :
-  _type(0),
-  _connectivity(0),
-  _coords(0),
-  _field(0),
-  _has_field_ownership(false) { }
-
-TrioField::~TrioField() {
-  clear();
-}
-
-// After the call to clear(), all pointers are null and field ownership is false.
-// Arrays are deleted if necessary
-void TrioField::clear() {
-  if (_connectivity)
-    delete[] _connectivity;
-  if (_coords)
-    delete[] _coords;
-  if (_field && _has_field_ownership)
-    delete[] _field;
-  _connectivity=0;
-  _coords=0;
-  _field=0;
-  _has_field_ownership=false;
-}
-
-int TrioField::nb_values() const
-{
-  if (_type==0)
-    return _nb_elems;
-  else   
-    if (_type==1)
-      return _nbnodes;
-  exit(-1);
-  return -1;
-  
-}
-void TrioField::save(ostream& os) const{
-  os <<getName()<<endl;
-  os<<_type<<endl;
-  os<<_mesh_dim<<endl;
-  os<< _space_dim<<endl;
-  os<< _nbnodes<<endl;
-  os<< _nodes_per_elem<<endl;
-  os<< _nb_elems<<endl;
-    
-  os<< _itnumber<<endl;
-  for (int i=0;i<_nb_elems;i++) 
-    {
-      for (int j=0;j<_nodes_per_elem;j++)
-        os << " "<<_connectivity[i*_nodes_per_elem+j];
-      os<<endl;
-    }
-  
-  
-  for (int i=0;i<_nbnodes;i++) 
-    {
-      for (int j=0;j<_space_dim;j++)
-        os <<" "<< _coords[i*_space_dim+j] ;
-      os  << endl;
-    }
-  
-  os<< _time1<<endl;
-  os<<_time2<<endl;
-  os<< _nb_field_components<<endl;
-  if (_field)
-    {
-      os <<1<<endl;
-      for (int i=0;i<nb_values();i++) 
-        {
-          for (int j=0;j<_nb_field_components;j++)
-            os <<" "<< _field[i*_nb_field_components+j];
-          os << endl;
-        }
-    }
-  else
-    {
-      os<<0<<endl;
-    }
-  os<< _has_field_ownership<<endl;
-}
-
-
-
-void TrioField::restore(istream& in) {
-  string name;
-  in >> name; 
-  setName(name);
-  in>>_type;
-  in>>_mesh_dim;
-  in>> _space_dim;
-  in>> _nbnodes;
-  in>> _nodes_per_elem;
-  in>> _nb_elems;
-    
-  in>> _itnumber;
-  if (_connectivity)
-    delete [] _connectivity;
-  _connectivity=new int[_nodes_per_elem*_nb_elems];
-  for (int i=0;i<_nb_elems;i++) 
-    {
-      for (int j=0;j<_nodes_per_elem;j++)
-        in>>_connectivity[i*_nodes_per_elem+j];
-      
-    }
-  if (_coords)
-    delete [] _coords;
-  _coords=new double[_nbnodes*_space_dim];
-  for (int i=0;i<_nbnodes;i++) 
-    {
-      for (int j=0;j<_space_dim;j++)
-        in>> _coords[i*_space_dim+j] ;
-     
-    }
-  
-  in>> _time1;
-  in>>_time2;
-  in>> _nb_field_components;
-  int test;
-  in>> test;
-  if (test)
-    {
-      if (_field)
-        delete [] _field;
-      _field=new double[_nb_field_components*nb_values()];
-      for (int i=0;i<nb_values();i++) 
-        {
-          for (int j=0;j<_nb_field_components;j++)
-            in>> _field[i*_nb_field_components+j];
-         
-        }
-    }
-  else
-    {
-      _field=0;
-    }
-  in>> _has_field_ownership;
-}
-   void TrioField::print() {
-
-  }
-
-// After the call to set_standalone(), field ownership is true and field is allocated
-// to the size _nb_field_components*_nb_elems.
-// The values of the field have been copied if necessary.
-void TrioField::set_standalone() {
-  if (!_field) {
-    _field=new double[_nb_field_components*_nb_elems];
-    _has_field_ownership=true;
-    
-  }
-  else if (!_has_field_ownership) {
-    double *tmp_field=new double[_nb_field_components*_nb_elems];
-    memcpy(tmp_field,_field,_nb_field_components*_nb_elems*sizeof(double));
-    _field=tmp_field;
-    _has_field_ownership=true;
-  }
-}
-
-// Used to simulate a 0D geometry (Cathare/Trio for example).
-void TrioField::dummy_geom() {
-  _mesh_dim=2;
-  _space_dim=2;
-  _nbnodes=3;
-  _nodes_per_elem=3;
-  _nb_elems=1;
-  _itnumber=0;
-  if (_connectivity)
-    delete[] _connectivity;
-  _connectivity=new int[3];
-  _connectivity[0]=1;
-  _connectivity[1]=2;
-  _connectivity[2]=3;
-  if (_coords)
-    delete[] _coords;
-  _coords=new double[6];
-  _coords[0]=0;
-  _coords[1]=0;
-  _coords[2]=1;
-  _coords[3]=0;
-  _coords[4]=0;
-  _coords[5]=1;
-  if (_field && _has_field_ownership)
-    delete[] _field;
-  _has_field_ownership=false;
-  _field=0;
-}
-
-// Surcharge de l'operateur = pour la classe TrioField
-// remplace les valeurs trouvee dans le TrioField donnee en parametre
-TrioField& TrioField::operator=(const TrioField& NewField){
-
-    clear();
-    _type=NewField._type;
-    _mesh_dim=NewField._mesh_dim;
-    _space_dim=NewField._space_dim;
-    _nbnodes=NewField._nbnodes;
-    _nodes_per_elem=NewField._nodes_per_elem;
-    _nb_elems=NewField._nb_elems;
-    _itnumber=NewField._itnumber;
-      // std::string _name; // ?? Hérité de la classe mère
-    _time1=NewField._time1;
-    _time2=NewField._time2;
-    _nb_field_components=NewField._nb_field_components;
-
-    if (!NewField._connectivity)
-        _connectivity=0;
-    else {
-      _connectivity=new int[_nodes_per_elem*_nb_elems];
-      memcpy( _connectivity,NewField._connectivity,_nodes_per_elem*_nb_elems*sizeof(int));
-    }
-
-    if (!NewField._coords)
-        _coords=0;
-    else {
-       _coords=new double[_nbnodes*_space_dim];
-       memcpy( _coords,NewField._coords,_nbnodes*_space_dim*sizeof(double));
-    }
-
-    //Copie des valeurs du champ
-    _has_field_ownership=NewField._has_field_ownership;
-    if (_has_field_ownership) {
-      _field=new double[_nb_elems*_nb_field_components];
-      memcpy(_field,NewField._field,_nb_elems*_nb_field_components*sizeof(double));
-    }
-    else
-      _field=NewField._field;
-
-    return(*this);
-
-}
-
diff --git a/src/ParaMEDMEM/InterpKernelDEC.cxx b/src/ParaMEDMEM/IntersectionDEC.cxx
similarity index 78%
rename from src/ParaMEDMEM/InterpKernelDEC.cxx
rename to src/ParaMEDMEM/IntersectionDEC.cxx
index 1eb5a243e..fc209b47e 100644
--- a/src/ParaMEDMEM/InterpKernelDEC.cxx
+++ b/src/ParaMEDMEM/IntersectionDEC.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <mpi.h>
 #include "CommInterface.hxx"
 #include "Topology.hxx"
@@ -27,18 +26,20 @@
 #include "ParaMESH.hxx"
 #include "DEC.hxx"
 #include "InterpolationMatrix.hxx"
-#include "InterpKernelDEC.hxx"
+#include "IntersectionDEC.hxx"
 #include "ElementLocator.hxx"
 
+
+
 namespace ParaMEDMEM
 {  
 
   /*!
-    \defgroup interpkerneldec InterpKernelDEC
+    \defgroup intersectiondec IntersectionDEC
 
     \section overview Overview
 
-    The InterpKernelDEC enables the \ref conservativeremapping of fields between two parallel codes. This remapping is based on the computation of intersection volumes between elements from code A and elements from code B. The computation is possible for 3D meshes, 2D meshes, and 3D-surface meshes. Dimensions must be similar for code A and code B (for instance, though it could be desirable, it is not yet possible to couple 3D surfaces with 2D surfaces).
+    The IntersectionDEC enables the \ref conservativeremapping of fields between two parallel codes. This remapping is based on the computation of intersection volumes between elements from code A and elements from code B. The computation is possible for 3D meshes, 2D meshes, and 3D-surface meshes. Dimensions must be similar for code A and code B (for instance, though it could be desirable, it is not yet possible to couple 3D surfaces with 2D surfaces).
 
     In the present version, only fields lying on elements are considered.
 
@@ -46,15 +47,15 @@ namespace ParaMEDMEM
 
     \image latex NonCoincident_small.eps "Example showing the transfer from a field based on a quadrangular mesh to a triangular mesh. In a P0-P0 interpolation, to obtain the value on a triangle, the values on quadrangles are weighted by their intersection area and summed."
 
-    A typical use of InterpKernelDEC encompasses two distinct phases :
-    - A setup phase during which the intersection volumes are computed and the communication structures are setup. This corresponds to calling the InterpKernelDEC::synchronize() method.
+    A typical use of IntersectionDEC encompasses two distinct phases :
+    - A setup phase during which the intersection volumes are computed and the communication structures are setup. This corresponds to calling the IntersectionDEC::synchronize() method.
     - A use phase during which the remappings are actually performed. This corresponds to the calls to sendData() and recvData() which actually trigger the data exchange. The data exchange are synchronous in the current version of the library so that recvData() and sendData() calls must be synchronized on code A and code B processor groups. 
 
-    The following code excerpt illutrates a typical use of the InterpKernelDEC class.
+    The following code excerpt illutrates a typical use of the IntersectionDEC class.
 
     \code
     ...
-    InterpKernelDEC dec(groupA, groupB);
+    IntersectionDEC dec(groupA, groupB);
     dec.attachLocalField(field);
     dec.synchronize();
     if (groupA.containsMyRank())
@@ -81,15 +82,15 @@ namespace ParaMEDMEM
 
 
 
-    \section interpkerneldec_options Options
-    On top of \ref dec_options, options supported by %InterpKernelDEC objects are
+    \section intersectiondec_options Options
+    On top of \ref dec_options, options supported by %IntersectionDEC objects are
     related to the underlying Intersector class. 
     All the options available in the intersector objects are
-    available for the %InterpKernelDEC object. The various options available for  * intersectors can be reviewed in \ref InterpKerIntersectors.
+    available for the %IntersectionDEC object. The various options available for  * intersectors can be reviewed in \ref InterpKerIntersectors.
  
     For instance :
     \verbatim
-    InterpKernelDEC dec(source_group, target_group);
+    IntersectionDEC dec(source_group, target_group);
     dec.attachLocalField(field);
     dec.setOptions("DoRotate",false);
     dec.setOptions("Precision",1e-12);
@@ -100,16 +101,16 @@ namespace ParaMEDMEM
   */
 
   /*!
-    \addtogroup interpkerneldec
+    \addtogroup intersectiondec
     @{
   */
   
-  InterpKernelDEC::InterpKernelDEC()
+  IntersectionDEC::IntersectionDEC()
   {  
   }
 
   /*!
-    This constructor creates an InterpKernelDEC which has \a source_group as a working side 
+    This constructor creates an IntersectionDEC which has \a source_group as a working side 
     and  \a target_group as an idle side. All the processors will actually participate, but intersection computations will be performed on the working side during the \a synchronize() phase.
     The constructor must be called synchronously on all processors of both processor groups.
 
@@ -117,20 +118,13 @@ namespace ParaMEDMEM
     \param target_group lazy side ProcessorGroup
 
   */
-  InterpKernelDEC::InterpKernelDEC(ProcessorGroup& source_group, ProcessorGroup& target_group):
+  IntersectionDEC::IntersectionDEC(ProcessorGroup& source_group, ProcessorGroup& target_group):
     DEC(source_group, target_group),_interpolation_matrix(0)
   {
 
   }
 
-  InterpKernelDEC::InterpKernelDEC(const int *src_ids_bg, const int *src_ids_end,
-                                   const int *trg_ids_bg, const int *trg_ids_end,
-                                   const MPI_Comm& world_comm):DEC(src_ids_bg,src_ids_end,trg_ids_bg,trg_ids_end,world_comm),
-                                                               _interpolation_matrix(0)
-  {
-  }
-
-  InterpKernelDEC::~InterpKernelDEC()
+  IntersectionDEC::~IntersectionDEC()
   {
     if (_interpolation_matrix !=0)
       delete _interpolation_matrix;
@@ -148,55 +142,54 @@ namespace ParaMEDMEM
     the working side during a \a sendData() call.
 
   */
-  void InterpKernelDEC::synchronize()
+  void IntersectionDEC::synchronize()
   {
-    if(!isInUnion())
-      return ;
-    delete _interpolation_matrix;
-    _interpolation_matrix = new InterpolationMatrix (_local_field, *_source_group,*_target_group,*this,*this); 
+    ParaMEDMEM::ParaMESH* para_mesh = _local_field->getSupport();
+    //cout <<"size of Interpolation Matrix"<<sizeof(InterpolationMatrix)<<endl;
+    _interpolation_matrix = new InterpolationMatrix (para_mesh, *_source_group,*_target_group,*this,*this); 
 
     //setting up the communication DEC on both sides  
     if (_source_group->containsMyRank())
       {
         //locate the distant meshes
-        ElementLocator locator(*_local_field, *_target_group, *_source_group);
+        ElementLocator locator(*para_mesh, *_target_group);
 
-        //transfering option from InterpKernelDEC to ElementLocator                 
+        //transfering option from IntersectionDEC to ElementLocator                 
         locator.setBoundingBoxAdjustment(getBoundingBoxAdjustment());
 
-        MEDCouplingPointSet* distant_mesh=0; 
+        MEDCouplingUMesh* distant_mesh=0; 
         int* distant_ids=0;
-        std::string distantMeth;
         for (int i=0; i<_target_group->size(); i++)
           {
             //        int idistant_proc = (i+_source_group->myRank())%_target_group->size();
-            int idistant_proc=i;
+            int       idistant_proc=i;
 
             //gathers pieces of the target meshes that can intersect the local mesh
             locator.exchangeMesh(idistant_proc,distant_mesh,distant_ids);
+            std::string distantMeth;
+            locator.exchangeMethod(_method,idistant_proc,distantMeth);
             if (distant_mesh !=0)
               {
-                locator.exchangeMethod(_method,idistant_proc,distantMeth);
                 //adds the contribution of the distant mesh on the local one
                 int idistant_proc_in_union=_union_group->translateRank(_target_group,idistant_proc);
                 std::cout <<"add contribution from proc "<<idistant_proc_in_union<<" to proc "<<_union_group->myRank()<<std::endl;
                 _interpolation_matrix->addContribution(*distant_mesh,idistant_proc_in_union,distant_ids,_method,distantMeth);
+
                 distant_mesh->decrRef();
-                delete [] distant_ids;
+                delete[] distant_ids;
                 distant_mesh=0;
                 distant_ids=0;
               }
-          }
-       _interpolation_matrix->finishContributionW(locator);
+          }  
       }
 
     if (_target_group->containsMyRank())
       {
-        ElementLocator locator(*_local_field, *_source_group, *_target_group);
-        //transfering option from InterpKernelDEC to ElementLocator
+        ElementLocator locator(*para_mesh, *_source_group);
+        //transfering option from IntersectionDEC to ElementLocator
         locator.setBoundingBoxAdjustment(getBoundingBoxAdjustment());
 
-        MEDCouplingPointSet* distant_mesh=0;
+        MEDCouplingUMesh* distant_mesh=0;
         int* distant_ids=0;
         for (int i=0; i<_source_group->size(); i++)
           {
@@ -205,17 +198,16 @@ namespace ParaMEDMEM
             //gathers pieces of the target meshes that can intersect the local mesh
             locator.exchangeMesh(idistant_proc,distant_mesh,distant_ids);
             std::cout << " Data sent from "<<_union_group->myRank()<<" to source proc "<< idistant_proc<<std::endl;
+            std::string distantMeth;
+            locator.exchangeMethod(_method,idistant_proc,distantMeth);
             if (distant_mesh!=0)
               {
-                std::string distantMeth;
-                locator.exchangeMethod(_method,idistant_proc,distantMeth);
                 distant_mesh->decrRef();
-                delete [] distant_ids;
+                delete[] distant_ids;
                 distant_mesh=0;
                 distant_ids=0;
               }
-          }
-        _interpolation_matrix->finishContributionL(locator);
+          }      
       }
     _interpolation_matrix->prepare();
   }
@@ -224,7 +216,7 @@ namespace ParaMEDMEM
   /*!
     Receives the data whether the processor is on the working side or on the lazy side. It must match a \a sendData() call on the other side.
   */
-  void InterpKernelDEC::recvData()
+  void IntersectionDEC::recvData()
   {
     if (_source_group->containsMyRank())
       _interpolation_matrix->transposeMultiply(*_local_field->getField());
@@ -232,7 +224,7 @@ namespace ParaMEDMEM
       {
         _interpolation_matrix->multiply(*_local_field->getField());
         if (getForcedRenormalization())
-          renormalizeTargetField(getMeasureAbsStatus());
+          renormalizeTargetField();
       }
   }
 
@@ -242,7 +234,7 @@ namespace ParaMEDMEM
     will be time-interpolated from the field values received.
     \param time time at which the value is desired
   */
-  void InterpKernelDEC::recvData( double time )
+  void IntersectionDEC::recvData( double time )
   {
     _interpolation_matrix->getAccessDEC()->setTime(time);
     recvData() ;
@@ -252,14 +244,14 @@ namespace ParaMEDMEM
     Sends the data whether the processor is on the working side or on the lazy side.
     It must match a recvData() call on the other side.
   */
-  void InterpKernelDEC::sendData()
+  void IntersectionDEC::sendData()
   {
     if (_source_group->containsMyRank())
       {
     
         _interpolation_matrix->multiply(*_local_field->getField());
         if (getForcedRenormalization())
-          renormalizeTargetField(getMeasureAbsStatus());
+          renormalizeTargetField();
     
       }
     else if (_target_group->containsMyRank())
@@ -271,7 +263,7 @@ namespace ParaMEDMEM
     \param time time at which the value is available
     \param deltatime time interval between the value presently sent and the next one. 
   */
-  void InterpKernelDEC::sendData( double time , double deltatime )
+  void IntersectionDEC::sendData( double time , double deltatime )
   {
     _interpolation_matrix->getAccessDEC()->setTime(time,deltatime);
     sendData() ;
diff --git a/src/ParaMEDMEM/InterpKernelDEC.hxx b/src/ParaMEDMEM/IntersectionDEC.hxx
similarity index 75%
rename from src/ParaMEDMEM/InterpKernelDEC.hxx
rename to src/ParaMEDMEM/IntersectionDEC.hxx
index 908f21700..6659155c8 100644
--- a/src/ParaMEDMEM/InterpKernelDEC.hxx
+++ b/src/ParaMEDMEM/IntersectionDEC.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,9 +16,8 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-#ifndef __INTERPKERNELDEC_HXX__
-#define __INTERPKERNELDEC_HXX__
+#ifndef __INTERSECTIONDEC_HXX__
+#define __INTERSECTIONDEC_HXX__
 
 #include "DEC.hxx"
 #include "MxN_Mapping.hxx"
@@ -28,15 +27,12 @@ namespace ParaMEDMEM
 {
   class InterpolationMatrix;
 
-  class InterpKernelDEC : public DEC, public INTERP_KERNEL::InterpolationOptions
+  class IntersectionDEC : public DEC, public INTERP_KERNEL::InterpolationOptions
   {
   public:  
-    InterpKernelDEC();
-    InterpKernelDEC(ProcessorGroup& source_group, ProcessorGroup& target_group);
-    InterpKernelDEC(const int *src_ids_bg, const int *src_ids_end,
-                    const int *trg_ids_bg, const int *trg_ids_end,
-                    const MPI_Comm& world_comm=MPI_COMM_WORLD);
-    virtual ~InterpKernelDEC();
+    IntersectionDEC();
+    IntersectionDEC(ProcessorGroup& source_group, ProcessorGroup& target_group);
+    virtual ~IntersectionDEC();
     void synchronize();
     void recvData();
     void recvData(double time);
diff --git a/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx b/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx
new file mode 100644
index 000000000..2cabfb740
--- /dev/null
+++ b/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx
@@ -0,0 +1,418 @@
+//  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
+//
+#include "MEDLoader.hxx"
+#include "CellModel.hxx"
+#include "ParaMESH.hxx"
+#include "BlockTopology.hxx"
+#include "MEDCouplingUMesh.hxx"
+
+extern "C"
+{
+#include "med.h"
+}
+
+#include <string>
+#include <cstring>
+#include <sstream>
+#include <fstream>
+
+med_geometrie_element typmai[MED_NBR_GEOMETRIE_MAILLE] = { MED_POINT1,
+                                                           MED_SEG2,
+                                                           MED_SEG3,
+                                                           MED_TRIA3,
+                                                           MED_TRIA6,
+                                                           MED_QUAD4,
+                                                           MED_QUAD8,
+                                                           MED_TETRA4,
+                                                           MED_TETRA10,
+                                                           MED_HEXA8,
+                                                           MED_HEXA20,
+                                                           MED_PENTA6,
+                                                           MED_PENTA15,
+                                                           MED_PYRA5,
+                                                           MED_PYRA13 };
+
+INTERP_KERNEL::NormalizedCellType typmai2[MED_NBR_GEOMETRIE_MAILLE] = { INTERP_KERNEL::NORM_ERROR,
+                                                                        INTERP_KERNEL::NORM_SEG2,
+                                                                        INTERP_KERNEL::NORM_SEG3,
+                                                                        INTERP_KERNEL::NORM_TRI3,
+                                                                        INTERP_KERNEL::NORM_TRI6,
+                                                                        INTERP_KERNEL::NORM_QUAD4,
+                                                                        INTERP_KERNEL::NORM_QUAD8,
+                                                                        INTERP_KERNEL::NORM_TETRA4,
+                                                                        INTERP_KERNEL::NORM_TETRA10,
+                                                                        INTERP_KERNEL::NORM_HEXA8,
+                                                                        INTERP_KERNEL::NORM_HEXA20,
+                                                                        INTERP_KERNEL::NORM_PENTA6,
+                                                                        INTERP_KERNEL::NORM_PENTA15,
+                                                                        INTERP_KERNEL::NORM_PYRA5,
+                                                                        INTERP_KERNEL::NORM_PYRA13 };
+
+using namespace ParaMEDMEM;
+
+const char WHITE_SPACES[]=" \n";
+
+MEDLoader::MEDConnOfOneElemType::MEDConnOfOneElemType(INTERP_KERNEL::NormalizedCellType type, int *conn, int lgth):_lgth(lgth),
+                                                                                                                   _conn(conn),_global(0),
+                                                                                                                   _type(type)
+{
+}
+
+void MEDLoader::MEDConnOfOneElemType::setGlobal(int *global)
+{
+  if(_global!=global)
+    {
+      if(_global)
+        delete [] _global;
+      _global=global;
+    }
+}
+
+void MEDLoader::MEDConnOfOneElemType::releaseArray()
+{
+  delete [] _conn;
+  delete [] _global;
+}
+
+std::string buildStringFromFortran(const char *expr, int lgth)
+{
+  std::string ret(expr,lgth);
+  std::string whiteSpaces(WHITE_SPACES);
+  std::size_t lgthReal=strlen(ret.c_str());
+  std::string ret2=ret.substr(0,lgthReal);
+  std::size_t found=ret2.find_last_not_of(whiteSpaces);
+  if (found!=std::string::npos)
+    ret2.erase(found+1);
+  else
+    ret2.clear();//ret is all whitespace
+  return ret2;
+}
+
+namespace MEDLoader
+{
+  med_int getIdFromMeshName(med_idt fid, const char *meshName) throw(INTERP_KERNEL::Exception)
+  {
+    if(meshName==0)
+      return 1;
+    med_int n=MEDnMaa(fid);
+    if(n==0)
+      throw INTERP_KERNEL::Exception("No mesh in file.");
+    med_maillage type_maillage;
+    char maillage_description[MED_TAILLE_DESC+1];
+    med_int dim;
+    char nommaa[MED_TAILLE_NOM+1];
+    std::ostringstream os;
+    for(med_int i=1;i<=n;i++)
+      {
+        MEDmaaInfo(fid,i,nommaa,&dim,&type_maillage,maillage_description);
+        std::string cur=buildStringFromFortran(nommaa,sizeof(nommaa));
+        if(cur==meshName)
+          return i;
+        os << "\'" << cur.c_str() << "\' "; 
+      }
+    std::ostringstream os2;
+    os2 << "MeshName '" << meshName << "' not in file : meshes available : " << os.str();
+    throw INTERP_KERNEL::Exception(os2.str().c_str());
+  }
+
+  void readUMeshDataInMedFile(med_idt fid, med_int meshId, double *&coords, int& nCoords, int& spaceDim, std::list<MEDLoader::MEDConnOfOneElemType>& conn)
+  {
+    char nommaa[MED_TAILLE_NOM+1];
+    char maillage_description[MED_TAILLE_DESC+1];
+    char comp[3*MED_TAILLE_PNOM+1];
+    char unit[3*MED_TAILLE_PNOM+1];
+    med_maillage type_maillage;
+    med_int Mdim;
+    MEDmaaInfo(fid,meshId,nommaa,&Mdim,&type_maillage,maillage_description);
+    spaceDim=(int)Mdim;
+    nCoords=MEDnEntMaa(fid,nommaa,MED_COOR,MED_NOEUD,(med_geometrie_element)0,(med_connectivite)0);
+    coords=new double[nCoords*spaceDim];
+    med_repere repere;
+    MEDcoordLire(fid,nommaa,Mdim,coords,MED_FULL_INTERLACE,MED_ALL,NULL,0,&repere,comp,unit);
+    med_booleen inoele, inuele;
+    for(int i=0;i<MED_NBR_GEOMETRIE_MAILLE;i++)
+      {
+        med_geometrie_element curMedType=typmai[i];
+        med_entite_maillage whichEntity;
+        int curNbOfElemM=MEDnEntMaa(fid,nommaa,MED_CONN,MED_MAILLE,curMedType,MED_NOD);
+        int curNbOfElemF=MEDnEntMaa(fid,nommaa,MED_CONN,MED_FACE,curMedType,MED_NOD);
+        int curNbOfElem;
+        if(curNbOfElemF>curNbOfElemM)
+          {
+            curNbOfElem=curNbOfElemF;
+            whichEntity=MED_FACE;
+          }
+        else
+          {
+            curNbOfElem=curNbOfElemM;
+            whichEntity=MED_MAILLE;
+          }
+        if(curNbOfElem>0)
+          {
+            int *connTab=new int[(curMedType%100)*curNbOfElem];
+            MEDLoader::MEDConnOfOneElemType elem(typmai2[i],connTab,curNbOfElem);
+            int *tmp=new int[curNbOfElem];
+            int *fam=new int[curNbOfElem];
+            char *noms=new char[MED_TAILLE_PNOM*curNbOfElem+1];
+            MEDelementsLire(fid,nommaa,Mdim,connTab,MED_FULL_INTERLACE,noms,&inoele,tmp,&inuele,fam,curNbOfElem,whichEntity,curMedType,MED_NOD);
+            delete [] tmp;
+            delete [] fam;
+            delete [] noms;
+            //trying to read global numbering
+            int *globArr=new int[curNbOfElem];
+            if(MEDglobalNumLire(fid,nommaa,globArr,curNbOfElem,whichEntity,curMedType)==0)
+              elem.setGlobal(globArr);
+            else
+              delete [] globArr;
+            conn.push_back(elem);
+          }
+      }
+  }
+}
+
+unsigned MEDLoader::calculateHighestMeshDim(const std::list<MEDLoader::MEDConnOfOneElemType>& conn)
+{
+  unsigned ret=0;
+  for(std::list<MEDLoader::MEDConnOfOneElemType>::const_iterator iter=conn.begin();iter!=conn.end();iter++)
+    {
+      unsigned curDim=INTERP_KERNEL::CellModel::getCellModel((*iter).getType()).getDimension();
+      if(ret<curDim)
+        ret=curDim;
+    }
+  return ret;
+}
+
+void MEDLoader::keepSpecifiedMeshDim(std::list<MEDLoader::MEDConnOfOneElemType>& conn, unsigned meshDim)
+{
+  for(std::list<MEDLoader::MEDConnOfOneElemType>::iterator iter=conn.begin();iter!=conn.end();)
+    {
+      unsigned curDim=INTERP_KERNEL::CellModel::getCellModel((*iter).getType()).getDimension();
+      if(curDim!=meshDim)
+        {
+          (*iter).releaseArray();
+          iter=conn.erase(iter);
+        }
+      else
+        iter++;
+    }
+}
+
+void MEDLoader::tradMEDFileCoreFrmt2MEDCouplingUMesh(const std::list<MEDLoader::MEDConnOfOneElemType>& medConnFrmt,
+                                                     DataArrayInt* &conn,
+                                                     DataArrayInt* &connIndex)
+{
+  if(medConnFrmt.empty())
+    {
+      conn=0;
+      connIndex=0;
+      return ;
+    }
+  std::list<MEDLoader::MEDConnOfOneElemType>::const_iterator iter=medConnFrmt.begin();
+  int totalNbOfCells=0;
+  int totalNbOfMedConn=0;
+  for(;iter!=medConnFrmt.end();iter++)
+    {
+      const INTERP_KERNEL::CellModel& cellMod=INTERP_KERNEL::CellModel::getCellModel((*iter).getType());
+      totalNbOfCells+=(*iter).getLength();
+      if(!cellMod.isDynamic())
+        totalNbOfMedConn+=(*iter).getLength()*cellMod.getNumberOfNodes();
+      else
+        throw INTERP_KERNEL::Exception("Polyg/polh not implemented yet !");
+    }
+  connIndex=DataArrayInt::New();
+  conn=DataArrayInt::New();
+  connIndex->alloc(totalNbOfCells+1,1);
+  int *connIdxPtr=connIndex->getPointer();
+  int connFillId=0;
+  conn->alloc(totalNbOfMedConn+totalNbOfCells,1);
+  int *connPtr=conn->getPointer();
+  for(iter=medConnFrmt.begin();iter!=medConnFrmt.end();iter++)
+    {
+      INTERP_KERNEL::NormalizedCellType type=(*iter).getType();
+      int *sourceConn=(*iter).getArray();
+      const INTERP_KERNEL::CellModel& cellMod=INTERP_KERNEL::CellModel::getCellModel(type);
+      int nbOfCellsInCurType;
+      int nbOfNodesIn1Cell=cellMod.getNumberOfNodes();
+      if(!cellMod.isDynamic())
+        nbOfCellsInCurType=(*iter).getLength();
+      else
+        throw INTERP_KERNEL::Exception("Polyg/polh not implemented yet !");
+      if(!cellMod.isDynamic())
+        {
+          for(int i=0;i<nbOfCellsInCurType;i++,connIdxPtr++)
+            {
+              *connIdxPtr=connFillId;
+              *connPtr++=type;
+              connPtr=std::transform(sourceConn,sourceConn+nbOfNodesIn1Cell,connPtr,std::bind2nd(std::minus<int>(),1));
+              connFillId+=nbOfNodesIn1Cell+1;
+              sourceConn+=nbOfNodesIn1Cell;
+            }
+          *connIdxPtr=connFillId;
+        }
+    }
+}
+
+void MEDLoader::releaseMEDFileCoreFrmt(std::list<MEDLoader::MEDConnOfOneElemType>& medConnFrmt)
+{
+  for(std::list<MEDLoader::MEDConnOfOneElemType>::iterator iter=medConnFrmt.begin();iter!=medConnFrmt.end();iter++)
+    (*iter).releaseArray();
+  medConnFrmt.clear();
+}
+
+/*!
+ * This method builds a sub set of connectivity for a given type 'type'.
+ * @param conn input containing connectivity with MEDCoupling format.
+ * @param connIndex input containing connectivity index in MEDCoupling format.
+ * @param type input specifying which cell types will be extracted in conn4MEDFile. 
+ * @param conn4MEDFile output containing the connectivity directly understandable by MEDFile; conn4MEDFile has to be empty before this method called.
+ * @return nb of elements extracted.
+ */
+int MEDLoader::buildMEDSubConnectivityOfOneType(DataArrayInt *conn, DataArrayInt *connIndex, INTERP_KERNEL::NormalizedCellType type, std::vector<int>& conn4MEDFile)
+{
+  int ret=0;
+  int nbOfElem=connIndex->getNbOfElems()-1;
+  const int *connPtr=conn->getPointer();
+  const int *connIdxPtr=connIndex->getPointer();
+  for(int i=0;i<nbOfElem;i++)
+    {
+      int delta=connIdxPtr[1]-connIdxPtr[0];
+      if(*connPtr==type)
+        {
+          conn4MEDFile.insert(conn4MEDFile.end(),connPtr+1,connPtr+delta);
+          ret++;
+        }
+      connIdxPtr++;
+      connPtr+=delta;
+    }
+  std::transform(conn4MEDFile.begin(),conn4MEDFile.end(),conn4MEDFile.begin(),std::bind2nd(std::plus<int>(),1));
+  return ret;
+}
+
+MEDCouplingUMesh *MEDLoader::ReadUMeshFromFile(const char *fileName, const char *meshName, int meshDimRelToMax) throw(INTERP_KERNEL::Exception)
+{
+  //Extraction data from MED file.
+  med_idt fid=MEDouvrir((char *)fileName,MED_LECTURE);
+  med_int mid=getIdFromMeshName(fid,meshName);
+  unsigned meshDimExtract;
+  double *coords;
+  int nCoords;
+  int spaceDim;
+  std::list<MEDLoader::MEDConnOfOneElemType> conn;
+  readUMeshDataInMedFile(fid,mid,coords,nCoords,spaceDim,conn);
+  meshDimExtract=calculateHighestMeshDim(conn);
+  meshDimExtract=meshDimExtract+meshDimRelToMax;
+  keepSpecifiedMeshDim(conn,meshDimExtract);
+  MEDfermer(fid);
+  //Put data in returned data structure.
+  MEDCouplingUMesh *ret=MEDCouplingUMesh::New();
+  ret->setName(meshName);
+  ret->setMeshDimension(meshDimExtract);
+  //
+  DataArrayDouble *coordsArr=DataArrayDouble::New();
+  coordsArr->useArray(coords,true,ParaMEDMEM::CPP_DEALLOC,nCoords,spaceDim);
+  ret->setCoords(coordsArr);
+  coordsArr->decrRef();
+  //
+  DataArrayInt *connArr,*connIndexArr;
+  tradMEDFileCoreFrmt2MEDCouplingUMesh(conn,connArr,connIndexArr);
+  ret->setConnectivity(connArr,connIndexArr);
+  //clean-up
+  if(connArr)
+    connArr->decrRef();
+  if(connIndexArr)
+    connIndexArr->decrRef();
+  releaseMEDFileCoreFrmt(conn);
+  return ret;
+}
+
+void MEDLoader::writeUMesh(const char *fileName, ParaMEDMEM::MEDCouplingUMesh *mesh)
+{
+  med_idt fid=MEDouvrir((char *)fileName,MED_CREATION);
+  char maa[MED_TAILLE_NOM+1];
+  std::fill(maa,maa+MED_TAILLE_NOM+1,'\0');
+  const char *meshName=mesh->getName();
+  strcpy(maa,meshName);
+  MEDmaaCr(fid,maa,mesh->getMeshDimension(),MED_NON_STRUCTURE,maa);
+  std::set<INTERP_KERNEL::NormalizedCellType> allTypes(mesh->getAllTypes());
+  DataArrayInt *conn=mesh->getNodalConnectivity();
+  DataArrayInt *connIndex=mesh->getNodalConnectivityIndex();
+  char familyName[MED_TAILLE_NOM+1];
+  std::fill(familyName,familyName+MED_TAILLE_NOM+1,'\0');
+  const char DftFamilyName[]="DftFamily";
+  std::copy(DftFamilyName,DftFamilyName+sizeof(DftFamilyName),familyName);
+  for(int i=0;i<MED_NBR_GEOMETRIE_MAILLE;i++)
+    {
+      med_geometrie_element curMedType=typmai[i];
+      INTERP_KERNEL::NormalizedCellType curType=typmai2[i];
+      if(allTypes.find(curType)!=allTypes.end())
+        {
+          std::vector<int> medConn;
+          int nbOfElt=buildMEDSubConnectivityOfOneType(conn,connIndex,curType,medConn);
+          MEDconnEcr(fid,maa,mesh->getMeshDimension(),&medConn[0],MED_FULL_INTERLACE,nbOfElt,MED_MAILLE,curMedType,MED_NOD);
+        }
+    }
+  MEDfamCr(fid,maa,familyName,0,0,0,0,0,0,0);
+  DataArrayDouble *arr=mesh->getCoords();
+  char comp[2*MED_TAILLE_PNOM+1];
+  char unit[2*MED_TAILLE_PNOM+1];
+  std::fill(comp,comp+2*MED_TAILLE_PNOM,' ');
+  comp[2*MED_TAILLE_PNOM]='\0';
+  char *work=comp;
+  for(int i=0;i<mesh->getSpaceDimension();i++,work+=3)
+    *work='X'+i;
+  std::fill(unit,unit+2*MED_TAILLE_PNOM+1,'\0');
+  MEDcoordEcr(fid,maa,mesh->getSpaceDimension(),arr->getPointer(),MED_FULL_INTERLACE,mesh->getNumberOfNodes(),MED_CART,comp,unit);
+  MEDfermer(fid);
+}
+
+/*!
+ * This method builds the master file 'fileName' of a parallel MED file defined in 'fileNames'.
+ */
+void MEDLoader::writeMasterFile(const char *fileName, const std::vector<std::string>& fileNames, const char *meshName)
+{
+  int nbOfDom=fileNames.size();
+  std::ofstream fs(fileName);
+  fs << "#MED Fichier V 2.3" << " " << std::endl;
+  fs << "#"<<" " << std::endl;
+  fs << nbOfDom <<" " << std::endl;
+  for(int i=0;i<nbOfDom;i++)
+    fs << meshName << " " << i+1 << " " << meshName << "_" << i+1 << " localhost " << fileNames[i] << " " << std::endl;
+}
+
+void MEDLoader::writeParaMesh(const char *fileName, ParaMEDMEM::ParaMESH *mesh)
+{
+  if(!mesh->getBlockTopology()->getProcGroup()->containsMyRank())
+    return ;
+  int myRank=mesh->getBlockTopology()->getProcGroup()->myRank();
+  int nbDomains=mesh->getBlockTopology()->getProcGroup()->size();
+  std::vector<std::string> fileNames(nbDomains);
+  for(int i=0;i<nbDomains;i++)
+    {
+      std::ostringstream sstr;
+      sstr << fileName << i+1 << ".med";
+      fileNames[i]=sstr.str();
+    }
+  if(myRank==0)
+    writeMasterFile(fileName,fileNames,mesh->getCellMesh()->getName());
+  writeUMesh(fileNames[myRank].c_str(),mesh->getCellMesh());
+}
+
+void MEDLoader::writeParaField(const char *fileName, const char *meshName, ParaMEDMEM::ParaFIELD *f)
+{
+}
diff --git a/src/ParaMEDMEM/MEDLoader/MEDLoader.hxx b/src/ParaMEDMEM/MEDLoader/MEDLoader.hxx
new file mode 100644
index 000000000..b5f7065da
--- /dev/null
+++ b/src/ParaMEDMEM/MEDLoader/MEDLoader.hxx
@@ -0,0 +1,69 @@
+//  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
+//
+#ifndef __MEDLOADER_HXX__
+#define __MEDLOADER_HXX__
+
+#include "InterpKernelException.hxx"
+#include "NormalizedUnstructuredMesh.hxx"
+
+#include <list>
+#include <vector>
+
+namespace ParaMEDMEM
+{
+  class ParaMESH;
+  class ParaFIELD;
+  class DataArrayInt;
+  class MEDCouplingUMesh;
+}
+
+namespace MEDLoader
+{
+  class MEDConnOfOneElemType
+  {
+  public:
+    MEDConnOfOneElemType(INTERP_KERNEL::NormalizedCellType type, int *conn, int lgth);
+    INTERP_KERNEL::NormalizedCellType getType() const { return _type; }
+    int getLength() const { return _lgth; }
+    int *getArray() const { return _conn; }
+    void setGlobal(int *global);
+    void releaseArray();
+  private:
+    int _lgth;
+    int *_conn;
+    int *_global;
+    INTERP_KERNEL::NormalizedCellType _type;
+  };
+  unsigned calculateHighestMeshDim(const std::list<MEDConnOfOneElemType>& conn);
+  void keepSpecifiedMeshDim(std::list<MEDConnOfOneElemType>& conn, unsigned meshDim);
+  void tradMEDFileCoreFrmt2MEDCouplingUMesh(const std::list<MEDConnOfOneElemType>& medConnFrmt,
+                                            ParaMEDMEM::DataArrayInt* &conn,
+                                            ParaMEDMEM::DataArrayInt* &connIndex);
+  void releaseMEDFileCoreFrmt(std::list<MEDLoader::MEDConnOfOneElemType>& medConnFrmt);
+  void writeMasterFile(const char *fileName, const std::vector<std::string>& fileNames, const char *meshName);
+  int buildMEDSubConnectivityOfOneType(ParaMEDMEM::DataArrayInt *conn, ParaMEDMEM::DataArrayInt *connIndex,
+                                       INTERP_KERNEL::NormalizedCellType type, std::vector<int>& conn4MEDFile);
+  //
+  ParaMEDMEM::MEDCouplingUMesh *ReadUMeshFromFile(const char *fileName, const char *meshName=0, int meshDimRelToMax=0) throw(INTERP_KERNEL::Exception);
+  void writeUMesh(const char *fileName, ParaMEDMEM::MEDCouplingUMesh *mesh);
+  void writeParaMesh(const char *fileName, ParaMEDMEM::ParaMESH *mesh);
+  void writeParaField(const char *fileName, const char *meshName, ParaMEDMEM::ParaFIELD *f);
+}
+
+#endif
diff --git a/src/ParaMEDLoader/Makefile.am b/src/ParaMEDMEM/MEDLoader/Makefile.am
similarity index 58%
rename from src/ParaMEDLoader/Makefile.am
rename to src/ParaMEDMEM/MEDLoader/Makefile.am
index 624e6148b..372249430 100755
--- a/src/ParaMEDLoader/Makefile.am
+++ b/src/ParaMEDMEM/MEDLoader/Makefile.am
@@ -1,4 +1,4 @@
-#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+#  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
@@ -16,27 +16,24 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-lib_LTLIBRARIES = libparamedloader.la
+lib_LTLIBRARIES= libparamedmemmedloader.la
 
 salomeinclude_HEADERS= \
-ParaMEDLoader.hxx
+MEDLoader.hxx
 
-dist_libparamedloader_la_SOURCES= \
-ParaMEDLoader.cxx
+dist_libparamedmemmedloader_la_SOURCES= \
+MEDLoader.cxx
 
 #libmedmem_la_LDFLAGS= -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome 
-libparamedloader_la_CPPFLAGS= $(MPI_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
-	-I$(srcdir)/../INTERP_KERNEL \
-	-I$(srcdir)/../INTERP_KERNEL/Geometric2D \
-	-I$(srcdir)/../INTERP_KERNEL/Bases \
-	-I$(srcdir)/../MEDCoupling \
-	-I$(srcdir)/../MEDLoader \
-	-I$(srcdir)/../ParaMEDMEM
+libparamedmemmedloader_la_CPPFLAGS= $(MPI_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
+	-I$(srcdir)/../../INTERP_KERNEL \
+	-I$(srcdir)/../../INTERP_KERNEL/Geometric2D \
+	-I$(srcdir)/../../INTERP_KERNEL/Bases \
+	-I$(srcdir)/../../MEDCoupling \
+	-I$(srcdir)/../
 
-libparamedloader_la_LDFLAGS= ../ParaMEDMEM/libparamedmem.la \
-	../MEDLoader/libmedloader.la \
-	../MEDCoupling/libmedcoupling.la \
-	../INTERP_KERNEL/libinterpkernel.la $(MPI_LIBS) $(MED2_LIBS) $(HDF5_LIBS)
+# change motivated by the bug KERNEL4778.
+libparamedmemmedloader_la_LDFLAGS= ../../MEDCoupling/libmedcoupling.la \
+../../INTERP_KERNEL/libinterpkernel.la $(MPI_LIBS) $(MED2_LIBS) $(HDF5_LIBS)
diff --git a/src/ParaMEDMEMTest/MPIAccessDECTest.cxx b/src/ParaMEDMEM/Test/MPIAccessDECTest.cxx
similarity index 96%
rename from src/ParaMEDMEMTest/MPIAccessDECTest.cxx
rename to src/ParaMEDMEM/Test/MPIAccessDECTest.cxx
index 00ad69dab..f9ae283ac 100644
--- a/src/ParaMEDMEMTest/MPIAccessDECTest.cxx
+++ b/src/ParaMEDMEM/Test/MPIAccessDECTest.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include "MPIAccessDECTest.hxx"
 #include <cppunit/TestAssert.h>
 
diff --git a/src/ParaMEDMEMTest/MPIAccessDECTest.hxx b/src/ParaMEDMEM/Test/MPIAccessDECTest.hxx
similarity index 98%
rename from src/ParaMEDMEMTest/MPIAccessDECTest.hxx
rename to src/ParaMEDMEM/Test/MPIAccessDECTest.hxx
index 5ee346ac3..9f14a40cb 100644
--- a/src/ParaMEDMEMTest/MPIAccessDECTest.hxx
+++ b/src/ParaMEDMEM/Test/MPIAccessDECTest.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #ifndef _MPIACCESSDECTEST_HXX_
 #define _MPIACCESSDECTEST_HXX_
 
diff --git a/src/ParaMEDMEMTest/MPIAccessTest.cxx b/src/ParaMEDMEM/Test/MPIAccessTest.cxx
similarity index 96%
rename from src/ParaMEDMEMTest/MPIAccessTest.cxx
rename to src/ParaMEDMEM/Test/MPIAccessTest.cxx
index d8413f1fc..e07a55e5f 100644
--- a/src/ParaMEDMEMTest/MPIAccessTest.cxx
+++ b/src/ParaMEDMEM/Test/MPIAccessTest.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include "MPIAccessTest.hxx"
 #include <cppunit/TestAssert.h>
 
diff --git a/src/ParaMEDMEMTest/MPIAccessTest.hxx b/src/ParaMEDMEM/Test/MPIAccessTest.hxx
similarity index 98%
rename from src/ParaMEDMEMTest/MPIAccessTest.hxx
rename to src/ParaMEDMEM/Test/MPIAccessTest.hxx
index ddb899053..308e6d2af 100644
--- a/src/ParaMEDMEMTest/MPIAccessTest.hxx
+++ b/src/ParaMEDMEM/Test/MPIAccessTest.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #ifndef _MPIACCESSTEST_HXX_
 #define _MPIACCESSTEST_HXX_
 
diff --git a/src/ParaMEDMEMTest/MPIMainTest.hxx b/src/ParaMEDMEM/Test/MPIMainTest.hxx
similarity index 93%
rename from src/ParaMEDMEMTest/MPIMainTest.hxx
rename to src/ParaMEDMEM/Test/MPIMainTest.hxx
index b96d31e33..9d07ab32d 100644
--- a/src/ParaMEDMEMTest/MPIMainTest.hxx
+++ b/src/ParaMEDMEM/Test/MPIMainTest.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #ifndef _MPIMAINTEST_HXX_
 #define _MPIMAINTEST_HXX_
 
@@ -33,9 +32,6 @@
 
 #include <iostream>
 #include <fstream>
-#ifndef WIN32
-#include <fpu_control.h>
-#endif
 
 // ============================================================================
 /*!
@@ -46,10 +42,6 @@
 
 int main(int argc, char* argv[])
 {
-#ifndef WIN32
-  fpu_control_t cw = _FPU_DEFAULT & ~(_FPU_MASK_IM | _FPU_MASK_ZM | _FPU_MASK_OM);
-  _FPU_SETCW(cw);
-#endif
   MPI_Init(&argc,&argv);
   int rank;
   MPI_Comm_rank(MPI_COMM_WORLD,&rank);
diff --git a/src/ParaMEDMEM/Test/Makefile.am b/src/ParaMEDMEM/Test/Makefile.am
new file mode 100644
index 000000000..2591c99a3
--- /dev/null
+++ b/src/ParaMEDMEM/Test/Makefile.am
@@ -0,0 +1,102 @@
+#  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
+#
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libParaMEDMEMTest.la
+
+salomeinclude_HEADERS =  MPIMainTest.hxx \
+												 MPIAccessDECTest.hxx \
+												 MPIAccessTest.hxx \
+												 ParaMEDMEMTest.hxx
+
+EXTRA_DIST += MPIMainTest.hxx ParaMEDMEMTest_NonCoincidentDEC.cxx
+dist_libParaMEDMEMTest_la_SOURCES= \
+	ParaMEDMEMTest.cxx \
+ ParaMEDMEMTest_MPIProcessorGroup.cxx \
+	  ParaMEDMEMTest_BlockTopology.cxx \
+	  ParaMEDMEMTest_IntersectionDEC.cxx \
+	  ParaMEDMEMTest_StructuredCoincidentDEC.cxx \
+    MPIAccessDECTest.cxx \
+    test_AllToAllDEC.cxx \
+    test_AllToAllvDEC.cxx \
+    test_AllToAllTimeDEC.cxx \
+    test_AllToAllvTimeDEC.cxx \
+    test_AllToAllvTimeDoubleDEC.cxx \
+    MPIAccessTest.cxx \
+    test_MPI_Access_Send_Recv.cxx \
+    test_MPI_Access_Cyclic_Send_Recv.cxx \
+    test_MPI_Access_SendRecv.cxx \
+    test_MPI_Access_ISend_IRecv.cxx \
+    test_MPI_Access_Cyclic_ISend_IRecv.cxx \
+    test_MPI_Access_ISendRecv.cxx \
+    test_MPI_Access_Probe.cxx \
+    test_MPI_Access_IProbe.cxx \
+    test_MPI_Access_Cancel.cxx \
+    test_MPI_Access_Send_Recv_Length.cxx \
+    test_MPI_Access_ISend_IRecv_Length.cxx \
+    test_MPI_Access_ISend_IRecv_Length_1.cxx \
+    test_MPI_Access_Time.cxx \
+    test_MPI_Access_Time_0.cxx \
+    test_MPI_Access_ISend_IRecv_BottleNeck.cxx
+
+
+libParaMEDMEMTest_la_CPPFLAGS= @CPPUNIT_INCLUDES@ \
+	$(MPI_INCLUDES) \
+	-I$(srcdir)/../../INTERP_KERNEL \
+	-I$(srcdir)/../../INTERP_KERNEL/Bases \
+	-I$(srcdir)/../../INTERP_KERNEL/Geometric2D \
+	-I$(srcdir)/../../ParaMEDMEM \
+	-I$(srcdir)/../../MEDCoupling \
+	-I$(srcdir)/../MEDLoader
+
+libParaMEDMEMTest_la_LDFLAGS= ../MEDLoader/libparamedmemmedloader.la @CPPUNIT_LIBS@ $(MPI_LIBS)
+
+if MED_ENABLE_KERNEL
+    libParaMEDMEMTest_la_CPPFLAGS+= ${KERNEL_CXXFLAGS}
+    libParaMEDMEMTest_la_LDFLAGS+= ${KERNEL_LDFLAGS} -lSALOMELocalTrace 
+endif
+
+# Executables targets
+bin_PROGRAMS = TestParaMEDMEM  \
+							 TestMPIAccessDEC \
+		  			   TestMPIAccess
+
+dist_TestParaMEDMEM_SOURCES = TestParaMEDMEM.cxx
+dist_TestMPIAccessDEC_SOURCES = TestMPIAccessDEC.cxx
+dist_TestMPIAccess_SOURCES = TestMPIAccess.cxx
+
+LDADD= $(MED2_LIBS) $(libMEDMEMTest_la_LDFLAGS) -lm $(MPI_LIBS) \
+	../libparamedmem.la libParaMEDMEMTest.la \
+	../../INTERP_KERNEL/libinterpkernel.la 
+
+if MED_ENABLE_KERNEL
+     LDADD+= -lSALOMEBasics
+endif
+
+if MED_ENABLE_FVM
+     LDADD += $(FVM_LIBS)
+		 dist_libParaMEDMEMTest_la_SOURCES += ParaMEDMEMTest_NonCoincidentDEC.cxx
+		 libParaMEDMEMTest_la_CPPFLAGS+= -DMED_ENABLE_FVM $(FVM_INCLUDES)
+		 libParaMEDMEMTest_la_LDFLAGS+= $(FVM_LIBS)
+endif
+
+AM_CPPFLAGS= $(libParaMEDMEMTest_la_CPPFLAGS)
+
+UNIT_TEST_PROG = TestParaMEDMEM
diff --git a/src/MEDCoupling/MEDCouplingRefCountObject.cxx b/src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx
similarity index 53%
rename from src/MEDCoupling/MEDCouplingRefCountObject.cxx
rename to src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx
index 14f14f23d..f5c43bebd 100644
--- a/src/MEDCoupling/MEDCouplingRefCountObject.cxx
+++ b/src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,32 +16,32 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include "ParaMEDMEMTest.hxx"
+#include <cppunit/TestAssert.h>
 
-#include "MEDCouplingRefCountObject.hxx"
+#include <sstream>
+#include <cmath>
 
-using namespace ParaMEDMEM;
+using namespace std;
 
-RefCountObject::RefCountObject():_cnt(1)
-{
-}
 
-RefCountObject::RefCountObject(const RefCountObject& other):_cnt(1)
-{
-}
-
-bool RefCountObject::decrRef()
-{
-  bool ret=((--_cnt)==0);
-  if(ret)
-    delete this;
-  return ret;
-}
 
-void RefCountObject::incrRef() const
+/*!
+ *  Tool to remove temporary files.
+ *  Allows automatique removal of temporary files in case of test failure.
+ */
+ParaMEDMEMTest_TmpFilesRemover::~ParaMEDMEMTest_TmpFilesRemover()
 {
-  _cnt++;
+  set<string>::iterator it = myTmpFiles.begin();
+  for (; it != myTmpFiles.end(); it++) {
+    if (access((*it).data(), F_OK) == 0)
+      remove((*it).data());
+  }
+  myTmpFiles.clear();
+  //cout << "~ParaMEDMEMTest_TmpFilesRemover()" << endl;
 }
 
-RefCountObject::~RefCountObject()
+bool ParaMEDMEMTest_TmpFilesRemover::Register(const string theTmpFile)
 {
+  return (myTmpFiles.insert(theTmpFile)).second;
 }
diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest.hxx b/src/ParaMEDMEM/Test/ParaMEDMEMTest.hxx
new file mode 100644
index 000000000..baab1b7af
--- /dev/null
+++ b/src/ParaMEDMEM/Test/ParaMEDMEMTest.hxx
@@ -0,0 +1,136 @@
+//  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
+//
+#ifndef _ParaMEDMEMTEST_HXX_
+#define _ParaMEDMEMTEST_HXX_
+
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <set>
+#include <string>
+#include <iostream>
+#include "mpi.h"
+
+
+class ParaMEDMEMTest : public CppUnit::TestFixture
+{
+  CPPUNIT_TEST_SUITE( ParaMEDMEMTest );
+  CPPUNIT_TEST(testMPIProcessorGroup_constructor);
+  CPPUNIT_TEST(testMPIProcessorGroup_boolean);
+  CPPUNIT_TEST(testMPIProcessorGroup_rank);
+  CPPUNIT_TEST(testBlockTopology_constructor);
+  CPPUNIT_TEST(testBlockTopology_serialize);
+  CPPUNIT_TEST(testIntersectionDEC_2D);
+  CPPUNIT_TEST(testIntersectionDEC_2DP0P1);
+
+  CPPUNIT_TEST(testSynchronousEqualIntersectionWithoutInterpNativeDEC_2D);
+  CPPUNIT_TEST(testSynchronousEqualIntersectionWithoutInterpDEC_2D);
+  CPPUNIT_TEST(testSynchronousEqualIntersectionDEC_2D);
+  CPPUNIT_TEST(testSynchronousFasterSourceIntersectionDEC_2D);
+  CPPUNIT_TEST(testSynchronousSlowerSourceIntersectionDEC_2D);
+  CPPUNIT_TEST(testSynchronousSlowSourceIntersectionDEC_2D);
+  CPPUNIT_TEST(testSynchronousFastSourceIntersectionDEC_2D);
+  CPPUNIT_TEST(testAsynchronousEqualIntersectionDEC_2D);
+  CPPUNIT_TEST(testAsynchronousFasterSourceIntersectionDEC_2D);
+  CPPUNIT_TEST(testAsynchronousSlowerSourceIntersectionDEC_2D);
+  CPPUNIT_TEST(testAsynchronousSlowSourceIntersectionDEC_2D);
+  CPPUNIT_TEST(testAsynchronousFastSourceIntersectionDEC_2D);
+#ifdef MED_ENABLE_FVM
+  //can be added again after FVM correction for 2D
+  //  CPPUNIT_TEST(testNonCoincidentDEC_2D);
+  CPPUNIT_TEST(testNonCoincidentDEC_3D); 
+#endif
+  CPPUNIT_TEST(testStructuredCoincidentDEC);
+  CPPUNIT_TEST_SUITE_END();
+  
+
+public:
+ 
+  ParaMEDMEMTest():CppUnit::TestFixture(){}
+  ~ParaMEDMEMTest(){}  
+  void setUp(){}
+  void tearDown(){}
+  void testMPIProcessorGroup_constructor();
+  void testMPIProcessorGroup_boolean();
+  void testMPIProcessorGroup_rank();
+  void testBlockTopology_constructor();
+  void testBlockTopology_serialize();
+  void testIntersectionDEC_2D();
+  void testIntersectionDEC_2DP0P1();
+#ifdef MED_ENABLE_FVM
+  void testNonCoincidentDEC_2D();
+  void testNonCoincidentDEC_3D();
+#endif
+  void testStructuredCoincidentDEC();
+  void testSynchronousEqualIntersectionWithoutInterpNativeDEC_2D();
+  void testSynchronousEqualIntersectionWithoutInterpDEC_2D();
+  void testSynchronousEqualIntersectionDEC_2D();
+  void testSynchronousFasterSourceIntersectionDEC_2D();
+  void testSynchronousSlowerSourceIntersectionDEC_2D();
+  void testSynchronousSlowSourceIntersectionDEC_2D();
+  void testSynchronousFastSourceIntersectionDEC_2D();
+
+  void testAsynchronousEqualIntersectionDEC_2D();
+  void testAsynchronousFasterSourceIntersectionDEC_2D();
+  void testAsynchronousSlowerSourceIntersectionDEC_2D();
+  void testAsynchronousSlowSourceIntersectionDEC_2D();
+  void testAsynchronousFastSourceIntersectionDEC_2D();
+
+
+private:
+  void testNonCoincidentDEC(const std::string& filename1, 
+                            const std::string& meshname1, 
+                            const std::string& filename2, 
+                            const std::string& meshname2,
+                            int nbprocsource, double epsilon);
+  void testAsynchronousIntersectionDEC_2D(double dtA, double tmaxA, 
+                                          double dtB, double tmaxB,
+                                          bool WithPointToPoint, bool Asynchronous, bool WithInterp, const char *srcMeth, const char *targetMeth);
+  void testIntersectionDEC_2D_(const char *srcMeth, const char *targetMeth);
+  
+};
+
+// to automatically remove temporary files from disk
+class ParaMEDMEMTest_TmpFilesRemover
+{
+public:
+  ParaMEDMEMTest_TmpFilesRemover() {}
+  ~ParaMEDMEMTest_TmpFilesRemover();
+  bool Register(const std::string theTmpFile);
+
+private:
+  std::set<std::string> myTmpFiles;
+};
+
+/*!
+ *  Tool to print array to stream.
+ */
+template<class T>
+void ParaMEDMEMTest_DumpArray (std::ostream & stream, const T* array, const int length, const std::string text)
+{
+  stream << text << ": {";
+  if (length > 0) {
+    stream << array[0];
+    for (int i = 1; i < length; i++) {
+      stream << ", " << array[i];
+    }
+  }
+  stream << "}" << std::endl;
+};
+
+#endif
diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_BlockTopology.cxx b/src/ParaMEDMEM/Test/ParaMEDMEMTest_BlockTopology.cxx
similarity index 98%
rename from src/ParaMEDMEMTest/ParaMEDMEMTest_BlockTopology.cxx
rename to src/ParaMEDMEM/Test/ParaMEDMEMTest_BlockTopology.cxx
index 780b71f41..f116ff2a7 100644
--- a/src/ParaMEDMEMTest/ParaMEDMEMTest_BlockTopology.cxx
+++ b/src/ParaMEDMEM/Test/ParaMEDMEMTest_BlockTopology.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include "ParaMEDMEMTest.hxx"
 #include <cppunit/TestAssert.h>
 
diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx b/src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx
new file mode 100644
index 000000000..144f888b7
--- /dev/null
+++ b/src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx
@@ -0,0 +1,541 @@
+//  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
+//
+#include "ParaMEDMEMTest.hxx"
+#include <cppunit/TestAssert.h>
+
+#include "CommInterface.hxx"
+#include "ProcessorGroup.hxx"
+#include "MPIProcessorGroup.hxx"
+#include "Topology.hxx"
+#include "DEC.hxx"
+#include "MxN_Mapping.hxx"
+#include "IntersectionDEC.hxx"
+#include "ParaMESH.hxx"
+#include "ParaFIELD.hxx"
+#include "ICoCoMEDField.hxx"
+#include "MEDLoader.hxx"
+ 
+#include <string>
+
+// use this define to enable lines, execution of which leads to Segmentation Fault
+#define ENABLE_FAULTS
+
+// use this define to enable CPPUNIT asserts and fails, showing bugs
+#define ENABLE_FORCED_FAILURES
+
+
+using namespace std;
+using namespace ParaMEDMEM;
+ 
+void ParaMEDMEMTest::testIntersectionDEC_2D()
+{
+  testIntersectionDEC_2D_("P0","P0");
+}
+
+void ParaMEDMEMTest::testIntersectionDEC_2DP0P1()
+{
+  //testIntersectionDEC_2D_("P0","P1");
+}
+
+/*
+ * Check methods defined in IntersectionDEC.hxx
+ *
+ IntersectionDEC();
+ IntersectionDEC(ProcessorGroup& local_group, ProcessorGroup& distant_group);
+ virtual ~IntersectionDEC();
+ void synchronize();
+ void recvData();
+ void sendData();
+*/
+ 
+void ParaMEDMEMTest::testIntersectionDEC_2D_(const char *srcMeth, const char *targetMeth)
+{
+  std::string srcM(srcMeth);
+  std::string targetM(targetMeth);
+  int size;
+  int rank;
+  MPI_Comm_size(MPI_COMM_WORLD,&size);
+  MPI_Comm_rank(MPI_COMM_WORLD,&rank);
+
+  //the test is meant to run on five processors
+  if (size !=5) return ;
+   
+  int nproc_source = 3;
+  set<int> self_procs;
+  set<int> procs_source;
+  set<int> procs_target;
+  
+  for (int i=0; i<nproc_source; i++)
+    procs_source.insert(i);
+  for (int i=nproc_source; i<size; i++)
+    procs_target.insert(i);
+  self_procs.insert(rank);
+  
+  ParaMEDMEM::CommInterface interface;
+    
+  ParaMEDMEM::ProcessorGroup* self_group = new ParaMEDMEM::MPIProcessorGroup(interface,self_procs);
+  ParaMEDMEM::ProcessorGroup* target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target);
+  ParaMEDMEM::ProcessorGroup* source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source);
+  
+  //loading the geometry for the source group
+
+  ParaMEDMEM::IntersectionDEC dec (*source_group,*target_group);
+
+  ParaMEDMEM::MEDCouplingUMesh* mesh;
+  ParaMEDMEM::ParaMESH* paramesh;
+  ParaMEDMEM::ParaFIELD* parafield;
+  ICoCo::Field* icocofield ;
+  
+  string data_dir                   = getenv("MED_ROOT_DIR");
+  string tmp_dir                    = getenv("TMP");
+  if (tmp_dir == "")
+    tmp_dir = "/tmp";
+  string filename_xml1              = data_dir + "/share/salome/resources/med/square1_split";
+  string filename_xml2              = data_dir + "/share/salome/resources/med/square2_split"; 
+  string filename_seq_wr            = tmp_dir + "/";
+  string filename_seq_med           = tmp_dir + "/myWrField_seq_pointe221.med";
+  
+  // To remove tmp files from disk
+  ParaMEDMEMTest_TmpFilesRemover aRemover;
+  
+  MPI_Barrier(MPI_COMM_WORLD);
+  if (source_group->containsMyRank())
+    {
+      string master = filename_xml1;
+      
+      ostringstream strstream;
+      strstream <<master<<rank+1<<".med";
+      ostringstream meshname ;
+      meshname<< "Mesh_2_"<< rank+1;
+      
+      mesh=MEDLoader::ReadUMeshFromFile(strstream.str().c_str(),meshname.str().c_str(),0);
+      
+    
+      paramesh=new ParaMESH (mesh,*source_group,"source mesh");
+    
+      //      ParaMEDMEM::ParaSUPPORT* parasupport=new UnstructuredParaSUPPORT( support,*source_group);
+      ParaMEDMEM::ComponentTopology comptopo;
+      if(srcM=="P0")
+        parafield = new ParaFIELD(ON_CELLS,paramesh, comptopo);
+      else
+        parafield = new ParaFIELD(ON_NODES,paramesh, comptopo);
+      int nb_local;
+      if(srcM=="P0")
+        nb_local=mesh->getNumberOfCells();
+      else
+        nb_local=mesh->getNumberOfNodes();
+      //      double * value= new double[nb_local];
+      double *value=parafield->getField()->getArray()->getPointer();
+      for(int ielem=0; ielem<nb_local;ielem++)
+        value[ielem]=1.0;
+    
+      //      ICoCo::Field* icocofield=new ICoCo::MEDField(paramesh,parafield);
+      icocofield=new ICoCo::MEDField(paramesh,parafield);
+      dec.setMethod(srcMeth);
+      dec.attachLocalField(icocofield);
+    }
+  
+  //loading the geometry for the target group
+  if (target_group->containsMyRank())
+    {
+      string master= filename_xml2;
+      ostringstream strstream;
+      strstream << master<<(rank-nproc_source+1)<<".med";
+      ostringstream meshname ;
+      meshname<< "Mesh_3_"<<rank-nproc_source+1;
+      mesh = MEDLoader::ReadUMeshFromFile(strstream.str().c_str(),meshname.str().c_str(),0);
+      
+      paramesh=new ParaMESH (mesh,*target_group,"target mesh");
+      //      ParaMEDMEM::ParaSUPPORT* parasupport=new UnstructuredParaSUPPORT(support,*target_group);
+      ParaMEDMEM::ComponentTopology comptopo;
+      if(targetM=="P0")
+        parafield = new ParaFIELD(ON_CELLS,paramesh, comptopo);
+      else
+        parafield = new ParaFIELD(ON_NODES,paramesh, comptopo);
+      int nb_local;
+      if(targetM=="P0")
+        nb_local=mesh->getNumberOfCells();
+      else
+        nb_local=mesh->getNumberOfNodes();
+      //      double * value= new double[nb_local];
+      double *value=parafield->getField()->getArray()->getPointer();
+      for(int ielem=0; ielem<nb_local;ielem++)
+        value[ielem]=0.0;
+      //      ICoCo::Field* icocofield=new ICoCo::MEDField(paramesh,parafield);
+      icocofield=new ICoCo::MEDField(paramesh,parafield);
+      dec.setMethod(targetMeth);
+      dec.attachLocalField(icocofield);
+    }
+    
+  
+  //attaching a DEC to the source group 
+  double field_before_int;
+  double field_after_int;
+  
+  if (source_group->containsMyRank())
+    { 
+      field_before_int = parafield->getVolumeIntegral(0);
+      dec.synchronize();
+      cout<<"DEC usage"<<endl;
+      dec.setForcedRenormalization(false);
+
+      dec.sendData();
+      MEDLoader::writeParaMesh("./sourcesquareb",paramesh);
+      if (source_group->myRank()==0)
+        aRemover.Register("./sourcesquareb");
+      ostringstream filename;
+      filename<<"./sourcesquareb_"<<source_group->myRank()+1;
+      aRemover.Register(filename.str().c_str());
+      MEDLoader::writeParaField("./sourcesquareb","boundary",parafield);
+   
+      dec.recvData();
+      cout <<"writing"<<endl;
+      MEDLoader::writeParaMesh("./sourcesquare",paramesh);
+      if (source_group->myRank()==0)
+        aRemover.Register("./sourcesquare");
+      MEDLoader::writeParaField("./sourcesquare","boundary",parafield);
+      
+     
+      filename<<"./sourcesquare_"<<source_group->myRank()+1;
+      aRemover.Register(filename.str().c_str());
+      field_after_int = parafield->getVolumeIntegral(0);
+      
+      
+      //      MPI_Bcast(&field_before_int,1,MPI_DOUBLE,0,MPI_COMM_WORLD);
+      //       MPI_Bcast(&field_after_int,1,MPI_DOUBLE,0,MPI_COMM_WORLD);
+
+      CPPUNIT_ASSERT_DOUBLES_EQUAL(field_before_int, field_after_int, 1e-6);
+    
+    }
+  
+  //attaching a DEC to the target group
+  if (target_group->containsMyRank())
+    {
+      dec.synchronize();
+      dec.setForcedRenormalization(false);
+
+      dec.recvData();
+      MEDLoader::writeParaMesh("./targetsquareb",paramesh);
+      MEDLoader::writeParaField("./targetsquareb", "boundary",parafield);
+      if (target_group->myRank()==0)
+        aRemover.Register("./targetsquareb");
+      ostringstream filename;
+      filename<<"./targetsquareb_"<<target_group->myRank()+1;
+      aRemover.Register(filename.str().c_str());
+      dec.sendData();
+      MEDLoader::writeParaMesh("./targetsquare",paramesh);
+      MEDLoader::writeParaField("./targetsquare", "boundary",parafield);
+      
+      if (target_group->myRank()==0)
+        aRemover.Register("./targetsquareb");
+      
+      filename<<"./targetsquareb_"<<target_group->myRank()+1;
+      aRemover.Register(filename.str().c_str());
+      //    double field_before_int, field_after_int;
+      //       MPI_Bcast(&field_before_int,1,MPI_DOUBLE,0,MPI_COMM_WORLD);
+      //       MPI_Bcast(&field_after_int,1,MPI_DOUBLE,0,MPI_COMM_WORLD);
+      
+      //      CPPUNIT_ASSERT_DOUBLES_EQUAL(field_before_int, field_after_int, 1e-6);
+    
+    }
+  
+  delete source_group;
+  delete target_group;
+  delete self_group;
+  delete parafield;
+  delete paramesh;
+  mesh->decrRef();
+
+  delete icocofield;
+
+  MPI_Barrier(MPI_COMM_WORLD);
+  cout << "end of IntersectionDEC_2D test"<<endl;
+}
+
+//Synchronous tests without interpolation with native mode (AllToAll(v) from lam/MPI:
+void ParaMEDMEMTest::testSynchronousEqualIntersectionWithoutInterpNativeDEC_2D()
+{
+  testAsynchronousIntersectionDEC_2D(0.1,1,0.1,1,false,false,false,"P0","P0");
+}
+
+//Synchronous tests without interpolation :
+void ParaMEDMEMTest::testSynchronousEqualIntersectionWithoutInterpDEC_2D()
+{
+  testAsynchronousIntersectionDEC_2D(0.1,1,0.1,1,true,false,false,"P0","P0");
+}
+
+//Synchronous tests with interpolation :
+void ParaMEDMEMTest::testSynchronousEqualIntersectionDEC_2D()
+{
+  testAsynchronousIntersectionDEC_2D(0.1,1,0.1,1,true,false,true,"P0","P0");
+}
+void ParaMEDMEMTest::testSynchronousFasterSourceIntersectionDEC_2D()
+{
+  testAsynchronousIntersectionDEC_2D(0.09,1,0.1,1,true,false,true,"P0","P0");
+}
+void ParaMEDMEMTest::testSynchronousSlowerSourceIntersectionDEC_2D()
+{
+  testAsynchronousIntersectionDEC_2D(0.11,1,0.1,1,true,false,true,"P0","P0");
+}
+void ParaMEDMEMTest::testSynchronousSlowSourceIntersectionDEC_2D()
+{
+  testAsynchronousIntersectionDEC_2D(0.11,1,0.01,1,true,false,true,"P0","P0");
+}
+void ParaMEDMEMTest::testSynchronousFastSourceIntersectionDEC_2D()
+{
+  testAsynchronousIntersectionDEC_2D(0.01,1,0.11,1,true,false,true,"P0","P0");
+}
+
+//Asynchronous tests with interpolation :
+void ParaMEDMEMTest::testAsynchronousEqualIntersectionDEC_2D()
+{
+  testAsynchronousIntersectionDEC_2D(0.1,1,0.1,1,true,true,true,"P0","P0");
+}
+void ParaMEDMEMTest::testAsynchronousFasterSourceIntersectionDEC_2D()
+{
+  testAsynchronousIntersectionDEC_2D(0.09,1,0.1,1,true,true,true,"P0","P0");
+}
+void ParaMEDMEMTest::testAsynchronousSlowerSourceIntersectionDEC_2D()
+{
+  testAsynchronousIntersectionDEC_2D(0.11,1,0.1,1,true,true,true,"P0","P0");
+}
+void ParaMEDMEMTest::testAsynchronousSlowSourceIntersectionDEC_2D()
+{
+  testAsynchronousIntersectionDEC_2D(0.11,1,0.01,1,true,true,true,"P0","P0");
+}
+void ParaMEDMEMTest::testAsynchronousFastSourceIntersectionDEC_2D()
+{
+  testAsynchronousIntersectionDEC_2D(0.01,1,0.11,1,true,true,true,"P0","P0");
+}
+
+/*!
+ * Tests an asynchronous exchange between two codes
+ * one sends data with dtA as an interval, the max time being tmaxA
+ * the other one receives with dtB as an interval, the max time being tmaxB
+ */
+void ParaMEDMEMTest::testAsynchronousIntersectionDEC_2D(double dtA, double tmaxA, 
+                                                        double dtB, double tmaxB, bool WithPointToPoint, bool Asynchronous,
+                                                        bool WithInterp, const char *srcMeth, const char *targetMeth)
+{
+  std::string srcM(srcMeth);
+  std::string targetM(targetMeth);
+  int size;
+  int rank;
+  MPI_Comm_size(MPI_COMM_WORLD,&size);
+  MPI_Comm_rank(MPI_COMM_WORLD,&rank);
+ 
+  //the test is meant to run on five processors
+  if (size !=5) return ;
+   
+  int nproc_source = 3;
+  set<int> self_procs;
+  set<int> procs_source;
+  set<int> procs_target;
+  
+  for (int i=0; i<nproc_source; i++)
+    procs_source.insert(i);
+  for (int i=nproc_source; i<size; i++)
+    procs_target.insert(i);
+  self_procs.insert(rank);
+  
+  ParaMEDMEM::CommInterface interface;
+    
+  ParaMEDMEM::ProcessorGroup* self_group = new ParaMEDMEM::MPIProcessorGroup(interface,self_procs);
+  ParaMEDMEM::ProcessorGroup* target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target);
+  ParaMEDMEM::ProcessorGroup* source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source);
+    
+  //loading the geometry for the source group
+
+  ParaMEDMEM::IntersectionDEC dec (*source_group,*target_group);
+  
+  ParaMEDMEM::MEDCouplingUMesh* mesh;
+  ParaMEDMEM::ParaMESH* paramesh;
+  ParaMEDMEM::ParaFIELD* parafield;
+  
+  double * value ;
+  ICoCo::Field* icocofield ;
+
+  string data_dir                   = getenv("MED_ROOT_DIR");
+  string tmp_dir                    = getenv("TMP");
+  if (tmp_dir == "")
+    tmp_dir = "/tmp";
+  string filename_xml1              = data_dir + "/share/salome/resources/med/square1_split";
+  string filename_xml2              = data_dir + "/share/salome/resources/med/square2_split"; 
+  string filename_seq_wr            = tmp_dir + "/";
+  string filename_seq_med           = tmp_dir + "/myWrField_seq_pointe221.med";
+  
+  // To remove tmp files from disk
+  ParaMEDMEMTest_TmpFilesRemover aRemover;
+  
+  MPI_Barrier(MPI_COMM_WORLD);
+
+  if (source_group->containsMyRank())
+    {
+      string master = filename_xml1;
+      
+      ostringstream strstream;
+      strstream <<master<<rank+1<<".med";
+      ostringstream meshname ;
+      meshname<< "Mesh_2_"<< rank+1;
+      
+      mesh=MEDLoader::ReadUMeshFromFile(strstream.str().c_str(),meshname.str().c_str(),0);
+    
+      paramesh=new ParaMESH (mesh,*source_group,"source mesh");
+    
+      //      ParaMEDMEM::ParaSUPPORT* parasupport=new UnstructuredParaSUPPORT( support,*source_group);
+      ParaMEDMEM::ComponentTopology comptopo;
+      if(srcM=="P0")
+        parafield = new ParaFIELD(ON_CELLS,paramesh, comptopo);
+      else
+        parafield = new ParaFIELD(ON_NODES,paramesh, comptopo);
+
+      int nb_local;
+      if(srcM=="P0")
+        nb_local=mesh->getNumberOfCells();
+      else
+        nb_local=mesh->getNumberOfNodes();
+      //      double * value= new double[nb_local];
+      double *value=parafield->getField()->getArray()->getPointer();
+      for(int ielem=0; ielem<nb_local;ielem++)
+        value[ielem]=0.0;
+    
+      //      ICoCo::Field* icocofield=new ICoCo::MEDField(paramesh,parafield);
+      icocofield=new ICoCo::MEDField(paramesh,parafield);
+     
+      dec.attachLocalField(icocofield);
+
+
+    }
+  
+  //loading the geometry for the target group
+  if (target_group->containsMyRank())
+    {
+      string master= filename_xml2;
+      ostringstream strstream;
+      strstream << master<<(rank-nproc_source+1)<<".med";
+      ostringstream meshname ;
+      meshname<< "Mesh_3_"<<rank-nproc_source+1;
+      
+      mesh = MEDLoader::ReadUMeshFromFile(strstream.str().c_str(),meshname.str().c_str(),0);
+      
+      paramesh=new ParaMESH (mesh,*target_group,"target mesh");
+      //      ParaMEDMEM::ParaSUPPORT* parasupport=new UnstructuredParaSUPPORT(support,*target_group);
+      ParaMEDMEM::ComponentTopology comptopo;
+      if(targetM=="P0")
+        parafield = new ParaFIELD(ON_CELLS,paramesh, comptopo);
+      else
+        parafield = new ParaFIELD(ON_NODES,paramesh, comptopo);
+      
+      int nb_local;
+      if(targetM=="P0")
+        nb_local=mesh->getNumberOfCells();
+      else
+        nb_local=mesh->getNumberOfNodes();
+                        
+      double *value=parafield->getField()->getArray()->getPointer();
+      for(int ielem=0; ielem<nb_local;ielem++)
+        value[ielem]=0.0;
+      //      ICoCo::Field* icocofield=new ICoCo::MEDField(paramesh,parafield);
+      icocofield=new ICoCo::MEDField(paramesh,parafield);
+      
+      dec.attachLocalField(icocofield);
+    }
+    
+  
+  //attaching a DEC to the source group 
+  
+  if (source_group->containsMyRank())
+    { 
+      cout<<"DEC usage"<<endl;
+      dec.setAsynchronous(Asynchronous);
+      if ( WithInterp ) {
+        dec.setTimeInterpolationMethod(LinearTimeInterp);
+      }
+      if ( WithPointToPoint ) {
+        dec.setAllToAllMethod(PointToPoint);
+      }
+      else {
+        dec.setAllToAllMethod(Native);
+      }
+      dec.synchronize();
+      dec.setForcedRenormalization(false);
+      for (double time=0; time<tmaxA+1e-10; time+=dtA)
+        {
+          cout << "testAsynchronousIntersectionDEC_2D" << rank << " time " << time
+               << " dtA " << dtA << " tmaxA " << tmaxA << endl ;
+          if ( time+dtA < tmaxA+1e-7 ) {
+            dec.sendData( time , dtA );
+          }
+          else {
+            dec.sendData( time , 0 );
+          }
+          double* value = parafield->getField()->getArray()->getPointer();
+          int nb_local=parafield->getField()->getMesh()->getNumberOfCells();
+          for (int i=0; i<nb_local;i++)
+            value[i]= time+dtA;
+
+       
+        }
+    }
+  
+  //attaching a DEC to the target group
+  if (target_group->containsMyRank())
+    {
+      cout<<"DEC usage"<<endl;
+      dec.setAsynchronous(Asynchronous);
+      if ( WithInterp ) {
+        dec.setTimeInterpolationMethod(LinearTimeInterp);
+      }
+      if ( WithPointToPoint ) {
+        dec.setAllToAllMethod(PointToPoint);
+      }
+      else {
+        dec.setAllToAllMethod(Native);
+      }
+      dec.synchronize();
+      dec.setForcedRenormalization(false);
+      vector<double> times;
+      for (double time=0; time<tmaxB+1e-10; time+=dtB)
+        {
+          cout << "testAsynchronousIntersectionDEC_2D" << rank << " time " << time
+               << " dtB " << dtB << " tmaxB " << tmaxB << endl ;
+          dec.recvData( time );
+          double vi = parafield->getVolumeIntegral(0);
+          cout << "testAsynchronousIntersectionDEC_2D" << rank << " time " << time
+               << " VolumeIntegral " << vi
+               << " time*10000 " << time*10000 << endl ;
+          
+          CPPUNIT_ASSERT_DOUBLES_EQUAL(vi,time*10000,0.001);
+        }
+      
+    }
+  
+  delete source_group;
+  delete target_group;
+  delete self_group;
+  delete parafield ;
+  delete paramesh ;
+  mesh->decrRef() ;
+  delete icocofield ;
+
+  cout << "testAsynchronousIntersectionDEC_2D" << rank << " MPI_Barrier " << endl ;
+ 
+  if (Asynchronous) MPI_Barrier(MPI_COMM_WORLD);
+  cout << "end of IntersectionDEC_2D test"<<endl;
+}
diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_MPIProcessorGroup.cxx b/src/ParaMEDMEM/Test/ParaMEDMEMTest_MPIProcessorGroup.cxx
similarity index 99%
rename from src/ParaMEDMEMTest/ParaMEDMEMTest_MPIProcessorGroup.cxx
rename to src/ParaMEDMEM/Test/ParaMEDMEMTest_MPIProcessorGroup.cxx
index 010b30396..979f978c1 100644
--- a/src/ParaMEDMEMTest/ParaMEDMEMTest_MPIProcessorGroup.cxx
+++ b/src/ParaMEDMEM/Test/ParaMEDMEMTest_MPIProcessorGroup.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include "ParaMEDMEMTest.hxx"
 #include <cppunit/TestAssert.h>
 #include "CommInterface.hxx"
diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_NonCoincidentDEC.cxx b/src/ParaMEDMEM/Test/ParaMEDMEMTest_NonCoincidentDEC.cxx
similarity index 92%
rename from src/ParaMEDMEMTest/ParaMEDMEMTest_NonCoincidentDEC.cxx
rename to src/ParaMEDMEM/Test/ParaMEDMEMTest_NonCoincidentDEC.cxx
index ee55782a8..743d91b49 100644
--- a/src/ParaMEDMEMTest/ParaMEDMEMTest_NonCoincidentDEC.cxx
+++ b/src/ParaMEDMEM/Test/ParaMEDMEMTest_NonCoincidentDEC.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include "ParaMEDMEMTest.hxx"
 #include <cppunit/TestAssert.h>
 
@@ -46,11 +45,11 @@ using namespace ParaMEDMEM;
 using namespace MEDMEM;
  
 /*
- * Check methods defined in InterpKernelDEC.hxx
+ * Check methods defined in IntersectionDEC.hxx
  *
- InterpKernelDEC();
- InterpKernelDEC(ProcessorGroup& local_group, ProcessorGroup& distant_group);
- virtual ~InterpKernelDEC();
+ IntersectionDEC();
+ IntersectionDEC(ProcessorGroup& local_group, ProcessorGroup& distant_group);
+ virtual ~IntersectionDEC();
  void synchronize();
  void recvData();
  void sendData();
@@ -130,10 +129,14 @@ void ParaMEDMEMTest::testNonCoincidentDEC(const string& filename1,
   ParaMEDMEM::ParaMESH* paramesh;
   ParaMEDMEM::ParaFIELD* parafield;
   
-  string filename_xml1              = getResourceFile(filename1);
-  string filename_xml2              = getResourceFile(filename2); 
-  //string filename_seq_wr            = makeTmpFile("");
-  //string filename_seq_med           = makeTmpFile("myWrField_seq_pointe221.med");
+  string data_dir                   = getenv("MED_ROOT_DIR") + "/share/salome/resources/med/";
+  string tmp_dir                    = getenv("TMP");
+  if (tmp_dir == "")
+    tmp_dir = "/tmp";
+  string filename_xml1              = data_dir + filename1;
+  string filename_xml2              = data_dir + filename2; 
+  string filename_seq_wr            = tmp_dir + "/";
+  string filename_seq_med           = tmp_dir + "/myWrField_seq_pointe221.med";
   
   // To remove tmp files from disk
   ParaMEDMEMTest_TmpFilesRemover aRemover;
diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_StructuredCoincidentDEC.cxx b/src/ParaMEDMEM/Test/ParaMEDMEMTest_StructuredCoincidentDEC.cxx
similarity index 84%
rename from src/ParaMEDMEMTest/ParaMEDMEMTest_StructuredCoincidentDEC.cxx
rename to src/ParaMEDMEM/Test/ParaMEDMEMTest_StructuredCoincidentDEC.cxx
index 973ed8760..c0abcf871 100644
--- a/src/ParaMEDMEMTest/ParaMEDMEMTest_StructuredCoincidentDEC.cxx
+++ b/src/ParaMEDMEM/Test/ParaMEDMEMTest_StructuredCoincidentDEC.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include "ParaMEDMEMTest.hxx"
 #include <cppunit/TestAssert.h>
 
@@ -28,7 +27,6 @@
 #include "StructuredCoincidentDEC.hxx"
 #include "ParaMESH.hxx"
 #include "ParaFIELD.hxx"
-#include "ComponentTopology.hxx"
 #include "ICoCoMEDField.hxx"
 #include "MEDLoader.hxx"
 
@@ -75,10 +73,15 @@ void ParaMEDMEMTest::testStructuredCoincidentDEC() {
   ParaMEDMEM::ParaMESH* paramesh;
   ParaMEDMEM::ParaFIELD* parafield;
 
-  string filename_xml1 = getResourceFile("square1_split");
-  string filename_2    = getResourceFile("square1.med");
-  //string filename_seq_wr  = makeTmpFile("");
-  //string filename_seq_med = makeTmpFile("myWrField_seq_pointe221.med");
+  string data_dir = getenv("MED_ROOT_DIR");
+  string tmp_dir = getenv("TMP");
+  if (tmp_dir == "")
+    tmp_dir = "/tmp";
+  string filename_xml1 = data_dir
+    + "/share/salome/resources/med/square1_split";
+  string filename_2 = data_dir + "/share/salome/resources/med/square1.med";
+  string filename_seq_wr = tmp_dir + "/";
+  string filename_seq_med = tmp_dir + "/myWrField_seq_pointe221.med";
 
   // To remove tmp files from disk
   ParaMEDMEMTest_TmpFilesRemover aRemover;
@@ -102,7 +105,7 @@ void ParaMEDMEMTest::testStructuredCoincidentDEC() {
     paramesh=new ParaMESH (mesh,source_group,"source mesh");
 
     ParaMEDMEM::ComponentTopology comptopo(6);
-    parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);
+    parafield = new ParaFIELD(ON_CELLS,paramesh, comptopo);
 
     int nb_local=mesh->getNumberOfCells();
     const int* global_numbering = paramesh->getGlobalNumberingCell();
@@ -112,12 +115,12 @@ void ParaMEDMEMTest::testStructuredCoincidentDEC() {
       for (int icomp=0; icomp<6; icomp++)
         value[ielem*6+icomp]=global_numbering[ielem]*6+icomp;
 
-    //ICoCo::Field* icocofield=new ICoCo::MEDField((MEDCouplingUMesh *)paramesh->getCellMesh(),parafield->getField());
+    ICoCo::Field* icocofield=new ICoCo::MEDField(paramesh,parafield);
 
-    dec.attachLocalField(parafield);
+    dec.attachLocalField(icocofield);
     dec.synchronize();
     dec.sendData();
-    //delete icocofield;
+    delete icocofield;
   }
 
   //loading the geometry for the target group
@@ -129,16 +132,16 @@ void ParaMEDMEMTest::testStructuredCoincidentDEC() {
     paramesh=new ParaMESH (mesh,self_group,"target mesh");
     ParaMEDMEM::ComponentTopology comptopo(6, &target_group);
 
-    parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);
+    parafield = new ParaFIELD(ON_CELLS,paramesh, comptopo);
 
     int nb_local=mesh->getNumberOfCells();
     double *value=parafield->getField()->getArray()->getPointer();
     for (int ielem=0; ielem<nb_local; ielem++)
       for (int icomp=0; icomp<comptopo.nbLocalComponents(); icomp++)
         value[ielem*comptopo.nbLocalComponents()+icomp]=0.0;
-    //ICoCo::Field* icocofield=new ICoCo::MEDField((MEDCouplingUMesh *)paramesh->getCellMesh(),parafield->getField());
+    ICoCo::Field* icocofield=new ICoCo::MEDField(paramesh,parafield);
 
-    dec.attachLocalField(parafield);
+    dec.attachLocalField(icocofield);
     dec.synchronize();
     dec.recvData();
 
@@ -149,7 +152,7 @@ void ParaMEDMEMTest::testStructuredCoincidentDEC() {
       for (int icomp = 0; icomp < comptopo.nbLocalComponents(); icomp++)
         CPPUNIT_ASSERT_DOUBLES_EQUAL(recv_value[i*comptopo.nbLocalComponents()+icomp],(double)(i*6+icomp+first),1e-12);
     }
-    //delete icocofield;
+    delete icocofield;
   }
   delete parafield;
   delete paramesh;
diff --git a/src/ParaMEDMEMTest/TestMPIAccess.cxx b/src/ParaMEDMEM/Test/TestMPIAccess.cxx
similarity index 95%
rename from src/ParaMEDMEMTest/TestMPIAccess.cxx
rename to src/ParaMEDMEM/Test/TestMPIAccess.cxx
index 5d6955daf..e71974e99 100644
--- a/src/ParaMEDMEMTest/TestMPIAccess.cxx
+++ b/src/ParaMEDMEM/Test/TestMPIAccess.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -18,7 +18,7 @@
 //
 
 // --- include all MPIAccess Test
-//
+
 #include "MPIAccessTest.hxx"
 
 // --- Registers the fixture into the 'registry'
diff --git a/src/ParaMEDMEMTest/TestMPIAccessDEC.cxx b/src/ParaMEDMEM/Test/TestMPIAccessDEC.cxx
similarity index 95%
rename from src/ParaMEDMEMTest/TestMPIAccessDEC.cxx
rename to src/ParaMEDMEM/Test/TestMPIAccessDEC.cxx
index 7776eafb9..80431cff1 100644
--- a/src/ParaMEDMEMTest/TestMPIAccessDEC.cxx
+++ b/src/ParaMEDMEM/Test/TestMPIAccessDEC.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -18,7 +18,7 @@
 //
 
 // --- include all MPIAccessDEC Test
-//
+
 #include "MPIAccessDECTest.hxx"
 
 // --- Registers the fixture into the 'registry'
diff --git a/src/ParaMEDMEMTest/TestParaMEDMEM.cxx b/src/ParaMEDMEM/Test/TestParaMEDMEM.cxx
similarity index 95%
rename from src/ParaMEDMEMTest/TestParaMEDMEM.cxx
rename to src/ParaMEDMEM/Test/TestParaMEDMEM.cxx
index 8c7be29e7..6bddba11d 100644
--- a/src/ParaMEDMEMTest/TestParaMEDMEM.cxx
+++ b/src/ParaMEDMEM/Test/TestParaMEDMEM.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -18,7 +18,7 @@
 //
 
 // --- include all MEDMEM Test
-//
+
 #include "ParaMEDMEMTest.hxx"
 
 // --- Registers the fixture into the 'registry'
diff --git a/src/ParaMEDMEMTest/test_AllToAllDEC.cxx b/src/ParaMEDMEM/Test/test_AllToAllDEC.cxx
similarity index 99%
rename from src/ParaMEDMEMTest/test_AllToAllDEC.cxx
rename to src/ParaMEDMEM/Test/test_AllToAllDEC.cxx
index 498fbc046..5b8d66896 100644
--- a/src/ParaMEDMEMTest/test_AllToAllDEC.cxx
+++ b/src/ParaMEDMEM/Test/test_AllToAllDEC.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <string>
 #include <vector>
 #include <map>
diff --git a/src/ParaMEDMEMTest/test_AllToAllTimeDEC.cxx b/src/ParaMEDMEM/Test/test_AllToAllTimeDEC.cxx
similarity index 99%
rename from src/ParaMEDMEMTest/test_AllToAllTimeDEC.cxx
rename to src/ParaMEDMEM/Test/test_AllToAllTimeDEC.cxx
index 3e9a55815..f869374a7 100644
--- a/src/ParaMEDMEMTest/test_AllToAllTimeDEC.cxx
+++ b/src/ParaMEDMEM/Test/test_AllToAllTimeDEC.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <string>
 #include <vector>
 #include <map>
diff --git a/src/ParaMEDMEMTest/test_AllToAllvDEC.cxx b/src/ParaMEDMEM/Test/test_AllToAllvDEC.cxx
similarity index 99%
rename from src/ParaMEDMEMTest/test_AllToAllvDEC.cxx
rename to src/ParaMEDMEM/Test/test_AllToAllvDEC.cxx
index 0a294ba91..7a5c65f59 100644
--- a/src/ParaMEDMEMTest/test_AllToAllvDEC.cxx
+++ b/src/ParaMEDMEM/Test/test_AllToAllvDEC.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <string>
 #include <vector>
 #include <map>
diff --git a/src/ParaMEDMEMTest/test_AllToAllvTimeDEC.cxx b/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx
similarity index 96%
rename from src/ParaMEDMEMTest/test_AllToAllvTimeDEC.cxx
rename to src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx
index 5d4cac7b2..e8bbb1f4d 100644
--- a/src/ParaMEDMEMTest/test_AllToAllvTimeDEC.cxx
+++ b/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <string>
 #include <vector>
 #include <map>
@@ -151,7 +150,7 @@ void MPIAccessDECTest::test_AllToAllvTimeDEC( bool Asynchronous , bool UseMPINat
     //rtimedispls[i] = i*mpi_access->TimeExtent() ;
   }
 
-  double timeLoc = 0 ;
+  double time = 0 ;
   double deltatime[maxproc] = {1.,2.1,3.2,4.3,5.4,6.5,7.6,8.7,9.8,10.9,11.} ;
   double maxtime ;
   double nextdeltatime = deltatime[myrank] ;
@@ -162,18 +161,18 @@ void MPIAccessDECTest::test_AllToAllvTimeDEC( bool Asynchronous , bool UseMPINat
     maxtime = maxreq ;
     //    MyMPIAccessDEC->InitTime( time , nextdeltatime , maxtime ) ;
   }
-  time_t begintime = time(NULL) ;
+  time_t begintime = std::time(NULL) ;
   //  for ( time = 0 ; time <= maxtime ; time+=deltatime[myrank] ) {
-  for ( timeLoc = 0 ; timeLoc <= maxtime && nextdeltatime != 0 ; timeLoc+=nextdeltatime ) {
+  for ( time = 0 ; time <= maxtime && nextdeltatime != 0 ; time+=nextdeltatime ) {
     nextdeltatime = deltatime[myrank] ;
-    if ( timeLoc != 0 ) {
+    if ( time != 0 ) {
       nextdeltatime = deltatime[myrank] ;
-      if ( timeLoc+nextdeltatime > maxtime ) {
+      if ( time+nextdeltatime > maxtime ) {
         nextdeltatime = 0 ;
       }
       //       MyMPIAccessDEC->NextTime( nextdeltatime ) ;
     }
-    MyMPIAccessDEC->setTime( timeLoc , nextdeltatime ) ;
+    MyMPIAccessDEC->setTime( time , nextdeltatime ) ;
     cout << "test_AllToAllvTimeDEC" << myrank << "=====TIME " << time << "=====DELTATIME "
          << nextdeltatime << "=====MAXTIME " << maxtime << " ======" << endl ; 
     int * sendbuf = new int[datamsglength*size] ;
@@ -188,11 +187,11 @@ void MPIAccessDECTest::test_AllToAllvTimeDEC( bool Asynchronous , bool UseMPINat
     if ( UseMPI_Alltoallv ) {
       const MPI_Comm* comm = MyMPIAccessDEC->getComm();
       TimeMessage * aSendTimeMessage = new TimeMessage ;
-      aSendTimeMessage->time = timeLoc ;
+      aSendTimeMessage->time = time ;
       //       aSendTimeMessage->deltatime = deltatime[myrank] ;
       aSendTimeMessage->deltatime = nextdeltatime ;
       //       aSendTimeMessage->maxtime = maxtime ;
-      aSendTimeMessage->tag = (int ) (timeLoc/deltatime[myrank]) ;
+      aSendTimeMessage->tag = (int ) (time/deltatime[myrank]) ;
       TimeMessage * aRecvTimeMessage = new TimeMessage[size] ;
       interface.allToAllV(aSendTimeMessage, sendtimecounts , stimedispls ,
                           mpi_access->timeType() ,
@@ -324,7 +323,7 @@ void MPIAccessDECTest::test_AllToAllvTimeDEC( bool Asynchronous , bool UseMPINat
          << " RecvRequests = 0 OK" << endl ;
   }
 
-  time_t endtime = time(NULL) ;
+  time_t endtime = std::time(NULL) ;
   cout << "test_AllToAllvTimeDEC" << myrank << " begintime " << begintime << " endtime " << endtime
        << " elapse " << endtime-begintime << " " << maxtime/deltatime[myrank]
        << " calls to AllToAll" << endl ;
@@ -349,7 +348,7 @@ void MPIAccessDECTest::test_AllToAllvTimeDEC( bool Asynchronous , bool UseMPINat
 
   //  MPI_Finalize();
 
-  endtime = time(NULL) ;
+  endtime = std::time(NULL) ;
 
   cout << "test_AllToAllvTimeDEC" << myrank << " OK begintime " << begintime << " endtime " << endtime
        << " elapse " << endtime-begintime << " " << maxtime/deltatime[myrank]
diff --git a/src/ParaMEDMEMTest/test_AllToAllvTimeDoubleDEC.cxx b/src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx
similarity index 90%
rename from src/ParaMEDMEMTest/test_AllToAllvTimeDoubleDEC.cxx
rename to src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx
index 0b717c21f..81813e1a5 100644
--- a/src/ParaMEDMEMTest/test_AllToAllvTimeDoubleDEC.cxx
+++ b/src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <math.h>
 #include <string>
 #include <vector>
@@ -142,35 +141,35 @@ void MPIAccessDECTest::test_AllToAllvTimeDoubleDEC( bool Asynchronous ) {
      rtimedispls[i] = i ;
   }
 
-  double timeLoc[maxproc] ;
+  double time[maxproc] ;
   double deltatime[maxproc] = {1.,2.1,3.2,4.3,5.4,6.5,7.6,8.7,9.8,10.9,11.} ;
   double maxtime[maxproc] ;
   double nextdeltatime[maxproc] ;
   for ( i = 0 ; i < size ; i++ ) {
-     timeLoc[i] = 0 ;
+     time[i] = 0 ;
      maxtime[i] = maxreq ;
      nextdeltatime[i] = deltatime[i] ;
   }
-  time_t begintime = time(NULL) ;
-  for ( timeLoc[myrank] = 0 ; timeLoc[myrank] <= maxtime[myrank] && nextdeltatime[myrank] != 0 ;
-        timeLoc[myrank]+=nextdeltatime[myrank] ) {
+  time_t begintime = std::time(NULL) ;
+  for ( time[myrank] = 0 ; time[myrank] <= maxtime[myrank] && nextdeltatime[myrank] != 0 ;
+        time[myrank]+=nextdeltatime[myrank] ) {
 //local and target times
      int target ;
      for ( target = 0 ; target < size ; target++ ) {
         nextdeltatime[target] = deltatime[target] ;
-        if ( timeLoc[target] != 0 ) {
-          if ( timeLoc[target]+nextdeltatime[target] > maxtime[target] ) {
+        if ( time[target] != 0 ) {
+          if ( time[target]+nextdeltatime[target] > maxtime[target] ) {
             nextdeltatime[target] = 0 ;
           }
         }
         if ( target != myrank ) {
-          while ( timeLoc[myrank] >= timeLoc[target] ) {
-               timeLoc[target] += deltatime[target] ;
+          while ( time[myrank] >= time[target] ) {
+               time[target] += deltatime[target] ;
           }
         }
      }
-     MyMPIAccessDEC->setTime( timeLoc[myrank] , nextdeltatime[myrank] ) ;
-     cout << "test" << myrank << "=====TIME " << timeLoc[myrank] << "=====DELTATIME "
+     MyMPIAccessDEC->setTime( time[myrank] , nextdeltatime[myrank] ) ;
+     cout << "test" << myrank << "=====TIME " << time[myrank] << "=====DELTATIME "
           << nextdeltatime[myrank] << "=====MAXTIME " << maxtime[myrank] << " ======"
           << endl ; 
      double * sendbuf = new double[datamsglength*size] ;
@@ -182,7 +181,7 @@ void MPIAccessDECTest::test_AllToAllvTimeDoubleDEC( bool Asynchronous ) {
         for ( j = 0 ; j < datamsglength ; j++ ) {
            //sendbuf[j] = myrank*10000 + (j/datamsglength)*100 + j ;
            sendbuf[target*datamsglength+j] = myrank*1000000 + target*10000 +
-                                             (timeLoc[myrank]/deltatime[myrank])*100 + j ;
+                                             (time[myrank]/deltatime[myrank])*100 + j ;
            //cout << " " << (int ) sendbuf[target*datamsglength+j] ;
            recvbuf[target*datamsglength+j] = -1 ;
         }
@@ -223,18 +222,18 @@ void MPIAccessDECTest::test_AllToAllvTimeDoubleDEC( bool Asynchronous ) {
            int index = target*datamsglength+j ;
            if ( j < recvcounts[target] ) {
              if ( fabs(recvbuf[index] - (target*1000000 + myrank*10000 +
-                  (timeLoc[target]/deltatime[target])*100 + j)) > 101) {
+                  (time[target]/deltatime[target])*100 + j)) > 101) {
                badrecvbuf = true ;
-               cout << "test_AllToAllvTimeDoubleDEC" << myrank << " target " << target << " timeLoc[target] "
-                    << timeLoc[target] << " recvbuf[" << index << "] " << (int ) recvbuf[index]
+               cout << "test_AllToAllvTimeDoubleDEC" << myrank << " target " << target << " time[target] "
+                    << time[target] << " recvbuf[" << index << "] " << (int ) recvbuf[index]
                     << " # " << (int ) (target*1000000 +
-                       myrank*10000 + (timeLoc[target]/deltatime[target])*100 + j)
+                       myrank*10000 + (time[target]/deltatime[target])*100 + j)
                     << endl ;
              }
              else if ( badrecvbuf ) {
                cout << "test_AllToAllvTimeDoubleDEC" << myrank << " recvbuf[" << index << "] "
                     << recvbuf[index] << " ~= " << (int ) (target*1000000 +
-                       myrank*10000 + (timeLoc[target]/deltatime[target])*100 + j) << endl ;
+                       myrank*10000 + (time[target]/deltatime[target])*100 + j) << endl ;
              }
            }
            else if ( recvbuf[index] != -1 ) {
@@ -299,7 +298,7 @@ void MPIAccessDECTest::test_AllToAllvTimeDoubleDEC( bool Asynchronous ) {
          << " RecvRequests = 0 OK" << endl ;
   }
 
-  time_t endtime = time(NULL) ;
+  time_t endtime = std::time(NULL) ;
   cout << "test_AllToAllvTimeDoubleDEC" << myrank << " begintime " << begintime << " endtime " << endtime
        << " elapse " << endtime-begintime << " " << maxtime[myrank]/deltatime[myrank]
        << " calls to AllToAll" << endl ;
@@ -323,7 +322,7 @@ void MPIAccessDECTest::test_AllToAllvTimeDoubleDEC( bool Asynchronous ) {
 
 //  MPI_Finalize();
 
-  endtime = time(NULL) ;
+  endtime = std::time(NULL) ;
 
   cout << "test_AllToAllvTimeDoubleDEC" << myrank << " OK begintime " << begintime << " endtime " << endtime
        << " elapse " << endtime-begintime << " " << maxtime[myrank]/deltatime[myrank]
diff --git a/src/ParaMEDMEMTest/test_MPI_Access_Cancel.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_Cancel.cxx
similarity index 99%
rename from src/ParaMEDMEMTest/test_MPI_Access_Cancel.cxx
rename to src/ParaMEDMEM/Test/test_MPI_Access_Cancel.cxx
index 5b95d0d65..2ac553f3e 100644
--- a/src/ParaMEDMEMTest/test_MPI_Access_Cancel.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_Cancel.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <time.h>
 #include <string>
 #include <vector>
diff --git a/src/ParaMEDMEMTest/test_MPI_Access_Cyclic_ISend_IRecv.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_Cyclic_ISend_IRecv.cxx
similarity index 99%
rename from src/ParaMEDMEMTest/test_MPI_Access_Cyclic_ISend_IRecv.cxx
rename to src/ParaMEDMEM/Test/test_MPI_Access_Cyclic_ISend_IRecv.cxx
index c10f0599a..d2a84289c 100644
--- a/src/ParaMEDMEMTest/test_MPI_Access_Cyclic_ISend_IRecv.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_Cyclic_ISend_IRecv.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <string>
 #include <vector>
 #include <map>
diff --git a/src/ParaMEDMEMTest/test_MPI_Access_Cyclic_Send_Recv.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_Cyclic_Send_Recv.cxx
similarity index 99%
rename from src/ParaMEDMEMTest/test_MPI_Access_Cyclic_Send_Recv.cxx
rename to src/ParaMEDMEM/Test/test_MPI_Access_Cyclic_Send_Recv.cxx
index dd67d4d28..b825f90ef 100644
--- a/src/ParaMEDMEMTest/test_MPI_Access_Cyclic_Send_Recv.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_Cyclic_Send_Recv.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <string>
 #include <vector>
 #include <map>
diff --git a/src/ParaMEDMEMTest/test_MPI_Access_IProbe.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_IProbe.cxx
similarity index 99%
rename from src/ParaMEDMEMTest/test_MPI_Access_IProbe.cxx
rename to src/ParaMEDMEM/Test/test_MPI_Access_IProbe.cxx
index 5e07db5c5..9d18c902d 100644
--- a/src/ParaMEDMEMTest/test_MPI_Access_IProbe.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_IProbe.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <time.h>
 #include <string>
 #include <vector>
diff --git a/src/ParaMEDMEMTest/test_MPI_Access_ISendRecv.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_ISendRecv.cxx
similarity index 99%
rename from src/ParaMEDMEMTest/test_MPI_Access_ISendRecv.cxx
rename to src/ParaMEDMEM/Test/test_MPI_Access_ISendRecv.cxx
index e11dc7698..6b5411249 100644
--- a/src/ParaMEDMEMTest/test_MPI_Access_ISendRecv.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_ISendRecv.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <string>
 #include <vector>
 #include <map>
diff --git a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv.cxx
similarity index 99%
rename from src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv.cxx
rename to src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv.cxx
index 369952c8a..8d1a9306c 100644
--- a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <string>
 #include <vector>
 #include <map>
diff --git a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_BottleNeck.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_BottleNeck.cxx
similarity index 99%
rename from src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_BottleNeck.cxx
rename to src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_BottleNeck.cxx
index 3482278c2..45cc5439f 100644
--- a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_BottleNeck.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_BottleNeck.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <time.h>
 #include <string>
 #include <vector>
diff --git a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_Length.cxx
similarity index 99%
rename from src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length.cxx
rename to src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_Length.cxx
index bba555e5f..c6dc2743d 100644
--- a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_Length.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <string>
 #include <vector>
 #include <map>
diff --git a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length_1.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_Length_1.cxx
similarity index 99%
rename from src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length_1.cxx
rename to src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_Length_1.cxx
index f463d68d2..3d09f6d3c 100644
--- a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length_1.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_Length_1.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <string>
 #include <vector>
 #include <map>
diff --git a/src/ParaMEDMEMTest/test_MPI_Access_Probe.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_Probe.cxx
similarity index 98%
rename from src/ParaMEDMEMTest/test_MPI_Access_Probe.cxx
rename to src/ParaMEDMEM/Test/test_MPI_Access_Probe.cxx
index 6f86702dc..2bce97e12 100644
--- a/src/ParaMEDMEMTest/test_MPI_Access_Probe.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_Probe.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <string>
 #include <vector>
 #include <map>
diff --git a/src/ParaMEDMEMTest/test_MPI_Access_SendRecv.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_SendRecv.cxx
similarity index 99%
rename from src/ParaMEDMEMTest/test_MPI_Access_SendRecv.cxx
rename to src/ParaMEDMEM/Test/test_MPI_Access_SendRecv.cxx
index 2f7a4d73b..a93fa4af8 100644
--- a/src/ParaMEDMEMTest/test_MPI_Access_SendRecv.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_SendRecv.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <string>
 #include <vector>
 #include <map>
diff --git a/src/ParaMEDMEMTest/test_MPI_Access_Send_Recv.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_Send_Recv.cxx
similarity index 99%
rename from src/ParaMEDMEMTest/test_MPI_Access_Send_Recv.cxx
rename to src/ParaMEDMEM/Test/test_MPI_Access_Send_Recv.cxx
index d147b891d..f7e556a97 100644
--- a/src/ParaMEDMEMTest/test_MPI_Access_Send_Recv.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_Send_Recv.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <string>
 #include <vector>
 #include <map>
diff --git a/src/ParaMEDMEMTest/test_MPI_Access_Send_Recv_Length.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_Send_Recv_Length.cxx
similarity index 99%
rename from src/ParaMEDMEMTest/test_MPI_Access_Send_Recv_Length.cxx
rename to src/ParaMEDMEM/Test/test_MPI_Access_Send_Recv_Length.cxx
index db48addac..fc55f26f6 100644
--- a/src/ParaMEDMEMTest/test_MPI_Access_Send_Recv_Length.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_Send_Recv_Length.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <string>
 #include <vector>
 #include <map>
diff --git a/src/ParaMEDMEMTest/test_MPI_Access_Time.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_Time.cxx
similarity index 99%
rename from src/ParaMEDMEMTest/test_MPI_Access_Time.cxx
rename to src/ParaMEDMEM/Test/test_MPI_Access_Time.cxx
index d25251a2e..1a8eb185b 100644
--- a/src/ParaMEDMEMTest/test_MPI_Access_Time.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_Time.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <string>
 #include <vector>
 #include <map>
diff --git a/src/ParaMEDMEMTest/test_MPI_Access_Time_0.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_Time_0.cxx
similarity index 99%
rename from src/ParaMEDMEMTest/test_MPI_Access_Time_0.cxx
rename to src/ParaMEDMEM/Test/test_MPI_Access_Time_0.cxx
index c83eab086..3da138565 100644
--- a/src/ParaMEDMEMTest/test_MPI_Access_Time_0.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_Time_0.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//  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
@@ -16,7 +16,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <string>
 #include <vector>
 #include <map>
diff --git a/src/ParaMEDMEMTest/Makefile.am b/src/ParaMEDMEMTest/Makefile.am
deleted file mode 100644
index d2a12d21f..000000000
--- a/src/ParaMEDMEMTest/Makefile.am
+++ /dev/null
@@ -1,107 +0,0 @@
-#  Copyright (C) 2007-2010  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
-#
-
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-lib_LTLIBRARIES = libParaMEDMEMTest.la
-
-salomeinclude_HEADERS = \
-	MPIMainTest.hxx \
-	MPIAccessDECTest.hxx \
-	MPIAccessTest.hxx \
-	ParaMEDMEMTest.hxx
-
-EXTRA_DIST += MPIMainTest.hxx ParaMEDMEMTest_NonCoincidentDEC.cxx
-
-dist_libParaMEDMEMTest_la_SOURCES = \
-	ParaMEDMEMTest.cxx \
-	ParaMEDMEMTest_MPIProcessorGroup.cxx \
-	ParaMEDMEMTest_BlockTopology.cxx \
-	ParaMEDMEMTest_InterpKernelDEC.cxx \
-	ParaMEDMEMTest_StructuredCoincidentDEC.cxx \
-	ParaMEDMEMTest_MEDLoader.cxx \
-	ParaMEDMEMTest_ICocoTrio.cxx \
-	ParaMEDMEMTest_Gauthier1.cxx \
-	ParaMEDMEMTest_FabienAPI.cxx \
-	MPIAccessDECTest.cxx \
-	test_AllToAllDEC.cxx \
-	test_AllToAllvDEC.cxx \
-	test_AllToAllTimeDEC.cxx \
-	test_AllToAllvTimeDEC.cxx \
-	test_AllToAllvTimeDoubleDEC.cxx \
-	MPIAccessTest.cxx \
-	test_MPI_Access_Send_Recv.cxx \
-	test_MPI_Access_Cyclic_Send_Recv.cxx \
-	test_MPI_Access_SendRecv.cxx \
-	test_MPI_Access_ISend_IRecv.cxx \
-	test_MPI_Access_Cyclic_ISend_IRecv.cxx \
-	test_MPI_Access_ISendRecv.cxx \
-	test_MPI_Access_Probe.cxx \
-	test_MPI_Access_IProbe.cxx \
-	test_MPI_Access_Cancel.cxx \
-	test_MPI_Access_Send_Recv_Length.cxx \
-	test_MPI_Access_ISend_IRecv_Length.cxx \
-	test_MPI_Access_ISend_IRecv_Length_1.cxx \
-	test_MPI_Access_Time.cxx \
-	test_MPI_Access_Time_0.cxx \
-	test_MPI_Access_ISend_IRecv_BottleNeck.cxx
-
-
-libParaMEDMEMTest_la_CPPFLAGS = \
-	@CPPUNIT_INCLUDES@ \
-	$(MPI_INCLUDES) \
-	-I$(srcdir)/../INTERP_KERNEL \
-	-I$(srcdir)/../INTERP_KERNEL/Bases \
-	-I$(srcdir)/../INTERP_KERNEL/Geometric2D \
-	-I$(srcdir)/../ParaMEDMEM \
-	-I$(srcdir)/../MEDCoupling \
-	-I$(srcdir)/../MEDLoader  \
-	-I$(srcdir)/../ParaMEDLoader
-
-libParaMEDMEMTest_la_LDFLAGS = \
-	../ParaMEDMEM/libparamedmem.la \
-	../ParaMEDLoader/libparamedloader.la \
-	@CPPUNIT_LIBS@ $(MPI_LIBS)
-
-# Executables targets
-bin_PROGRAMS = \
-	TestParaMEDMEM \
-	TestMPIAccessDEC \
-	TestMPIAccess \
-	test_perf
-
-dist_TestParaMEDMEM_SOURCES = TestParaMEDMEM.cxx
-dist_TestMPIAccessDEC_SOURCES = TestMPIAccessDEC.cxx
-dist_TestMPIAccess_SOURCES = TestMPIAccess.cxx
-dist_test_perf_SOURCES = test_perf.cxx
-
-LDADD = $(MED2_LIBS) $(libMEDMEMTest_la_LDFLAGS) -lm $(MPI_LIBS) \
-	libParaMEDMEMTest.la \
-	../INTERP_KERNEL/libinterpkernel.la 
-
-if MED_ENABLE_FVM
-	LDADD += $(FVM_LIBS)
-	dist_libParaMEDMEMTest_la_SOURCES += ParaMEDMEMTest_NonCoincidentDEC.cxx
-	libParaMEDMEMTest_la_CPPFLAGS += -DMED_ENABLE_FVM $(FVM_INCLUDES)
-	libParaMEDMEMTest_la_LDFLAGS += $(FVM_LIBS)
-endif
-
-AM_CPPFLAGS += $(libParaMEDMEMTest_la_CPPFLAGS)
-
-UNIT_TEST_PROG = TestParaMEDMEM
diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest.cxx
deleted file mode 100644
index 50425fbc2..000000000
--- a/src/ParaMEDMEMTest/ParaMEDMEMTest.cxx
+++ /dev/null
@@ -1,128 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "ParaMEDMEMTest.hxx"
-#include <cppunit/TestAssert.h>
-
-#include <sstream>
-#include <cmath>
-#include <list>
-#include <stdexcept>
-#include <stdlib.h>
-
-//================================================================================
-/*!
- * \brief Get path to the resources file.
- *
- * When running 'make test' source file is taken from MED_SRC/resources folder.
- * Otherwise, file is searched in ${MED_ROOT_DIR}/share/salome/resources/med folder.
- * 
- * \param filename name of the resource file (should not include a path)
- * \return full path to the resource file
- */
-//================================================================================
-
-std::string ParaMEDMEMTest::getResourceFile( const std::string& filename )
-{
-  std::string resourceFile = "";
-
-  if ( getenv("top_srcdir") ) {
-    // we are in 'make check' step
-    resourceFile = getenv("top_srcdir");
-    resourceFile += "/resources/";
-  }
-  else if ( getenv("MED_ROOT_DIR") ) {
-    // use MED_ROOT_DIR env.var
-    resourceFile = getenv("MED_ROOT_DIR");
-    resourceFile += "/share/salome/resources/med/";
-  }
-  resourceFile += filename;
-  return resourceFile;
-}
-
-
-//================================================================================
-/*!
- * \brief Returns writable temporary directory
- * \return full path to the temporary directory
- */
-//================================================================================
-
-std::string ParaMEDMEMTest::getTmpDirectory()
-{
-  std::string path;
-
-  std::list<std::string> dirs;
-  if ( getenv("TMP") )    dirs.push_back( getenv("TMP" ));
-  if ( getenv("TMPDIR") ) dirs.push_back( getenv("TMPDIR" ));
-  dirs.push_back( "/tmp" );
-
-  std::string tmpd = "";
-  for ( std::list<std::string>::iterator dir = dirs.begin(); dir != dirs.end() && tmpd == "" ; ++dir ) {
-    if ( access( dir->data(), W_OK ) == 0 ) {
-      tmpd = dir->data();
-    }
-  }
-
-  if ( tmpd == "" )
-    throw std::runtime_error("Can't find writable temporary directory. Set TMP environment variable");
-
-  return tmpd;
-}
-
-//================================================================================
-/*!
- * \brief Creates a copy of source file (if source file is specified) 
- * in the temporary directory and returns a path to the tmp file
- *
- * \param tmpfile name of the temporary file (without path)
- * \param srcfile source file
- * \return path to the temporary file
- */
-//================================================================================
-std::string ParaMEDMEMTest::makeTmpFile( const std::string& tmpfile, const std::string& srcfile )
-{
-  std::string tmpf = getTmpDirectory() + "/" + tmpfile;
-  if ( srcfile != "" ) {
-    std::string cmd  = "cp " + srcfile + " " + tmpf + " ; chmod +w " + tmpf;
-    system( cmd.c_str() );
-  }
-  return tmpf;
-}
-
-
-/*!
- *  Tool to remove temporary files.
- *  Allows automatique removal of temporary files in case of test failure.
- */
-ParaMEDMEMTest_TmpFilesRemover::~ParaMEDMEMTest_TmpFilesRemover()
-{
-  std::set<std::string>::iterator it = myTmpFiles.begin();
-  for (; it != myTmpFiles.end(); it++) {
-    if (access((*it).data(), F_OK) == 0)
-      remove((*it).data());
-  }
-  myTmpFiles.clear();
-  //cout << "~ParaMEDMEMTest_TmpFilesRemover()" << endl;
-}
-
-bool ParaMEDMEMTest_TmpFilesRemover::Register(const std::string theTmpFile)
-{
-  return (myTmpFiles.insert(theTmpFile)).second;
-}
diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest.hxx b/src/ParaMEDMEMTest/ParaMEDMEMTest.hxx
deleted file mode 100644
index da4e4873c..000000000
--- a/src/ParaMEDMEMTest/ParaMEDMEMTest.hxx
+++ /dev/null
@@ -1,174 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef _ParaMEDMEMTEST_HXX_
-#define _ParaMEDMEMTEST_HXX_
-
-#include <cppunit/extensions/HelperMacros.h>
-
-#include <set>
-#include <string>
-#include <iostream>
-#include "mpi.h"
-
-
-class ParaMEDMEMTest : public CppUnit::TestFixture
-{
-  CPPUNIT_TEST_SUITE( ParaMEDMEMTest );
-  CPPUNIT_TEST(testMPIProcessorGroup_constructor);
-  CPPUNIT_TEST(testMPIProcessorGroup_boolean);
-  CPPUNIT_TEST(testMPIProcessorGroup_rank);
-  CPPUNIT_TEST(testBlockTopology_constructor);
-  CPPUNIT_TEST(testBlockTopology_serialize);
-  CPPUNIT_TEST(testInterpKernelDEC_2D);
-  CPPUNIT_TEST(testInterpKernelDEC2_2D);
-  CPPUNIT_TEST(testInterpKernelDEC_2DP0P1);
-  CPPUNIT_TEST(testInterpKernelDEC_3D);
-  CPPUNIT_TEST(testInterpKernelDECNonOverlapp_2D_P0P0);
-  CPPUNIT_TEST(testInterpKernelDECNonOverlapp_2D_P0P1P1P0);
-  CPPUNIT_TEST(testInterpKernelDEC2DM1D_P0P0);
-  CPPUNIT_TEST(testInterpKernelDECPartialProcs);
-
-  CPPUNIT_TEST(testSynchronousEqualInterpKernelWithoutInterpNativeDEC_2D);
-  CPPUNIT_TEST(testSynchronousEqualInterpKernelWithoutInterpDEC_2D);
-  CPPUNIT_TEST(testSynchronousEqualInterpKernelDEC_2D);
-  CPPUNIT_TEST(testSynchronousFasterSourceInterpKernelDEC_2D);
-  CPPUNIT_TEST(testSynchronousSlowerSourceInterpKernelDEC_2D);
-  CPPUNIT_TEST(testSynchronousSlowSourceInterpKernelDEC_2D);
-  CPPUNIT_TEST(testSynchronousFastSourceInterpKernelDEC_2D);
-  CPPUNIT_TEST(testAsynchronousEqualInterpKernelDEC_2D);
-  CPPUNIT_TEST(testAsynchronousFasterSourceInterpKernelDEC_2D);
-  CPPUNIT_TEST(testAsynchronousSlowerSourceInterpKernelDEC_2D);
-  CPPUNIT_TEST(testAsynchronousSlowSourceInterpKernelDEC_2D);
-  CPPUNIT_TEST(testAsynchronousFastSourceInterpKernelDEC_2D);
-#ifdef MED_ENABLE_FVM
-  //can be added again after FVM correction for 2D
-  //  CPPUNIT_TEST(testNonCoincidentDEC_2D);
-  CPPUNIT_TEST(testNonCoincidentDEC_3D); 
-#endif
-  CPPUNIT_TEST(testStructuredCoincidentDEC);
-  CPPUNIT_TEST(testStructuredCoincidentDEC);
-  CPPUNIT_TEST(testICocoTrio1);
-  CPPUNIT_TEST(testGauthier1);
-  CPPUNIT_TEST(testGauthier2);
-  CPPUNIT_TEST(testFabienAPI1);
-  CPPUNIT_TEST(testMEDLoaderRead1);
-  CPPUNIT_TEST(testMEDLoaderPolygonRead);
-  CPPUNIT_TEST(testMEDLoaderPolyhedronRead);
-  //CPPUNIT_TEST(testMEDLoaderWrite1);
-  //CPPUNIT_TEST(testMEDLoaderPolygonWrite);
-  CPPUNIT_TEST_SUITE_END();
-  
-
-public:
- 
-  ParaMEDMEMTest():CppUnit::TestFixture(){}
-  ~ParaMEDMEMTest(){}  
-  void setUp(){}
-  void tearDown(){}
-  void testMPIProcessorGroup_constructor();
-  void testMPIProcessorGroup_boolean();
-  void testMPIProcessorGroup_rank();
-  void testBlockTopology_constructor();
-  void testBlockTopology_serialize();
-  void testInterpKernelDEC_2D();
-  void testInterpKernelDEC2_2D();
-  void testInterpKernelDEC_2DP0P1();
-  void testInterpKernelDEC_3D();
-  void testInterpKernelDECNonOverlapp_2D_P0P0();
-  void testInterpKernelDECNonOverlapp_2D_P0P1P1P0();
-  void testInterpKernelDEC2DM1D_P0P0();
-  void testInterpKernelDECPartialProcs();
-#ifdef MED_ENABLE_FVM
-  void testNonCoincidentDEC_2D();
-  void testNonCoincidentDEC_3D();
-#endif
-  void testStructuredCoincidentDEC();
-  void testSynchronousEqualInterpKernelWithoutInterpNativeDEC_2D();
-  void testSynchronousEqualInterpKernelWithoutInterpDEC_2D();
-  void testSynchronousEqualInterpKernelDEC_2D();
-  void testSynchronousFasterSourceInterpKernelDEC_2D();
-  void testSynchronousSlowerSourceInterpKernelDEC_2D();
-  void testSynchronousSlowSourceInterpKernelDEC_2D();
-  void testSynchronousFastSourceInterpKernelDEC_2D();
-
-  void testAsynchronousEqualInterpKernelDEC_2D();
-  void testAsynchronousFasterSourceInterpKernelDEC_2D();
-  void testAsynchronousSlowerSourceInterpKernelDEC_2D();
-  void testAsynchronousSlowSourceInterpKernelDEC_2D();
-  void testAsynchronousFastSourceInterpKernelDEC_2D();
-  //
-  void testICocoTrio1();
-  void testGauthier1();
-  void testGauthier2();
-  void testFabienAPI1();
-  //
-  void testMEDLoaderRead1();
-  void testMEDLoaderPolygonRead();
-  void testMEDLoaderPolyhedronRead();
-  void testMEDLoaderWrite1();
-  void testMEDLoaderPolygonWrite();
-
-  std::string getResourceFile( const std::string& );
-  std::string getTmpDirectory();
-  std::string makeTmpFile( const std::string&, const std::string& = "" );
-
-private:
-  void testNonCoincidentDEC(const std::string& filename1, 
-                            const std::string& meshname1, 
-                            const std::string& filename2, 
-                            const std::string& meshname2,
-                            int nbprocsource, double epsilon);
-  void testAsynchronousInterpKernelDEC_2D(double dtA, double tmaxA, 
-                                          double dtB, double tmaxB,
-                                          bool WithPointToPoint, bool Asynchronous, bool WithInterp, const char *srcMeth, const char *targetMeth);
-  void testInterpKernelDEC_2D_(const char *srcMeth, const char *targetMeth);
-  void testInterpKernelDEC2_2D_(const char *srcMeth, const char *targetMeth);
-  void testInterpKernelDEC_3D_(const char *srcMeth, const char *targetMeth);
-};
-
-// to automatically remove temporary files from disk
-class ParaMEDMEMTest_TmpFilesRemover
-{
-public:
-  ParaMEDMEMTest_TmpFilesRemover() {}
-  ~ParaMEDMEMTest_TmpFilesRemover();
-  bool Register(const std::string theTmpFile);
-
-private:
-  std::set<std::string> myTmpFiles;
-};
-
-/*!
- *  Tool to print array to stream.
- */
-template<class T>
-void ParaMEDMEMTest_DumpArray (std::ostream & stream, const T* array, const int length, const std::string text)
-{
-  stream << text << ": {";
-  if (length > 0) {
-    stream << array[0];
-    for (int i = 1; i < length; i++) {
-      stream << ", " << array[i];
-    }
-  }
-  stream << "}" << std::endl;
-};
-
-#endif
diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_FabienAPI.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_FabienAPI.cxx
deleted file mode 100644
index 92c33f5b3..000000000
--- a/src/ParaMEDMEMTest/ParaMEDMEMTest_FabienAPI.cxx
+++ /dev/null
@@ -1,112 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "ParaMEDMEMTest.hxx"
-#include "CommInterface.hxx"
-#include "ProcessorGroup.hxx"
-#include "MPIProcessorGroup.hxx"
-#include "InterpKernelDEC.hxx"
-#include "MEDCouplingUMesh.hxx"
-#include "ParaMESH.hxx"
-#include "ParaFIELD.hxx"
-#include "ComponentTopology.hxx"
-
-#include <set>
-
-using namespace ParaMEDMEM;
-
-void ParaMEDMEMTest::testFabienAPI1()
-{
-  int size;
-  int rank;
-  MPI_Comm_size(MPI_COMM_WORLD,&size);
-  MPI_Comm_rank(MPI_COMM_WORLD,&rank);
-  //
-  if(size!=3)
-    return ;
-  int procs_source[1]={0};
-  int procs_target[1]={1};
-  //
-  ParaMEDMEM::MEDCouplingUMesh *mesh=0;
-  ParaMEDMEM::ParaMESH *paramesh=0;
-  ParaMEDMEM::ParaFIELD *parafield=0;
-  //
-  ParaMEDMEM::CommInterface interface;
-  //
-  MPI_Barrier(MPI_COMM_WORLD);
-  double targetCoords[8]={ 0.,0., 1., 0., 0., 1., 1., 1. };
-  CommInterface comm;
-  //
-  ParaMEDMEM::InterpKernelDEC *dec=new ParaMEDMEM::InterpKernelDEC(procs_source,procs_source+1,procs_target,procs_target+1);
-  if(dec->isInSourceSide())
-    {    
-      mesh=MEDCouplingUMesh::New();
-      mesh->setMeshDimension(2);
-      DataArrayDouble *myCoords=DataArrayDouble::New();
-      myCoords->alloc(4,2);
-      std::copy(targetCoords,targetCoords+8,myCoords->getPointer());
-      mesh->setCoords(myCoords);
-      myCoords->decrRef();
-      int targetConn[4]={0,2,3,1};
-      mesh->allocateCells(1);
-      mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn);
-      mesh->finishInsertingCells();
-      ParaMEDMEM::ComponentTopology comptopo;
-      paramesh=new ParaMESH(mesh,*dec->getSourceGrp(),"source mesh");
-      parafield=new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);
-      parafield->getField()->setNature(ConservativeVolumic);
-      double *vals=parafield->getField()->getArray()->getPointer();
-      vals[0]=7.;
-    }
-  if(dec->isInTargetSide())
-    {
-      mesh=MEDCouplingUMesh::New();
-      mesh->setMeshDimension(2);
-      DataArrayDouble *myCoords=DataArrayDouble::New();
-      myCoords->alloc(4,2);
-      std::copy(targetCoords,targetCoords+8,myCoords->getPointer());
-      mesh->setCoords(myCoords);
-      myCoords->decrRef();
-      int targetConn[6]={0,2,1,2,3,1};
-      mesh->allocateCells(2);
-      mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn);
-      mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+3);
-      mesh->finishInsertingCells();
-      ParaMEDMEM::ComponentTopology comptopo;
-      paramesh=new ParaMESH(mesh,*dec->getTargetGrp(),"target mesh");
-      parafield=new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);
-      parafield->getField()->setNature(ConservativeVolumic);
-    }
-  dec->attachLocalField(parafield);
-  dec->synchronize();
-  dec->sendRecvData();
-  if(dec->isInTargetSide())
-    {
-      const double *valsToTest=parafield->getField()->getArray()->getConstPointer();
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(valsToTest[0],7.,1e-14);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(valsToTest[1],7.,1e-14);
-    }
-  //
-  delete parafield;
-  delete paramesh;
-  if(mesh)
-    mesh->decrRef();
-  delete dec;
-  MPI_Barrier(MPI_COMM_WORLD);
-}
diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_Gauthier1.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_Gauthier1.cxx
deleted file mode 100644
index 099d30626..000000000
--- a/src/ParaMEDMEMTest/ParaMEDMEMTest_Gauthier1.cxx
+++ /dev/null
@@ -1,434 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "ParaMEDMEMTest.hxx"
-#include <cppunit/TestAssert.h>
-
-#include <string>
-#include "CommInterface.hxx"
-#include "ProcessorGroup.hxx"
-#include "MPIProcessorGroup.hxx"
-#include "DEC.hxx"
-#include "InterpKernelDEC.hxx"
-#include <set>
-#include <time.h>
-#include "ICoCoTrioField.hxx"
-#include <iostream>
-#include <assert.h>
-#include <math.h>
-
-using namespace std;
-using namespace ParaMEDMEM;
-using namespace ICoCo;
-
-void afficheGauthier1( const TrioField&   field, const double *vals, int lgth)
-{
-  CPPUNIT_ASSERT_EQUAL(lgth,field._nb_elems);
-  for (int ele=0;ele<field._nb_elems;ele++)
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(vals[ele],field._field[ele],1e-12);
-}
-
-void remplit_coordGauthier1(double* coords)
-{
-  double angle,epaisseur;
-  angle=0*45*(asin(1)/90);
-  epaisseur=1e-0;
-  coords[0*3+0]=0.;
-  coords[0*3+1]=0.;
-  coords[0*3+2]=0.;
-  
-  coords[1*3+0]=cos(angle);
-  coords[1*3+1]=0.;
-  coords[1*3+2]=sin(angle);
-  
-    
-  coords[2*3+0]=-sin(angle);
-  coords[2*3+1]=0.;
-  coords[2*3+2]=cos(angle);
-  
-  for (int d=0;d<3;d++)
-    coords[3*3+d]=coords[1*3+d]+ coords[2*3+d];
-  
-  for (int i=4;i<8;i++)
-    {
-      for (int d=0;d<3;d++)
-        coords[i*3+d]=coords[(i-4)*3+d];
-      coords[i*3+1]+=epaisseur;
-    }
-
-}
-
-void init_quadGauthier1(TrioField& champ_quad,int is_master)
-{
-  
-  champ_quad.setName("champ_quad");
-  champ_quad._space_dim=3;
-  champ_quad._mesh_dim=2;
-  champ_quad._nodes_per_elem=4;
-  champ_quad._itnumber=0;
-  champ_quad._time1=0;
-  champ_quad._time2=1;
-  champ_quad._nb_field_components=1;
-
-  if (is_master)
-    {
-      champ_quad._nbnodes=8;
-      champ_quad._nb_elems=2;
-      
-      champ_quad._coords=new double[champ_quad._nbnodes*champ_quad._space_dim];
-      //memcpy(afield._coords,sommets.addr(),champ_quad._nbnodes*champ_quad._space_dim*sizeof(double));
-      
-      remplit_coordGauthier1(champ_quad._coords);
-  
-  
-      champ_quad._connectivity=new int[champ_quad._nb_elems*champ_quad._nodes_per_elem];
-      champ_quad._connectivity[0*champ_quad._nodes_per_elem+0]=0;
-      champ_quad._connectivity[0*champ_quad._nodes_per_elem+1]=1;
-      champ_quad._connectivity[0*champ_quad._nodes_per_elem+2]=3;
-      champ_quad._connectivity[0*champ_quad._nodes_per_elem+3]=2;
-      champ_quad._connectivity[1*champ_quad._nodes_per_elem+0]=4;
-      champ_quad._connectivity[1*champ_quad._nodes_per_elem+1]=5;
-      champ_quad._connectivity[1*champ_quad._nodes_per_elem+2]=7;
-      champ_quad._connectivity[1*champ_quad._nodes_per_elem+3]=6;
-      
-    }
-  else
-    {
-      champ_quad._nbnodes=0;
-      champ_quad._nb_elems=0;
-      champ_quad._coords=new double[champ_quad._nbnodes*champ_quad._space_dim];
-    
-    }
-  champ_quad._has_field_ownership=false;
-  champ_quad._field=0;
-  //champ_quad._field=new double[champ_quad._nb_elems];
-  //  assert(champ_quad._nb_field_components==1);
-}
-void init_triangleGauthier1(TrioField& champ_triangle,int is_master)
-{
-   
-  champ_triangle.setName("champ_triangle");
-  champ_triangle._space_dim=3;
-  champ_triangle._mesh_dim=2;
-  champ_triangle._nodes_per_elem=3;
-  champ_triangle._itnumber=0;
-  champ_triangle._time1=0;
-  champ_triangle._time2=1;
-  champ_triangle._nb_field_components=1;
-
-  if (is_master)
-    {
-      champ_triangle._nb_elems=4;
-      champ_triangle._nbnodes=8;
-    
-      champ_triangle._coords=new double[champ_triangle._nbnodes*champ_triangle._space_dim];
-      //memcpy(afield._coords,sommets.addr(),champ_triangle._nbnodes*champ_triangle._space_dim*sizeof(double));
-      remplit_coordGauthier1(champ_triangle._coords);
-      
-      champ_triangle._connectivity=new int[champ_triangle._nb_elems*champ_triangle._nodes_per_elem];
-      champ_triangle._connectivity[0*champ_triangle._nodes_per_elem+0]=0;
-      champ_triangle._connectivity[0*champ_triangle._nodes_per_elem+1]=1;
-      champ_triangle._connectivity[0*champ_triangle._nodes_per_elem+2]=2;
-      champ_triangle._connectivity[1*champ_triangle._nodes_per_elem+0]=1;
-      champ_triangle._connectivity[1*champ_triangle._nodes_per_elem+1]=2;
-      champ_triangle._connectivity[1*champ_triangle._nodes_per_elem+2]=3;
-      
-      champ_triangle._connectivity[2*champ_triangle._nodes_per_elem+0]=4;
-      champ_triangle._connectivity[2*champ_triangle._nodes_per_elem+1]=5;
-      champ_triangle._connectivity[2*champ_triangle._nodes_per_elem+2]=7;
-      champ_triangle._connectivity[3*champ_triangle._nodes_per_elem+0]=4;
-      champ_triangle._connectivity[3*champ_triangle._nodes_per_elem+1]=6;
-      champ_triangle._connectivity[3*champ_triangle._nodes_per_elem+2]=7;
-    }
-  else
-    {
-      champ_triangle._nb_elems=0;
-      champ_triangle._nbnodes=0;
-      champ_triangle._coords=new double[champ_triangle._nbnodes*champ_triangle._space_dim];
-    
-    }
-  champ_triangle._has_field_ownership=false;
-  // champ_triangle._field=new double[champ_triangle._nb_elems];
-  champ_triangle._field=0;
-  
-}
-
-
-void ParaMEDMEMTest::testGauthier1()
-{
-  int num_cas=0;
-  int rank, size;
-  MPI_Comm_rank(MPI_COMM_WORLD,&rank);
-  MPI_Comm_size(MPI_COMM_WORLD,&size);
-  
-  int is_master=0;
-
-  CommInterface comm;
-  set<int> emetteur_ids;
-  set<int> recepteur_ids;
-  emetteur_ids.insert(0);
-  if(size!=4)
-    return;
-  recepteur_ids.insert(1);
-  if (size >2) 
-    recepteur_ids.insert(2);
-  if (size >2) 
-    emetteur_ids.insert(3);
-  if ((rank==0)||(rank==1)) 
-    is_master=1;
-  
-  MPIProcessorGroup recepteur_group(comm,recepteur_ids);
-  MPIProcessorGroup emetteur_group(comm,emetteur_ids);
-
-
-  string cas;
-  if (recepteur_group.containsMyRank())
-    {
-      cas="recepteur";
-      //freopen("recpeteur.out","w",stdout);
-      //freopen("recepteur.err","w",stderr);
-      
-    }
-  else
-    {
-      cas="emetteur";
-      // freopen("emetteur.out","w",stdout);
-      //freopen("emetteur.err","w",stderr);
-    }
-  double expected[8][4]={
-    {1.,1.,1.,1.},
-    {40., 40., 1., 1.},
-    {1.,1.,1e200,1e200},
-    {40.,1.,1e200,1e200},
-    {1.,1.,1.,1.},
-    {40.,1.,1.,1.},
-    {1.,1.,1e200,1e200},
-    {20.5,1.,1e200,1e200}
-  };
-
-  int expectedLgth[8]={4,4,2,2,4,4,2,2};
-  
-  for (int send=0;send<2;send++)
-    for (int rec=0;rec<2;rec++)
-      {
-        InterpKernelDEC dec_emetteur(emetteur_group, recepteur_group);
-        dec_emetteur.setOrientation(2);
-        TrioField champ_emetteur, champ_recepteur;
-   
-        if (send==0)
-          init_quadGauthier1(champ_emetteur,is_master);
-        else
-          init_triangleGauthier1(champ_emetteur,is_master);
-        if (rec==0)
-          init_triangleGauthier1(champ_recepteur,is_master);
-        else
-          init_quadGauthier1(champ_recepteur,is_master);
-  
-        if (cas=="emetteur") 
-          {
-            champ_emetteur._field=new double[champ_emetteur._nb_elems];
-            for (int ele=0;ele<champ_emetteur._nb_elems;ele++)
-              champ_emetteur._field[ele]=1;
-      
-            champ_emetteur._has_field_ownership=true;
-          }
-  
-  
-        MPI_Barrier(MPI_COMM_WORLD);
-
-        clock_t clock0= clock ();
-        int compti=0;
-
-        bool init=true; // first time step ??
-        bool stop=false;
-        //boucle sur les pas de quads
-        while (!stop) {
-  
-          compti++;
-          clock_t clocki= clock ();
-          //cout << compti << " CLOCK " << (clocki-clock0)*1.e-6 << endl; 
-          for (int non_unif=0;non_unif<2;non_unif++)
-            {
-              // if (champ_recepteur._field)
-              //   delete [] champ_recepteur._field;
-              champ_recepteur._field=0;
-              // champ_recepteur._has_field_ownership=false;
-  
-
-  
-              if (cas=="emetteur") 
-                {
-                  if (non_unif)
-                    if(rank!=3)
-                      champ_emetteur._field[0]=40;
-                }
-              bool ok=false; // Is the time interval successfully solved ?
-    
-              // Loop on the time interval tries
-              if(1) {
-      
-
-                if (cas=="emetteur")
-                  dec_emetteur.attachLocalField((ICoCo::Field*) &champ_emetteur);
-                else
-                  dec_emetteur.attachLocalField((ICoCo::Field*) &champ_recepteur);
-
-
-                if(init) dec_emetteur.synchronize();
-                init=false;
-
-                if (cas=="emetteur") {
-                  //    affiche(champ_emetteur);
-                  dec_emetteur.sendData();
-                }
-                else if (cas=="recepteur")
-                  {
-                    dec_emetteur.recvData();
-                    if (is_master)
-                      afficheGauthier1(champ_recepteur,expected[num_cas],expectedLgth[num_cas]);
-                  }
-                else
-                  throw 0;
-                MPI_Barrier(MPI_COMM_WORLD);
-              }
-              stop=true;
-              num_cas++;
-            }
-          // destruction des champs, des DEC, et des tableaux associés
-        }
-      }
-}
-
-void ParaMEDMEMTest::testGauthier2()
-{
-  const char save_vit_in_2[]="VITESSE_P1_OUT\n1\n2\n3\n63\n3\n80\n0\n 0 1 2\n 3 4 5\n 6 7 8\n 9 10 11\n 12 13 14\n 15 16 17\n 18 19 20\n 21 22 23\n 24 25 26\n 27 28 29\n 30 2 1\n 31 5 4\n 32 8 7\n 33 11 10\n 34 14 13\n 35 17 16\n 36 20 19\n 37 23 22\n 38 26 25\n 39 29 28\n 30 40 2\n 31 41 5\n 32 42 8\n 33 43 11\n 34 44 14\n 35 45 17\n 36 46 20\n 37 47 23\n 38 48 26\n 39 49 29\n 31 2 40\n 32 5 41\n 33 8 42\n 34 11 43\n 35 14 44\n 36 17 45\n 37 20 46\n 38 23 47\n 39 26 48\n 50 29 49\n 3 2 4\n 6 5 7\n 9 8 10\n 12 11 13\n 15 14 16\n 18 17 19\n 21 20 22\n 24 23 25\n 27 26 28\n 51 29 52\n 31 4 2\n 32 7 5\n 33 10 8\n 34 13 11\n 35 16 14\n 36 19 17\n 37 22 20\n 38 25 23\n 39 28 26\n 50 52 29\n 0 2 53\n 3 5 54\n 6 8 55\n 9 11 56\n 12 14 57\n 15 17 58\n 18 20 59\n 21 23 60\n 24 26 61\n 27 29 62\n 3 53 2\n 6 54 5\n 9 55 8\n 12 56 11\n 15 57 14\n 18 58 17\n 21 59 20\n 24 60 23\n 27 61 26\n 51 62 29\n 0 0 0\n 0.5 0 0\n 0.5 0.05 0\n 0 0.1 0\n 0.5 0.1 0\n 0.5 0.15 0\n 0 0.2 0\n 0.5 0.2 0\n 0.5 0.25 0\n 0 0.3 0\n 0.5 0.3 0\n 0.5 0.35 0\n 0 0.4 0\n 0.5 0.4 0\n 0.5 0.45 0\n 0 0.5 0\n 0.5 0.5 0\n 0.5 0.55 0\n 0 0.6 0\n 0.5 0.6 0\n 0.5 0.65 0\n 0 0.7 0\n 0.5 0.7 0\n 0.5 0.75 0\n 0 0.8 0\n 0.5 0.8 0\n 0.5 0.85 0\n 0 0.9 0\n 0.5 0.9 0\n 0.5 0.95 0\n 1 0 0\n 1 0.1 0\n 1 0.2 0\n 1 0.3 0\n 1 0.4 0\n 1 0.5 0\n 1 0.6 0\n 1 0.7 0\n 1 0.8 0\n 1 0.9 0\n 1 0.05 0\n 1 0.15 0\n 1 0.25 0\n 1 0.35 0\n 1 0.45 0\n 1 0.55 0\n 1 0.65 0\n 1 0.75 0\n 1 0.85 0\n 1 0.95 0\n 1 1 0\n 0 1 0\n 0.5 1 0\n 0 0.05 0\n 0 0.15 0\n 0 0.25 0\n 0 0.35 0\n 0 0.45 0\n 0 0.55 0\n 0 0.65 0\n 0 0.75 0\n 0 0.85 0\n 0 0.95 0\n2.9268\n3.1707\n3\n1\n 0 0 0\n 0 0 0\n 0 0 0.05\n 0 0 0.1\n 0 0 0.1\n 0 0 0.15\n 0 0 0.2\n 0 0 0.2\n 0 0 0.25\n 0 0 0.3\n 0 0 0.3\n 0 0 0.35\n 0 0 0.4\n 0 0 0.4\n 0 0 0.45\n 0 0 0.5\n 0 0 0.5\n 0 0 0.55\n 0 0 0.6\n 0 0 0.6\n 0 0 0.65\n 0 0 0.7\n 0 0 0.7\n 0 0 0.75\n 0 0 0.8\n 0 0 0.8\n 0 0 0.85\n 0 0 0.9\n 0 0 0.9\n 0 0 0.95\n 0 0 0\n 0 0 0.1\n 0 0 0.2\n 0 0 0.3\n 0 0 0.4\n 0 0 0.5\n 0 0 0.6\n 0 0 0.7\n 0 0 0.8\n 0 0 0.9\n 0 0 0.05\n 0 0 0.15\n 0 0 0.25\n 0 0 0.35\n 0 0 0.45\n 0 0 0.55\n 0 0 0.65\n 0 0 0.75\n 0 0 0.85\n 0 0 0.95\n 0 0 1\n 0 0 1\n 0 0 1\n 0 0 0.05\n 0 0 0.15\n 0 0 0.25\n 0 0 0.35\n 0 0 0.45\n 0 0 0.55\n 0 0 0.65\n 0 0 0.75\n 0 0 0.85\n 0 0 0.95\n1\n";
-
-  const char save_vit_out_0_2[]="vitesse_in_chaude\n0\n2\n3\n22\n4\n10\n-1081737852\n 0 1 3 2\n 2 3 5 4\n 4 5 7 6\n 6 7 9 8\n 8 9 11 10\n 10 11 13 12\n 12 13 15 14\n 14 15 17 16\n 16 17 19 18\n 18 19 21 20\n 0 0 0\n 1 0 0\n 0 0.1 0\n 1 0.1 0\n 0 0.2 0\n 1 0.2 0\n 0 0.3 0\n 1 0.3 0\n 0 0.4 0\n 1 0.4 0\n 0 0.5 0\n 1 0.5 0\n 0 0.6 0\n 1 0.6 0\n 0 0.7 0\n 1 0.7 0\n 0 0.8 0\n 1 0.8 0\n 0 0.9 0\n 1 0.9 0\n 0 1 0\n 1 1 0\n2.9268\n3.1707\n3\n1\n 0 0 0.05\n 0 0 0.15\n 0 0 0.25\n 0 0 0.35\n 0 0 0.45\n 0 0 0.55\n 0 0 0.65\n 0 0 0.75\n 0 0 0.85\n 0 0 0.95\n0\n";
-  const char save_vit_out_1_2[]="vitesse_in_chaude\n1\n2\n3\n22\n4\n10\n-1081737852\n 0 1 3 2\n 2 3 5 4\n 4 5 7 6\n 6 7 9 8\n 8 9 11 10\n 10 11 13 12\n 12 13 15 14\n 14 15 17 16\n 16 17 19 18\n 18 19 21 20\n 0 0 0\n 1 0 0\n 0 0.1 0\n 1 0.1 0\n 0 0.2 0\n 1 0.2 0\n 0 0.3 0\n 1 0.3 0\n 0 0.4 0\n 1 0.4 0\n 0 0.5 0\n 1 0.5 0\n 0 0.6 0\n 1 0.6 0\n 0 0.7 0\n 1 0.7 0\n 0 0.8 0\n 1 0.8 0\n 0 0.9 0\n 1 0.9 0\n 0 1 0\n 1 1 0\n2.9268\n3.1707\n3\n1\n 0 0 0.029375\n 0 0 0.029375\n 0 0 0.1\n 0 0 0.1\n 0 0 0.2\n 0 0 0.2\n 0 0 0.3\n 0 0 0.3\n 0 0 0.4\n 0 0 0.4\n 0 0 0.5\n 0 0 0.5\n 0 0 0.6\n 0 0 0.6\n 0 0 0.7\n 0 0 0.7\n 0 0 0.8\n 0 0 0.8\n 0 0 0.9\n 0 0 0.9\n 0 0 0.970625\n 0 0 0.970625\n0\n";
-
-  const char *save_vit_outs[2]={save_vit_out_1_2,save_vit_out_0_2};
-
-  const char save_vit_out_1_0[]="vitesse_in_chaude\n1\n2\n3\n22\n4\n10\n-1081737852\n 0 1 3 2\n 2 3 5 4\n 4 5 7 6\n 6 7 9 8\n 8 9 11 10\n 10 11 13 12\n 12 13 15 14\n 14 15 17 16\n 16 17 19 18\n 18 19 21 20\n 0 0 0\n 1 0 0\n 0 0.1 0\n 1 0.1 0\n 0 0.2 0\n 1 0.2 0\n 0 0.3 0\n 1 0.3 0\n 0 0.4 0\n 1 0.4 0\n 0 0.5 0\n 1 0.5 0\n 0 0.6 0\n 1 0.6 0\n 0 0.7 0\n 1 0.7 0\n 0 0.8 0\n 1 0.8 0\n 0 0.9 0\n 1 0.9 0\n 0 1 0\n 1 1 0\n2.9268\n3.1707\n3\n1\n 0 0 0.029375\n 0 0 0.029375\n 0 0 0.1\n 0 0 0.1\n 0 0 0.2\n 0 0 0.2\n 0 0 0.3\n 0 0 0.3\n 0 0 0.4\n 0 0 0.4\n 0 0 0.5\n 0 0 0.5\n 0 0 0.6\n 0 0 0.6\n 0 0 0.7\n 0 0 0.7\n 0 0 0.8\n 0 0 0.8\n 0 0 0.9\n 0 0 0.9\n 0 0 0.970625\n 0 0 0.970625\n0\n";
-  
-  const char save_vit_in[]="VITESSE_P1_OUT\n1\n2\n3\n63\n3\n80\n0\n 0 1 2\n 3 4 5\n 6 7 8\n 9 10 11\n 12 13 14\n 15 16 17\n 18 19 20\n 21 22 23\n 24 25 26\n 27 28 29\n 30 2 1\n 31 5 4\n 32 8 7\n 33 11 10\n 34 14 13\n 35 17 16\n 36 20 19\n 37 23 22\n 38 26 25\n 39 29 28\n 30 40 2\n 31 41 5\n 32 42 8\n 33 43 11\n 34 44 14\n 35 45 17\n 36 46 20\n 37 47 23\n 38 48 26\n 39 49 29\n 31 2 40\n 32 5 41\n 33 8 42\n 34 11 43\n 35 14 44\n 36 17 45\n 37 20 46\n 38 23 47\n 39 26 48\n 50 29 49\n 3 2 4\n 6 5 7\n 9 8 10\n 12 11 13\n 15 14 16\n 18 17 19\n 21 20 22\n 24 23 25\n 27 26 28\n 51 29 52\n 31 4 2\n 32 7 5\n 33 10 8\n 34 13 11\n 35 16 14\n 36 19 17\n 37 22 20\n 38 25 23\n 39 28 26\n 50 52 29\n 0 2 53\n 3 5 54\n 6 8 55\n 9 11 56\n 12 14 57\n 15 17 58\n 18 20 59\n 21 23 60\n 24 26 61\n 27 29 62\n 3 53 2\n 6 54 5\n 9 55 8\n 12 56 11\n 15 57 14\n 18 58 17\n 21 59 20\n 24 60 23\n 27 61 26\n 51 62 29\n 0 0 0\n 0.5 0 0\n 0.5 0.05 0\n 0 0.1 0\n 0.5 0.1 0\n 0.5 0.15 0\n 0 0.2 0\n 0.5 0.2 0\n 0.5 0.25 0\n 0 0.3 0\n 0.5 0.3 0\n 0.5 0.35 0\n 0 0.4 0\n 0.5 0.4 0\n 0.5 0.45 0\n 0 0.5 0\n 0.5 0.5 0\n 0.5 0.55 0\n 0 0.6 0\n 0.5 0.6 0\n 0.5 0.65 0\n 0 0.7 0\n 0.5 0.7 0\n 0.5 0.75 0\n 0 0.8 0\n 0.5 0.8 0\n 0.5 0.85 0\n 0 0.9 0\n 0.5 0.9 0\n 0.5 0.95 0\n 1 0 0\n 1 0.1 0\n 1 0.2 0\n 1 0.3 0\n 1 0.4 0\n 1 0.5 0\n 1 0.6 0\n 1 0.7 0\n 1 0.8 0\n 1 0.9 0\n 1 0.05 0\n 1 0.15 0\n 1 0.25 0\n 1 0.35 0\n 1 0.45 0\n 1 0.55 0\n 1 0.65 0\n 1 0.75 0\n 1 0.85 0\n 1 0.95 0\n 1 1 0\n 0 1 0\n 0.5 1 0\n 0 0.05 0\n 0 0.15 0\n 0 0.25 0\n 0 0.35 0\n 0 0.45 0\n 0 0.55 0\n 0 0.65 0\n 0 0.75 0\n 0 0.85 0\n 0 0.95 0\n2.9268\n3.1707\n3\n1\n 0 0 0\n 0 0 0\n 0 0 0.05\n 0 0 0.1\n 0 0 0.1\n 0 0 0.15\n 0 0 0.2\n 0 0 0.2\n 0 0 0.25\n 0 0 0.3\n 0 0 0.3\n 0 0 0.35\n 0 0 0.4\n 0 0 0.4\n 0 0 0.45\n 0 0 0.5\n 0 0 0.5\n 0 0 0.55\n 0 0 0.6\n 0 0 0.6\n 0 0 0.65\n 0 0 0.7\n 0 0 0.7\n 0 0 0.75\n 0 0 0.8\n 0 0 0.8\n 0 0 0.85\n 0 0 0.9\n 0 0 0.9\n 0 0 0.95\n 0 0 0\n 0 0 0.1\n 0 0 0.2\n 0 0 0.3\n 0 0 0.4\n 0 0 0.5\n 0 0 0.6\n 0 0 0.7\n 0 0 0.8\n 0 0 0.9\n 0 0 0.05\n 0 0 0.15\n 0 0 0.25\n 0 0 0.35\n 0 0 0.45\n 0 0 0.55\n 0 0 0.65\n 0 0 0.75\n 0 0 0.85\n 0 0 0.95\n 0 0 1\n 0 0 1\n 0 0 1\n 0 0 0.05\n 0 0 0.15\n 0 0 0.25\n 0 0 0.35\n 0 0 0.45\n 0 0 0.55\n 0 0 0.65\n 0 0 0.75\n 0 0 0.85\n 0 0 0.95\n1\n";
-
-  double valuesExpected1[2]={0.,0.};
-  double valuesExpected2[2]={0.95,0.970625};
-  
-  double valuesExpected30[]={0., 0., 0.05, 0., 0., 0.15, 0., 0., 0.25, 0., 0., 0.35, 0., 0., 0.45, 0., 0., 0.55, 0., 0., 0.65, 0., 0., 0.75, 0., 0., 0.85, 0., 0., 0.95};
-  double valuesExpected31[]={0.,  0.,  0.029375,  0.,  0.,  0.029375,  0.,  0.,  0.1,  0.,  0.,  0.1,  0.,  0.,  0.2,  0.,  0.,  0.2,  0.,  0.,  0.3,  0.,  0.,  0.3,  0.,  0.,  0.4,  0.,  0.,  0.4,  0.,  0.,  0.5,  0.,  0.,  0.5,  0.,  0.,  0.6,  0.,  0.,  0.6,  0.,  0.,  0.7,  0.,  0.,  0.7,  0.,  0.,  0.8,  0.,  0.,  0.8,  0.,  0.,  0.9,  0.,  0.,  0.9,  0.,  0.,  0.970625,  0.,  0.,  0.970625 };
-
-  double *valuesExpected3[2]={valuesExpected30,valuesExpected31};
-
-  int rank, size;
-  MPI_Comm_rank(MPI_COMM_WORLD,&rank);
-  MPI_Comm_size(MPI_COMM_WORLD,&size);
-  if (size <2)
-    return ;
-  CommInterface comm;
-  set<int> Genepi_ids;
-  set<int> entree_chaude_ids;
-  Genepi_ids.insert(0);
-  for (int i=1;i<size;i++)
-    entree_chaude_ids.insert(i);
-  for (int type=0;type<2;type++)
-    {
-      MPIProcessorGroup entree_chaude_group(comm,entree_chaude_ids);
-      MPIProcessorGroup Genepi_group(comm,Genepi_ids);
-
-      TrioField vitesse;
-      InterpKernelDEC dec_vit_in_chaude(entree_chaude_group, Genepi_group);
-
-      if ( entree_chaude_group.containsMyRank())
-        {
-          istringstream save_vit(save_vit_in);
-          vitesse.restore(save_vit);
-        }
-      else
-        {
-          istringstream save_vit(save_vit_out_1_0);
-          vitesse.restore(save_vit);
-          vitesse._has_field_ownership=false;
-      
-          if (vitesse._field)
-            {
-              delete [] vitesse._field;
-              // cette ligne est super importante sinon c'est tout faux !!!!!!!
-              vitesse._field=0;
-            }
-          // pour tester P1->P0
-          vitesse._type=type;  
-        }
-  
-      if (vitesse._type==1)
-        dec_vit_in_chaude.setMethod("P1");
-  
-  
-
-      dec_vit_in_chaude.attachLocalField((ICoCo::Field*) &vitesse);
-      
-      dec_vit_in_chaude.synchronize();
-  
-  
-      // Envois - receptions
-      if (entree_chaude_group.containsMyRank())
-        {
-          dec_vit_in_chaude.sendData();
-        }
-      else
-        {
-          dec_vit_in_chaude.recvData(); 
-        }
-      if (entree_chaude_group.containsMyRank() )
-        {
-          if (1)
-            {
-              ostringstream save_vit(save_vit_in_2);
-              vitesse.save(save_vit);
-            }
-        }
-      else
-        {
-      
-          double pmin=1e38, pmax=-1e38;
-      
-          for(int i=0;i<vitesse.nb_values()*vitesse._nb_field_components;i++)
-            {
-              double p=*(vitesse._field+i);
-              if (p<pmin) pmin=p;
-              if (p>pmax) pmax=p;
-            }
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected1[type],pmin,1e-12);
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected2[type],pmax,1e-12);
-      
-          ostringstream save_vit(save_vit_outs[type]);
-          vitesse.save(save_vit);
-
-          for(int i=0;i<vitesse.nb_values();i++)
-            {
-              for(int c=0;c<vitesse._nb_field_components;c++)
-                {
-                  double p=vitesse._field[i*vitesse._nb_field_components+c];
-                  CPPUNIT_ASSERT_DOUBLES_EQUAL(valuesExpected3[type][i*vitesse._nb_field_components+c],p,1e-12);
-                }
-            }
-      
-        }
-    }
-}
diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_ICocoTrio.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_ICocoTrio.cxx
deleted file mode 100644
index 386491362..000000000
--- a/src/ParaMEDMEMTest/ParaMEDMEMTest_ICocoTrio.cxx
+++ /dev/null
@@ -1,271 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "ParaMEDMEMTest.hxx"
-#include <string>
-#include "CommInterface.hxx"
-#include "ProcessorGroup.hxx"
-#include "MPIProcessorGroup.hxx"
-#include "DEC.hxx"
-#include "InterpKernelDEC.hxx"
-#include <set>
-#include <time.h>
-#include "ICoCoTrioField.hxx"
-#include <iostream>
-#include <assert.h>
-
-using namespace std;
-using namespace ParaMEDMEM;
-using namespace ICoCo;
-
-typedef enum {sync_and,sync_or} synctype;
-void synchronize_bool(bool& stop, synctype s)
-{
-  int my_stop;
-  int my_stop_temp = stop?1:0;
-  if (s==sync_and)
-    MPI_Allreduce(&my_stop_temp,&my_stop,1,MPI_INTEGER,MPI_MIN,MPI_COMM_WORLD);
-  else if (s==sync_or)
-    MPI_Allreduce(&my_stop_temp,&my_stop,1,MPI_INTEGER,MPI_MAX,MPI_COMM_WORLD);
-  stop =(my_stop==1);
-}
-
-void synchronize_dt(double& dt)
-{
-  double dttemp=dt;
-  MPI_Allreduce(&dttemp,&dt,1,MPI_DOUBLE,MPI_MIN,MPI_COMM_WORLD);
-}
-
-
-void affiche( const TrioField&   field)
-{
-  cout <<field.getName()<<endl;
-  for (int ele=0;ele<field._nb_elems;ele++)
-    cout <<ele <<": "<<field._field[ele]<<endl;;
-  
-}
-
-void remplit_coord(double* coords)
-{
-  coords[0*3+0]=0.;
-  coords[0*3+1]=0.;
-  coords[0*3+2]=0.;
-  
-  coords[1*3+0]=1.;
-  coords[1*3+1]=0.;
-  coords[1*3+2]=0.;
-  
-    
-  coords[2*3+0]=0.;
-  coords[2*3+1]=0.;
-  coords[2*3+2]=1.;
-  
-  coords[3*3+0]=1.;
-  coords[3*3+1]=0.;
-  coords[3*3+2]=1.;
-  
-  for (int i=4;i<8;i++)
-    {
-      for (int d=0;d<3;d++)
-        coords[i*3+d]=coords[(i-4)*3+d];
-      coords[i*3+1]+=1e-5;
-    }
-
-}
-
-void init_quad(TrioField& champ_quad)
-{
-  
-  champ_quad.setName("champ_quad");
-  champ_quad._space_dim=3;
-  champ_quad._mesh_dim=2;
-  champ_quad._nbnodes=8;
-  champ_quad._nodes_per_elem=4;
-  champ_quad._nb_elems=2;
-  champ_quad._itnumber=0;
-  champ_quad._time1=0;
-  champ_quad._time2=1;
-  champ_quad._nb_field_components=1;
-  
-  champ_quad._coords=new double[champ_quad._nbnodes*champ_quad._space_dim];
-  //memcpy(afield._coords,sommets.addr(),champ_quad._nbnodes*champ_quad._space_dim*sizeof(double));
-  
-  remplit_coord(champ_quad._coords);
-  
-  
-  champ_quad._connectivity=new int[champ_quad._nb_elems*champ_quad._nodes_per_elem];
-  champ_quad._connectivity[0*champ_quad._nodes_per_elem+0]=0;
-  champ_quad._connectivity[0*champ_quad._nodes_per_elem+1]=1;
-  champ_quad._connectivity[0*champ_quad._nodes_per_elem+2]=3;
-  champ_quad._connectivity[0*champ_quad._nodes_per_elem+3]=2;
-  champ_quad._connectivity[1*champ_quad._nodes_per_elem+0]=4;
-  champ_quad._connectivity[1*champ_quad._nodes_per_elem+1]=5;
-  champ_quad._connectivity[1*champ_quad._nodes_per_elem+2]=7;
-  champ_quad._connectivity[1*champ_quad._nodes_per_elem+3]=6;
-  
-  
-  champ_quad._has_field_ownership=false;
-  champ_quad._field=0;
-  //champ_quad._field=new double[champ_quad._nb_elems];
-  //  assert(champ_quad._nb_field_components==1);
-}
-void init_triangle(TrioField& champ_triangle)
-{
-   
-  champ_triangle.setName("champ_triangle");
-  champ_triangle._space_dim=3;
-  champ_triangle._mesh_dim=2;
-  champ_triangle._nbnodes=8;
-  champ_triangle._nodes_per_elem=3;
-  champ_triangle._nb_elems=4;
-  champ_triangle._itnumber=0;
-  champ_triangle._time1=0;
-  champ_triangle._time2=1;
-  champ_triangle._nb_field_components=1;
-    
-  champ_triangle._coords=new double[champ_triangle._nbnodes*champ_triangle._space_dim];
-  //memcpy(afield._coords,sommets.addr(),champ_triangle._nbnodes*champ_triangle._space_dim*sizeof(double));
-  remplit_coord(champ_triangle._coords);
-
-  champ_triangle._connectivity=new int[champ_triangle._nb_elems*champ_triangle._nodes_per_elem];
-  champ_triangle._connectivity[0*champ_triangle._nodes_per_elem+0]=0;
-  champ_triangle._connectivity[0*champ_triangle._nodes_per_elem+1]=1;
-  champ_triangle._connectivity[0*champ_triangle._nodes_per_elem+2]=2;
-  champ_triangle._connectivity[1*champ_triangle._nodes_per_elem+0]=1;
-  champ_triangle._connectivity[1*champ_triangle._nodes_per_elem+1]=3;
-  champ_triangle._connectivity[1*champ_triangle._nodes_per_elem+2]=2;
-  
-  champ_triangle._connectivity[2*champ_triangle._nodes_per_elem+0]=4;
-  champ_triangle._connectivity[2*champ_triangle._nodes_per_elem+1]=5;
-  champ_triangle._connectivity[2*champ_triangle._nodes_per_elem+2]=7;
-  champ_triangle._connectivity[3*champ_triangle._nodes_per_elem+0]=4;
-  champ_triangle._connectivity[3*champ_triangle._nodes_per_elem+1]=7;
-  champ_triangle._connectivity[3*champ_triangle._nodes_per_elem+2]=6;
-  
-  champ_triangle._has_field_ownership=false;
-  // champ_triangle._field=new double[champ_triangle._nb_elems];
-  champ_triangle._field=0;
-}
-
-void ParaMEDMEMTest::testICocoTrio1()
-{
-  int size;
-  int rank;
-  MPI_Comm_size(MPI_COMM_WORLD,&size);
-  MPI_Comm_rank(MPI_COMM_WORLD,&rank);
-
-  //the test is meant to run on five processors
-  if (size !=2) return ;
-  
-  CommInterface comm;
-  set<int> emetteur_ids;
-  set<int> recepteur_ids;
-  emetteur_ids.insert(0);
-  recepteur_ids.insert(1);
-
-  MPIProcessorGroup recepteur_group(comm,recepteur_ids);
-  MPIProcessorGroup emetteur_group(comm,emetteur_ids);
-
-
-  string cas;
-  if (recepteur_group.containsMyRank())
-    {
-      cas="recepteur";
-      
-    }
-  else
-    cas="emetteur";
-
-  InterpKernelDEC dec_emetteur(emetteur_group, recepteur_group);
-
-  TrioField champ_emetteur, champ_recepteur;
-   
-  init_triangle(champ_emetteur);
-  //init_triangle(champ_emetteur);
-  init_quad(champ_recepteur);
-  //init_emetteur(champ_recepteur);
-  
-  if (cas=="emetteur") 
-    {
-      champ_emetteur._field=new double[champ_emetteur._nb_elems];
-      for (int ele=0;ele<champ_emetteur._nb_elems;ele++)
-        champ_emetteur._field[ele]=1;
-      
-      champ_emetteur._has_field_ownership=true;
-    }
-  
-  
-  MPI_Barrier(MPI_COMM_WORLD);
-
-  clock_t clock0= clock ();
-  int compti=0;
-
-  bool init=true; // first time step ??
-  bool stop=false;
-  //boucle sur les pas de quads
-  while (!stop) {
-  
-    compti++;
-    clock_t clocki= clock ();
-    cout << compti << " CLOCK " << (clocki-clock0)*1.e-6 << endl; 
-    for (int non_unif=0;non_unif<2;non_unif++)
-      {
-        // if (champ_recepteur._field)
-        //   delete [] champ_recepteur._field;
-        champ_recepteur._field=0;
-        // champ_recepteur._has_field_ownership=false;
-  
-
-  
-        if (cas=="emetteur") 
-          if (non_unif)
-            champ_emetteur._field[0]=40;
-        bool ok=false; // Is the time interval successfully solved ?
-    
-        // Loop on the time interval tries
-        if(1)
-          {
-            if (cas=="emetteur")
-              dec_emetteur.attachLocalField((ICoCo::Field*) &champ_emetteur);
-            else
-              dec_emetteur.attachLocalField((ICoCo::Field*) &champ_recepteur);
-            
-            dec_emetteur.setNature(ConservativeVolumic);
-            
-            if(init)
-              dec_emetteur.synchronize();
-            init=false;
-            
-            if (cas=="emetteur")
-              {
-                dec_emetteur.sendData();
-                affiche(champ_emetteur);
-              }
-            else if (cas=="recepteur")
-              {
-                dec_emetteur.recvData();
-                affiche(champ_recepteur);
-              }
-            else
-              throw 0;
-          }
-        stop=true;
-      }
-  }
-}
diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_InterpKernelDEC.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_InterpKernelDEC.cxx
deleted file mode 100644
index c41981608..000000000
--- a/src/ParaMEDMEMTest/ParaMEDMEMTest_InterpKernelDEC.cxx
+++ /dev/null
@@ -1,1752 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "ParaMEDMEMTest.hxx"
-#include <cppunit/TestAssert.h>
-
-#include "CommInterface.hxx"
-#include "ProcessorGroup.hxx"
-#include "MPIProcessorGroup.hxx"
-#include "Topology.hxx"
-#include "DEC.hxx"
-#include "MxN_Mapping.hxx"
-#include "InterpKernelDEC.hxx"
-#include "ParaMESH.hxx"
-#include "ParaFIELD.hxx"
-#include "ComponentTopology.hxx"
-#include "ICoCoMEDField.hxx"
-#include "ParaMEDLoader.hxx"
-#include "MEDLoader.hxx"
-
- 
-#include <string>
-#include <iterator>
-
-// use this define to enable lines, execution of which leads to Segmentation Fault
-#define ENABLE_FAULTS
-
-// use this define to enable CPPUNIT asserts and fails, showing bugs
-#define ENABLE_FORCED_FAILURES
-
-
-using namespace std;
-using namespace ParaMEDMEM;
- 
-void ParaMEDMEMTest::testInterpKernelDEC_2D()
-{
-  testInterpKernelDEC_2D_("P0","P0");
-}
-
-void ParaMEDMEMTest::testInterpKernelDEC2_2D()
-{
-  testInterpKernelDEC2_2D_("P0","P0");
-}
-
-void ParaMEDMEMTest::testInterpKernelDEC_3D()
-{
-  testInterpKernelDEC_3D_("P0","P0");
-}
-
-void ParaMEDMEMTest::testInterpKernelDEC_2DP0P1()
-{
-  //testInterpKernelDEC_2D_("P0","P1");
-}
-
-/*
- * Check methods defined in InterpKernelDEC.hxx
- *
- InterpKernelDEC();
- InterpKernelDEC(ProcessorGroup& local_group, ProcessorGroup& distant_group);
- virtual ~InterpKernelDEC();
- void synchronize();
- void recvData();
- void sendData();
-*/
- 
-void ParaMEDMEMTest::testInterpKernelDEC_2D_(const char *srcMeth, const char *targetMeth)
-{
-  std::string srcM(srcMeth);
-  std::string targetM(targetMeth);
-  int size;
-  int rank;
-  MPI_Comm_size(MPI_COMM_WORLD,&size);
-  MPI_Comm_rank(MPI_COMM_WORLD,&rank);
-
-  //the test is meant to run on five processors
-  if (size !=5) return ;
-   
-  int nproc_source = 3;
-  set<int> self_procs;
-  set<int> procs_source;
-  set<int> procs_target;
-  
-  for (int i=0; i<nproc_source; i++)
-    procs_source.insert(i);
-  for (int i=nproc_source; i<size; i++)
-    procs_target.insert(i);
-  self_procs.insert(rank);
-  
-  ParaMEDMEM::CommInterface interface;
-    
-  ParaMEDMEM::ProcessorGroup* self_group = new ParaMEDMEM::MPIProcessorGroup(interface,self_procs);
-  ParaMEDMEM::ProcessorGroup* target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target);
-  ParaMEDMEM::ProcessorGroup* source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source);
-  
-  //loading the geometry for the source group
-
-  ParaMEDMEM::InterpKernelDEC dec (*source_group,*target_group);
-
-  ParaMEDMEM::MEDCouplingUMesh* mesh;
-  ParaMEDMEM::ParaMESH* paramesh;
-  ParaMEDMEM::ParaFIELD* parafield;
-  ICoCo::Field* icocofield ;
-  
-  string filename_xml1              = getResourceFile("square1_split");
-  string filename_xml2              = getResourceFile("square2_split");
-  //string filename_seq_wr            = makeTmpFile("");
-  //string filename_seq_med           = makeTmpFile("myWrField_seq_pointe221.med");
-  
-  // To remove tmp files from disk
-  ParaMEDMEMTest_TmpFilesRemover aRemover;
-  
-  MPI_Barrier(MPI_COMM_WORLD);
-  if (source_group->containsMyRank())
-    {
-      string master = filename_xml1;
-      
-      ostringstream strstream;
-      strstream <<master<<rank+1<<".med";
-      ostringstream meshname ;
-      meshname<< "Mesh_2_"<< rank+1;
-      
-      mesh=MEDLoader::ReadUMeshFromFile(strstream.str().c_str(),meshname.str().c_str(),0);
-      
-    
-      paramesh=new ParaMESH (mesh,*source_group,"source mesh");
-    
-      //      ParaMEDMEM::ParaSUPPORT* parasupport=new UnstructuredParaSUPPORT( support,*source_group);
-      ParaMEDMEM::ComponentTopology comptopo;
-      if(srcM=="P0")
-        {
-          parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);
-          parafield->getField()->setNature(ConservativeVolumic);
-        }
-      else
-        parafield = new ParaFIELD(ON_NODES,NO_TIME,paramesh, comptopo);
-      int nb_local;
-      if(srcM=="P0")
-        nb_local=mesh->getNumberOfCells();
-      else
-        nb_local=mesh->getNumberOfNodes();
-      //      double * value= new double[nb_local];
-      double *value=parafield->getField()->getArray()->getPointer();
-      for(int ielem=0; ielem<nb_local;ielem++)
-        value[ielem]=1.0;
-    
-      //      ICoCo::Field* icocofield=new ICoCo::MEDField(paramesh,parafield);
-      icocofield=new ICoCo::MEDField((MEDCouplingUMesh *)paramesh->getCellMesh(),parafield->getField());
-      dec.setMethod(srcMeth);
-      dec.attachLocalField(icocofield);
-    }
-  
-  //loading the geometry for the target group
-  if (target_group->containsMyRank())
-    {
-      string master= filename_xml2;
-      ostringstream strstream;
-      strstream << master<<(rank-nproc_source+1)<<".med";
-      ostringstream meshname ;
-      meshname<< "Mesh_3_"<<rank-nproc_source+1;
-      mesh = MEDLoader::ReadUMeshFromFile(strstream.str().c_str(),meshname.str().c_str(),0);
-      
-      paramesh=new ParaMESH (mesh,*target_group,"target mesh");
-      //      ParaMEDMEM::ParaSUPPORT* parasupport=new UnstructuredParaSUPPORT(support,*target_group);
-      ParaMEDMEM::ComponentTopology comptopo;
-      if(targetM=="P0")
-        {
-          parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);
-          parafield->getField()->setNature(ConservativeVolumic);
-        }
-      else
-        parafield = new ParaFIELD(ON_NODES,NO_TIME,paramesh, comptopo);
-      int nb_local;
-      if(targetM=="P0")
-        nb_local=mesh->getNumberOfCells();
-      else
-        nb_local=mesh->getNumberOfNodes();
-      //      double * value= new double[nb_local];
-      double *value=parafield->getField()->getArray()->getPointer();
-      for(int ielem=0; ielem<nb_local;ielem++)
-        value[ielem]=0.0;
-      //      ICoCo::Field* icocofield=new ICoCo::MEDField(paramesh,parafield);
-      icocofield=new ICoCo::MEDField((MEDCouplingUMesh *)paramesh->getCellMesh(),parafield->getField());
-      dec.setMethod(targetMeth);
-      dec.attachLocalField(icocofield);
-    }
-    
-  
-  //attaching a DEC to the source group 
-  double field_before_int;
-  double field_after_int;
-  
-  if (source_group->containsMyRank())
-    { 
-      field_before_int = parafield->getVolumeIntegral(0,true);
-      dec.synchronize();
-      cout<<"DEC usage"<<endl;
-      dec.setForcedRenormalization(false);
-
-      dec.sendData();
-      ParaMEDLoader::WriteParaMesh("./sourcesquareb",paramesh);
-      if (source_group->myRank()==0)
-        aRemover.Register("./sourcesquareb");
-      ostringstream filename;
-      filename<<"./sourcesquareb_"<<source_group->myRank()+1;
-      aRemover.Register(filename.str().c_str());
-      //MEDLoader::WriteField("./sourcesquareb",parafield->getField());
-   
-      dec.recvData();
-      cout <<"writing"<<endl;
-      ParaMEDLoader::WriteParaMesh("./sourcesquare",paramesh);
-      if (source_group->myRank()==0)
-        aRemover.Register("./sourcesquare");
-      //MEDLoader::WriteField("./sourcesquare",parafield->getField());
-      
-     
-      filename<<"./sourcesquare_"<<source_group->myRank()+1;
-      aRemover.Register(filename.str().c_str());
-      field_after_int = parafield->getVolumeIntegral(0,true);
-      
-      
-      //      MPI_Bcast(&field_before_int,1,MPI_DOUBLE,0,MPI_COMM_WORLD);
-      //       MPI_Bcast(&field_after_int,1,MPI_DOUBLE,0,MPI_COMM_WORLD);
-
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(field_before_int, field_after_int, 1e-6);
-    
-    }
-  
-  //attaching a DEC to the target group
-  if (target_group->containsMyRank())
-    {
-      dec.synchronize();
-      dec.setForcedRenormalization(false);
-
-      dec.recvData();
-      ParaMEDLoader::WriteParaMesh("./targetsquareb",paramesh);
-      //MEDLoader::WriteField("./targetsquareb",parafield->getField());
-      if (target_group->myRank()==0)
-        aRemover.Register("./targetsquareb");
-      ostringstream filename;
-      filename<<"./targetsquareb_"<<target_group->myRank()+1;
-      aRemover.Register(filename.str().c_str());
-      dec.sendData();
-      ParaMEDLoader::WriteParaMesh("./targetsquare",paramesh);
-      //MEDLoader::WriteField("./targetsquare",parafield->getField());
-      
-      if (target_group->myRank()==0)
-        aRemover.Register("./targetsquareb");
-      
-      filename<<"./targetsquareb_"<<target_group->myRank()+1;
-      aRemover.Register(filename.str().c_str());
-      //    double field_before_int, field_after_int;
-      //       MPI_Bcast(&field_before_int,1,MPI_DOUBLE,0,MPI_COMM_WORLD);
-      //       MPI_Bcast(&field_after_int,1,MPI_DOUBLE,0,MPI_COMM_WORLD);
-      
-      //      CPPUNIT_ASSERT_DOUBLES_EQUAL(field_before_int, field_after_int, 1e-6);
-    
-    }
-  
-  delete source_group;
-  delete target_group;
-  delete self_group;
-  delete parafield;
-  delete paramesh;
-  mesh->decrRef();
-
-  delete icocofield;
-
-  MPI_Barrier(MPI_COMM_WORLD);
-  cout << "end of InterpKernelDEC_2D test"<<endl;
-}
-
-void ParaMEDMEMTest::testInterpKernelDEC2_2D_(const char *srcMeth, const char *targetMeth)
-{
-  std::string srcM(srcMeth);
-  std::string targetM(targetMeth);
-  int size;
-  int rank;
-  MPI_Comm_size(MPI_COMM_WORLD,&size);
-  MPI_Comm_rank(MPI_COMM_WORLD,&rank);
-
-  //the test is meant to run on five processors
-  if (size !=5) return ;
-   
-  int nproc_source = 3;
-  set<int> self_procs;
-  set<int> procs_source;
-  set<int> procs_target;
-  
-  for (int i=0; i<nproc_source; i++)
-    procs_source.insert(i);
-  for (int i=nproc_source; i<size; i++)
-    procs_target.insert(i);
-  self_procs.insert(rank);
-  
-  ParaMEDMEM::CommInterface interface;
-    
-  ParaMEDMEM::ProcessorGroup* self_group = new ParaMEDMEM::MPIProcessorGroup(interface,self_procs);
-  ParaMEDMEM::ProcessorGroup* target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target);
-  ParaMEDMEM::ProcessorGroup* source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source);
-  
-  //loading the geometry for the source group
-
-  ParaMEDMEM::InterpKernelDEC dec (*source_group,*target_group);
-
-  ParaMEDMEM::MEDCouplingUMesh* mesh;
-  ParaMEDMEM::MEDCouplingFieldDouble* mcfield;
-  
-  string filename_xml1              = getResourceFile("square1_split");
-  string filename_xml2              = getResourceFile("square2_split");
-  
-  // To remove tmp files from disk
-  ParaMEDMEMTest_TmpFilesRemover aRemover;
-  
-  MPI_Barrier(MPI_COMM_WORLD);
-  if (source_group->containsMyRank())
-    {
-      string master = filename_xml1;
-      
-      ostringstream strstream;
-      strstream <<master<<rank+1<<".med";
-      ostringstream meshname ;
-      meshname<< "Mesh_2_"<< rank+1;
-      
-      mesh=MEDLoader::ReadUMeshFromFile(strstream.str().c_str(),meshname.str().c_str(),0);
-      ParaMEDMEM::ComponentTopology comptopo;
-      if(srcM=="P0")
-        {
-          mcfield = MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
-          mcfield->setMesh(mesh);
-          DataArrayDouble *array=DataArrayDouble::New();
-          array->alloc(mcfield->getNumberOfTuples(),1);
-          mcfield->setArray(array);
-          array->decrRef();
-          mcfield->setNature(ConservativeVolumic);
-        }
-      else
-        {
-          mcfield = MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
-          mcfield->setMesh(mesh);
-          DataArrayDouble *array=DataArrayDouble::New();
-          array->alloc(mcfield->getNumberOfTuples(),1);
-          mcfield->setArray(array);
-          array->decrRef();
-        }
-      int nb_local;
-      if(srcM=="P0")
-        nb_local=mesh->getNumberOfCells();
-      else
-        nb_local=mesh->getNumberOfNodes();
-      double *value=mcfield->getArray()->getPointer();
-      for(int ielem=0; ielem<nb_local;ielem++)
-        value[ielem]=1.0;
-      dec.setMethod(srcMeth);
-      dec.attachLocalField(mcfield);
-      dec.attachLocalField(mcfield);
-    }
-  
-  //loading the geometry for the target group
-  if (target_group->containsMyRank())
-    {
-      string master= filename_xml2;
-      ostringstream strstream;
-      strstream << master<<(rank-nproc_source+1)<<".med";
-      ostringstream meshname ;
-      meshname<< "Mesh_3_"<<rank-nproc_source+1;
-      mesh = MEDLoader::ReadUMeshFromFile(strstream.str().c_str(),meshname.str().c_str(),0);
-      ParaMEDMEM::ComponentTopology comptopo;
-      if(targetM=="P0")
-        {
-          mcfield = MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
-          mcfield->setMesh(mesh);
-          DataArrayDouble *array=DataArrayDouble::New();
-          array->alloc(mcfield->getNumberOfTuples(),1);
-          mcfield->setArray(array);
-          array->decrRef();
-          mcfield->setNature(ConservativeVolumic);
-        }
-      else
-        {
-          mcfield = MEDCouplingFieldDouble::New(ON_NODES,NO_TIME);
-          mcfield->setMesh(mesh);
-          DataArrayDouble *array=DataArrayDouble::New();
-          array->alloc(mcfield->getNumberOfTuples(),1);
-          mcfield->setArray(array);
-          array->decrRef();
-        }
-      int nb_local;
-      if(targetM=="P0")
-        nb_local=mesh->getNumberOfCells();
-      else
-        nb_local=mesh->getNumberOfNodes();
-      double *value=mcfield->getArray()->getPointer();
-      for(int ielem=0; ielem<nb_local;ielem++)
-        value[ielem]=0.0;
-      dec.setMethod(targetMeth);
-      dec.attachLocalField(mcfield);
-      dec.attachLocalField(mcfield);
-    }
-    
-  
-  //attaching a DEC to the source group 
-
-  if (source_group->containsMyRank())
-    { 
-      dec.synchronize();
-      dec.setForcedRenormalization(false);
-      dec.sendData();
-      dec.recvData();
-    }
-  
-  //attaching a DEC to the target group
-  if (target_group->containsMyRank())
-    {
-      dec.synchronize();
-      dec.setForcedRenormalization(false);
-      dec.recvData();
-      dec.sendData();
-    }
-  delete source_group;
-  delete target_group;
-  delete self_group;
-  mcfield->decrRef();
-  mesh->decrRef();
-
-  MPI_Barrier(MPI_COMM_WORLD);
-  cout << "end of InterpKernelDEC2_2D test"<<endl;
-}
-
-void ParaMEDMEMTest::testInterpKernelDEC_3D_(const char *srcMeth, const char *targetMeth)
-{
-  std::string srcM(srcMeth);
-  std::string targetM(targetMeth);
-  int size;
-  int rank;
-  MPI_Comm_size(MPI_COMM_WORLD,&size);
-  MPI_Comm_rank(MPI_COMM_WORLD,&rank);
-
-  //the test is meant to run on five processors
-  if (size !=3) return ;
-   
-  int nproc_source = 2;
-  set<int> self_procs;
-  set<int> procs_source;
-  set<int> procs_target;
-  
-  for (int i=0; i<nproc_source; i++)
-    procs_source.insert(i);
-  for (int i=nproc_source; i<size; i++)
-    procs_target.insert(i);
-  self_procs.insert(rank);
-  
-  ParaMEDMEM::CommInterface interface;
-    
-  ParaMEDMEM::ProcessorGroup* self_group = new ParaMEDMEM::MPIProcessorGroup(interface,self_procs);
-  ParaMEDMEM::ProcessorGroup* target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target);
-  ParaMEDMEM::ProcessorGroup* source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source);
-  
-  //loading the geometry for the source group
-
-  ParaMEDMEM::InterpKernelDEC dec (*source_group,*target_group);
-
-  ParaMEDMEM::MEDCouplingUMesh* mesh;
-  ParaMEDMEM::ParaMESH* paramesh;
-  ParaMEDMEM::ParaFIELD* parafield;
-  ICoCo::Field* icocofield ;
-  
-  string tmp_dir                    = getenv("TMP");
-  if (tmp_dir == "")
-    tmp_dir = "/tmp";
-  string filename_xml1              = getResourceFile("Mesh3D_10_2d");
-  string filename_xml2              = getResourceFile("Mesh3D_11");
-  //string filename_seq_wr            = makeTmpFile("");
-  //string filename_seq_med           = makeTmpFile("myWrField_seq_pointe221.med");
-  
-  // To remove tmp files from disk
-  ParaMEDMEMTest_TmpFilesRemover aRemover;
-  
-  MPI_Barrier(MPI_COMM_WORLD);
-  if (source_group->containsMyRank())
-    {
-      string master = filename_xml1;
-      
-      ostringstream strstream;
-      strstream <<master<<rank+1<<".med";
-      ostringstream meshname ;
-      meshname<< "Mesh_3_"<< rank+1;
-      
-      mesh=MEDLoader::ReadUMeshFromFile(strstream.str().c_str(),meshname.str().c_str(),0);
-      
-    
-      paramesh=new ParaMESH (mesh,*source_group,"source mesh");
-    
-      //      ParaMEDMEM::ParaSUPPORT* parasupport=new UnstructuredParaSUPPORT( support,*source_group);
-      ParaMEDMEM::ComponentTopology comptopo;
-      if(srcM=="P0")
-        {
-          parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);
-          parafield->getField()->setNature(ConservativeVolumic);
-        }
-      else
-        parafield = new ParaFIELD(ON_NODES,NO_TIME,paramesh, comptopo);
-      int nb_local;
-      if(srcM=="P0")
-        nb_local=mesh->getNumberOfCells();
-      else
-        nb_local=mesh->getNumberOfNodes();
-      //      double * value= new double[nb_local];
-      double *value=parafield->getField()->getArray()->getPointer();
-      for(int ielem=0; ielem<nb_local;ielem++)
-        value[ielem]=1.0;
-    
-      //      ICoCo::Field* icocofield=new ICoCo::MEDField(paramesh,parafield);
-      icocofield=new ICoCo::MEDField((MEDCouplingUMesh *)paramesh->getCellMesh(),parafield->getField());
-      dec.setMethod(srcMeth);
-      dec.attachLocalField(icocofield);
-    }
-  
-  //loading the geometry for the target group
-  if (target_group->containsMyRank())
-    {
-      string master= filename_xml2;
-      ostringstream strstream;
-      strstream << master << ".med";
-      ostringstream meshname ;
-      meshname<< "Mesh_6";
-      mesh = MEDLoader::ReadUMeshFromFile(strstream.str().c_str(),meshname.str().c_str(),0);
-      
-      paramesh=new ParaMESH (mesh,*target_group,"target mesh");
-      //      ParaMEDMEM::ParaSUPPORT* parasupport=new UnstructuredParaSUPPORT(support,*target_group);
-      ParaMEDMEM::ComponentTopology comptopo;
-      if(targetM=="P0")
-        {
-          parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);
-          parafield->getField()->setNature(ConservativeVolumic);
-        }
-      else
-        parafield = new ParaFIELD(ON_NODES,NO_TIME,paramesh, comptopo);
-      int nb_local;
-      if(targetM=="P0")
-        nb_local=mesh->getNumberOfCells();
-      else
-        nb_local=mesh->getNumberOfNodes();
-      //      double * value= new double[nb_local];
-      double *value=parafield->getField()->getArray()->getPointer();
-      for(int ielem=0; ielem<nb_local;ielem++)
-        value[ielem]=0.0;
-      //      ICoCo::Field* icocofield=new ICoCo::MEDField(paramesh,parafield);
-      icocofield=new ICoCo::MEDField((MEDCouplingUMesh *)paramesh->getCellMesh(),parafield->getField());
-      dec.setMethod(targetMeth);
-      dec.attachLocalField(icocofield);
-    }  
-  //attaching a DEC to the source group 
-  double field_before_int;
-  double field_after_int;
-  
-  if (source_group->containsMyRank())
-    { 
-      field_before_int = parafield->getVolumeIntegral(0,true);
-      dec.synchronize();
-      cout<<"DEC usage"<<endl;
-      dec.setForcedRenormalization(false);
-
-      dec.sendData();
-      ParaMEDLoader::WriteParaMesh("./sourcesquareb",paramesh);
-      if (source_group->myRank()==0)
-        aRemover.Register("./sourcesquareb");
-      ostringstream filename;
-      filename<<"./sourcesquareb_"<<source_group->myRank()+1;
-      aRemover.Register(filename.str().c_str());
-      //MEDLoader::WriteField("./sourcesquareb",parafield->getField());
-   
-      dec.recvData();
-      cout <<"writing"<<endl;
-      ParaMEDLoader::WriteParaMesh("./sourcesquare",paramesh);
-      if (source_group->myRank()==0)
-        aRemover.Register("./sourcesquare");
-      //MEDLoader::WriteField("./sourcesquare",parafield->getField());
-      
-     
-      filename<<"./sourcesquare_"<<source_group->myRank()+1;
-      aRemover.Register(filename.str().c_str());
-      field_after_int = parafield->getVolumeIntegral(0,true);
-
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(field_before_int, field_after_int, 1e-6);
-    
-    }
-  
-  //attaching a DEC to the target group
-  if (target_group->containsMyRank())
-    {
-      dec.synchronize();
-      dec.setForcedRenormalization(false);
-
-      dec.recvData();
-      ParaMEDLoader::WriteParaMesh("./targetsquareb",paramesh);
-      //MEDLoader::WriteField("./targetsquareb",parafield->getField());
-      if (target_group->myRank()==0)
-        aRemover.Register("./targetsquareb");
-      ostringstream filename;
-      filename<<"./targetsquareb_"<<target_group->myRank()+1;
-      aRemover.Register(filename.str().c_str());
-      dec.sendData();
-      ParaMEDLoader::WriteParaMesh("./targetsquare",paramesh);
-      //MEDLoader::WriteField("./targetsquare",parafield->getField());
-      
-      if (target_group->myRank()==0)
-        aRemover.Register("./targetsquareb");
-      
-      filename<<"./targetsquareb_"<<target_group->myRank()+1;
-      aRemover.Register(filename.str().c_str());
-    }
-  delete source_group;
-  delete target_group;
-  delete self_group;
-  delete parafield;
-  delete paramesh;
-  mesh->decrRef();
-
-  delete icocofield;
-
-  MPI_Barrier(MPI_COMM_WORLD);
-  cout << "end of InterpKernelDEC_3D test"<<endl;
-}
-
-//Synchronous tests without interpolation with native mode (AllToAll(v) from lam/MPI:
-void ParaMEDMEMTest::testSynchronousEqualInterpKernelWithoutInterpNativeDEC_2D()
-{
-  testAsynchronousInterpKernelDEC_2D(0.1,1,0.1,1,false,false,false,"P0","P0");
-}
-
-//Synchronous tests without interpolation :
-void ParaMEDMEMTest::testSynchronousEqualInterpKernelWithoutInterpDEC_2D()
-{
-  testAsynchronousInterpKernelDEC_2D(0.1,1,0.1,1,true,false,false,"P0","P0");
-}
-
-//Synchronous tests with interpolation :
-void ParaMEDMEMTest::testSynchronousEqualInterpKernelDEC_2D()
-{
-  testAsynchronousInterpKernelDEC_2D(0.1,1,0.1,1,true,false,true,"P0","P0");
-}
-void ParaMEDMEMTest::testSynchronousFasterSourceInterpKernelDEC_2D()
-{
-  testAsynchronousInterpKernelDEC_2D(0.09,1,0.1,1,true,false,true,"P0","P0");
-}
-void ParaMEDMEMTest::testSynchronousSlowerSourceInterpKernelDEC_2D()
-{
-  testAsynchronousInterpKernelDEC_2D(0.11,1,0.1,1,true,false,true,"P0","P0");
-}
-void ParaMEDMEMTest::testSynchronousSlowSourceInterpKernelDEC_2D()
-{
-  testAsynchronousInterpKernelDEC_2D(0.11,1,0.01,1,true,false,true,"P0","P0");
-}
-void ParaMEDMEMTest::testSynchronousFastSourceInterpKernelDEC_2D()
-{
-  testAsynchronousInterpKernelDEC_2D(0.01,1,0.11,1,true,false,true,"P0","P0");
-}
-
-//Asynchronous tests with interpolation :
-void ParaMEDMEMTest::testAsynchronousEqualInterpKernelDEC_2D()
-{
-  testAsynchronousInterpKernelDEC_2D(0.1,1,0.1,1,true,true,true,"P0","P0");
-}
-void ParaMEDMEMTest::testAsynchronousFasterSourceInterpKernelDEC_2D()
-{
-  testAsynchronousInterpKernelDEC_2D(0.09,1,0.1,1,true,true,true,"P0","P0");
-}
-void ParaMEDMEMTest::testAsynchronousSlowerSourceInterpKernelDEC_2D()
-{
-  testAsynchronousInterpKernelDEC_2D(0.11,1,0.1,1,true,true,true,"P0","P0");
-}
-void ParaMEDMEMTest::testAsynchronousSlowSourceInterpKernelDEC_2D()
-{
-  testAsynchronousInterpKernelDEC_2D(0.11,1,0.01,1,true,true,true,"P0","P0");
-}
-void ParaMEDMEMTest::testAsynchronousFastSourceInterpKernelDEC_2D()
-{
-  testAsynchronousInterpKernelDEC_2D(0.01,1,0.11,1,true,true,true,"P0","P0");
-}
-
-void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0()
-{
-  //
-  const double sourceCoordsAll[2][8]={{0.4,0.5,0.4,1.5,1.6,1.5,1.6,0.5},
-                                      {0.3,-0.5,1.6,-0.5,1.6,-1.5,0.3,-1.5}};
-  const double targetCoordsAll[3][16]={{0.7,1.45,0.7,1.65,0.9,1.65,0.9,1.45,  1.1,1.4,1.1,1.6,1.3,1.6,1.3,1.4},
-                                       {0.7,-0.6,0.7,0.7,0.9,0.7,0.9,-0.6,  1.1,-0.7,1.1,0.6,1.3,0.6,1.3,-0.7},
-                                       {0.7,-1.55,0.7,-1.35,0.9,-1.35,0.9,-1.55,  1.1,-1.65,1.1,-1.45,1.3,-1.45,1.3,-1.65}};
-  int conn4All[8]={0,1,2,3,4,5,6,7};
-  double targetResults[3][2]={{34.,34.},{38.333333333333336,42.666666666666664},{47.,47.}};
-  double targetResults2[3][2]={{0.28333333333333344,0.56666666666666687},{1.8564102564102569,2.0128205128205132},{1.0846153846153845,0.36153846153846159}};
-  double targetResults3[3][2]={{3.7777777777777781,7.5555555555555562},{24.511111111111113,26.355555555555558},{14.1,4.7}};
-  double targetResults4[3][2]={{8.5,17},{8.8461538461538431, 9.8461538461538449},{35.25,11.75}};
-  //
-  int size;
-  int rank;
-  MPI_Comm_size(MPI_COMM_WORLD,&size);
-  MPI_Comm_rank(MPI_COMM_WORLD,&rank);
-  //
-  if(size!=5)
-    return ;
-  int nproc_source = 2;
-  set<int> self_procs;
-  set<int> procs_source;
-  set<int> procs_target;
-  
-  for (int i=0; i<nproc_source; i++)
-    procs_source.insert(i);
-  for (int i=nproc_source; i<size; i++)
-    procs_target.insert(i);
-  self_procs.insert(rank);
-  //
-  ParaMEDMEM::MEDCouplingUMesh *mesh=0;
-  ParaMEDMEM::ParaMESH *paramesh=0;
-  ParaMEDMEM::ParaFIELD* parafield=0;
-  //
-  ParaMEDMEM::CommInterface interface;
-  //
-  ProcessorGroup* self_group = new ParaMEDMEM::MPIProcessorGroup(interface,self_procs);
-  ProcessorGroup* target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target);
-  ProcessorGroup* source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source);
-  //
-  MPI_Barrier(MPI_COMM_WORLD);
-  if(source_group->containsMyRank())
-    {
-      std::ostringstream stream; stream << "sourcemesh2D proc " << rank;
-      mesh=MEDCouplingUMesh::New(stream.str().c_str(),2);
-      mesh->allocateCells(2);
-      mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn4All);
-      mesh->finishInsertingCells();
-      DataArrayDouble *myCoords=DataArrayDouble::New();
-      myCoords->alloc(4,2);
-      const double *sourceCoords=sourceCoordsAll[rank];
-      std::copy(sourceCoords,sourceCoords+8,myCoords->getPointer());
-      mesh->setCoords(myCoords);
-      myCoords->decrRef();
-      paramesh=new ParaMESH(mesh,*source_group,"source mesh");
-      ParaMEDMEM::ComponentTopology comptopo;
-      parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);
-      double *value=parafield->getField()->getArray()->getPointer();
-      value[0]=34+13*((double)rank);
-    }
-  else
-    {
-      std::ostringstream stream; stream << "targetmesh2D proc " << rank-nproc_source;
-      mesh=MEDCouplingUMesh::New(stream.str().c_str(),2);
-      mesh->allocateCells(2);
-      mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn4All);
-      mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn4All+4);
-      mesh->finishInsertingCells();
-      DataArrayDouble *myCoords=DataArrayDouble::New();
-      myCoords->alloc(8,2);
-      const double *targetCoords=targetCoordsAll[rank-nproc_source];
-      std::copy(targetCoords,targetCoords+16,myCoords->getPointer());
-      mesh->setCoords(myCoords);
-      myCoords->decrRef();
-      paramesh=new ParaMESH (mesh,*target_group,"target mesh");
-      ParaMEDMEM::ComponentTopology comptopo;
-      parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);
-    }
-  //test 1 - Conservative volumic
-  ParaMEDMEM::InterpKernelDEC dec(*source_group,*target_group);
-  parafield->getField()->setNature(ConservativeVolumic);
-  if (source_group->containsMyRank())
-    { 
-      dec.setMethod("P0");
-      dec.attachLocalField(parafield);
-      dec.synchronize();
-      dec.setForcedRenormalization(false);
-      dec.sendData();
-    }
-  else
-    {
-      dec.setMethod("P0");
-      dec.attachLocalField(parafield);
-      dec.synchronize();
-      dec.setForcedRenormalization(false);
-      dec.recvData();
-      const double *res=parafield->getField()->getArray()->getConstPointer();
-      const double *expected=targetResults[rank-nproc_source];
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[0],res[0],1e-13);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[1],res[1],1e-13);
-    }
-  //test 2 - Integral
-  ParaMEDMEM::InterpKernelDEC dec2(*source_group,*target_group);
-  parafield->getField()->setNature(Integral);
-  if (source_group->containsMyRank())
-    { 
-      dec2.setMethod("P0");
-      dec2.attachLocalField(parafield);
-      dec2.synchronize();
-      dec2.setForcedRenormalization(false);
-      dec2.sendData();
-    }
-  else
-    {
-      dec2.setMethod("P0");
-      dec2.attachLocalField(parafield);
-      dec2.synchronize();
-      dec2.setForcedRenormalization(false);
-      dec2.recvData();
-      const double *res=parafield->getField()->getArray()->getConstPointer();
-      const double *expected=targetResults2[rank-nproc_source];
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[0],res[0],1e-13);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[1],res[1],1e-13);
-    }
-  //test 3 - Integral with global constraint
-  ParaMEDMEM::InterpKernelDEC dec3(*source_group,*target_group);
-  parafield->getField()->setNature(IntegralGlobConstraint);
-  if (source_group->containsMyRank())
-    { 
-      dec3.setMethod("P0");
-      dec3.attachLocalField(parafield);
-      dec3.synchronize();
-      dec3.setForcedRenormalization(false);
-      dec3.sendData();
-    }
-  else
-    {
-      dec3.setMethod("P0");
-      dec3.attachLocalField(parafield);
-      dec3.synchronize();
-      dec3.setForcedRenormalization(false);
-      dec3.recvData();
-      const double *res=parafield->getField()->getArray()->getConstPointer();
-      const double *expected=targetResults3[rank-nproc_source];
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[0],res[0],1e-13);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[1],res[1],1e-13);
-    }
-  //test 4 - RevIntegral
-  ParaMEDMEM::InterpKernelDEC dec4(*source_group,*target_group);
-  parafield->getField()->setNature(RevIntegral);
-  if (source_group->containsMyRank())
-    { 
-      dec4.setMethod("P0");
-      dec4.attachLocalField(parafield);
-      dec4.synchronize();
-      dec4.setForcedRenormalization(false);
-      dec4.sendData();
-    }
-  else
-    {
-      dec4.setMethod("P0");
-      dec4.attachLocalField(parafield);
-      dec4.synchronize();
-      dec4.setForcedRenormalization(false);
-      dec4.recvData();
-      const double *res=parafield->getField()->getArray()->getConstPointer();
-      const double *expected=targetResults4[rank-nproc_source];
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[0],res[0],1e-13);
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[1],res[1],1e-13);
-    }
-  //test 5 - Conservative volumic reversed
-  ParaMEDMEM::InterpKernelDEC dec5(*source_group,*target_group);
-  parafield->getField()->setNature(ConservativeVolumic);
-  if (source_group->containsMyRank())
-    { 
-      dec5.setMethod("P0");
-      dec5.attachLocalField(parafield);
-      dec5.synchronize();
-      dec5.setForcedRenormalization(false);
-      dec5.recvData();
-      const double *res=parafield->getField()->getArray()->getConstPointer();
-      CPPUNIT_ASSERT_EQUAL(1,parafield->getField()->getNumberOfTuples());
-      const double expected[]={37.8518518518519,43.5333333333333};
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[rank],res[0],1e-13);
-    }
-  else
-    {
-      dec5.setMethod("P0");
-      dec5.attachLocalField(parafield);
-      dec5.synchronize();
-      dec5.setForcedRenormalization(false);
-      double *res=parafield->getField()->getArray()->getPointer();
-      const double *toSet=targetResults[rank-nproc_source];
-      res[0]=toSet[0];
-      res[1]=toSet[1];
-      dec5.sendData();
-    }
-  //test 6 - Integral reversed
-  ParaMEDMEM::InterpKernelDEC dec6(*source_group,*target_group);
-  parafield->getField()->setNature(Integral);
-  if (source_group->containsMyRank())
-    { 
-      dec6.setMethod("P0");
-      dec6.attachLocalField(parafield);
-      dec6.synchronize();
-      dec6.setForcedRenormalization(false);
-      dec6.recvData();
-      const double *res=parafield->getField()->getArray()->getConstPointer();
-      CPPUNIT_ASSERT_EQUAL(1,parafield->getField()->getNumberOfTuples());
-      const double expected[]={0.794600591715977,1.35631163708087};
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[rank],res[0],1e-13);
-    }
-  else
-    {
-      dec6.setMethod("P0");
-      dec6.attachLocalField(parafield);
-      dec6.synchronize();
-      dec6.setForcedRenormalization(false);
-      double *res=parafield->getField()->getArray()->getPointer();
-      const double *toSet=targetResults2[rank-nproc_source];
-      res[0]=toSet[0];
-      res[1]=toSet[1];
-      dec6.sendData();
-    }
-  //test 7 - Integral with global constraint reversed
-  ParaMEDMEM::InterpKernelDEC dec7(*source_group,*target_group);
-  parafield->getField()->setNature(IntegralGlobConstraint);
-  if (source_group->containsMyRank())
-    { 
-      dec7.setMethod("P0");
-      dec7.attachLocalField(parafield);
-      dec7.synchronize();
-      dec7.setForcedRenormalization(false);
-      dec7.recvData();
-      const double *res=parafield->getField()->getArray()->getConstPointer();
-      CPPUNIT_ASSERT_EQUAL(1,parafield->getField()->getNumberOfTuples());
-      const double expected[]={36.4592592592593,44.5407407407407};
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[rank],res[0],1e-13);
-    }
-  else
-    {
-      dec7.setMethod("P0");
-      dec7.attachLocalField(parafield);
-      dec7.synchronize();
-      dec7.setForcedRenormalization(false);
-      double *res=parafield->getField()->getArray()->getPointer();
-      const double *toSet=targetResults3[rank-nproc_source];
-      res[0]=toSet[0];
-      res[1]=toSet[1];
-      dec7.sendData();
-    }
-  //test 8 - Integral with RevIntegral reversed
-  ParaMEDMEM::InterpKernelDEC dec8(*source_group,*target_group);
-  parafield->getField()->setNature(RevIntegral);
-  if (source_group->containsMyRank())
-    { 
-      dec8.setMethod("P0");
-      dec8.attachLocalField(parafield);
-      dec8.synchronize();
-      dec8.setForcedRenormalization(false);
-      dec8.recvData();
-      const double *res=parafield->getField()->getArray()->getConstPointer();
-      CPPUNIT_ASSERT_EQUAL(1,parafield->getField()->getNumberOfTuples());
-      const double expected[]={0.81314102564102553,1.3428994082840233};
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[rank],res[0],1e-13);
-    }
-  else
-    {
-      dec8.setMethod("P0");
-      dec8.attachLocalField(parafield);
-      dec8.synchronize();
-      dec8.setForcedRenormalization(false);
-      double *res=parafield->getField()->getArray()->getPointer();
-      const double *toSet=targetResults4[rank-nproc_source];
-      res[0]=toSet[0];
-      res[1]=toSet[1];
-      dec8.sendData();
-    }
-  //
-  delete parafield;
-  mesh->decrRef();
-  delete paramesh;
-  delete self_group;
-  delete target_group;
-  delete source_group;
-  //
-  MPI_Barrier(MPI_COMM_WORLD);
-}
-
-void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P1P1P0()
-{
-  int size;
-  int rank;
-  MPI_Comm_size(MPI_COMM_WORLD,&size);
-  MPI_Comm_rank(MPI_COMM_WORLD,&rank);
-  //
-  if(size!=5)
-    return ;
-  int nproc_source = 2;
-  set<int> self_procs;
-  set<int> procs_source;
-  set<int> procs_target;
-  
-  for (int i=0; i<nproc_source; i++)
-    procs_source.insert(i);
-  for (int i=nproc_source; i<size; i++)
-    procs_target.insert(i);
-  self_procs.insert(rank);
-  //
-  ParaMEDMEM::MEDCouplingUMesh *mesh=0;
-  ParaMEDMEM::ParaMESH *paramesh=0;
-  ParaMEDMEM::ParaFIELD *parafieldP0=0,*parafieldP1=0;
-  //
-  ParaMEDMEM::CommInterface interface;
-  //
-  ProcessorGroup* self_group = new ParaMEDMEM::MPIProcessorGroup(interface,self_procs);
-  ProcessorGroup* target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target);
-  ProcessorGroup* source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source);
-  //
-  MPI_Barrier(MPI_COMM_WORLD);
-  if(source_group->containsMyRank())
-    {
-      if(rank==0)
-        {
-          double coords[6]={-0.3,-0.3, 0.7,0.7, 0.7,-0.3};
-          int conn[3]={0,1,2};
-          //int globalNode[3]={1,2,0};
-          mesh=MEDCouplingUMesh::New("Source mesh Proc0",2);
-          mesh->allocateCells(1);
-          mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,conn);
-          mesh->finishInsertingCells();
-          DataArrayDouble *myCoords=DataArrayDouble::New();
-          myCoords->alloc(3,2);
-          std::copy(coords,coords+6,myCoords->getPointer());
-          mesh->setCoords(myCoords);
-          myCoords->decrRef();
-        }
-      if(rank==1)
-        {
-          double coords[6]={-0.3,-0.3, -0.3,0.7, 0.7,0.7};
-          int conn[3]={0,1,2};
-          //int globalNode[3]={1,3,2};
-          mesh=MEDCouplingUMesh::New("Source mesh Proc1",2);
-          mesh->allocateCells(1);
-          mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,conn);
-          mesh->finishInsertingCells();
-          DataArrayDouble *myCoords=DataArrayDouble::New();
-          myCoords->alloc(3,2);
-          std::copy(coords,coords+6,myCoords->getPointer());
-          mesh->setCoords(myCoords);
-          myCoords->decrRef();
-        }
-      paramesh=new ParaMESH(mesh,*source_group,"source mesh");
-      ParaMEDMEM::ComponentTopology comptopo;
-      parafieldP0 = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);
-      parafieldP1 = new ParaFIELD(ON_NODES,NO_TIME,paramesh, comptopo);
-      double *valueP0=parafieldP0->getField()->getArray()->getPointer();
-      double *valueP1=parafieldP1->getField()->getArray()->getPointer();
-      parafieldP0->getField()->setNature(ConservativeVolumic);
-      parafieldP1->getField()->setNature(ConservativeVolumic);
-      if(rank==0)
-        {
-          valueP0[0]=31.;
-          valueP1[0]=34.; valueP1[1]=77.; valueP1[2]=53.;
-        }
-      if(rank==1)
-        {
-          valueP0[0]=47.;
-          valueP1[0]=34.; valueP1[1]=57.; valueP1[2]=77.;
-        }
-    }
-  else
-    {
-      const char targetMeshName[]="target mesh";
-      if(rank==2)
-        {
-          double coords[10]={-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.2, 0.2,0.2 };
-          int conn[7]={0,3,4,1, 1,4,2};
-          //int globalNode[5]={4,3,0,2,1};
-          mesh=MEDCouplingUMesh::New("Target mesh Proc2",2);
-          mesh->allocateCells(2);
-          mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);
-          mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,conn+4);
-          mesh->finishInsertingCells();
-          DataArrayDouble *myCoords=DataArrayDouble::New();
-          myCoords->alloc(5,2);
-          std::copy(coords,coords+10,myCoords->getPointer());
-          mesh->setCoords(myCoords);
-          myCoords->decrRef();
-          paramesh=new ParaMESH(mesh,*target_group,targetMeshName);
-          DataArrayInt *da=DataArrayInt::New();
-          const int globalNumberingP2[5]={0,1,2,3,4};
-          da->useArray(globalNumberingP2,false,CPP_DEALLOC,5,1);
-          paramesh->setNodeGlobal(da);
-          da->decrRef();
-        }
-      if(rank==3)
-        {
-          double coords[6]={0.2,0.2, 0.7,-0.3, 0.7,0.2};
-          int conn[3]={0,2,1};
-          //int globalNode[3]={1,0,5};
-          mesh=MEDCouplingUMesh::New("Target mesh Proc3",2);
-          mesh->allocateCells(1);
-          mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,conn);
-          mesh->finishInsertingCells();
-          DataArrayDouble *myCoords=DataArrayDouble::New();
-          myCoords->alloc(3,2);
-          std::copy(coords,coords+6,myCoords->getPointer());
-          mesh->setCoords(myCoords);
-          myCoords->decrRef();
-          paramesh=new ParaMESH(mesh,*target_group,targetMeshName);
-          DataArrayInt *da=DataArrayInt::New();
-          const int globalNumberingP3[3]={4,2,5};
-          da->useArray(globalNumberingP3,false,CPP_DEALLOC,3,1);
-          paramesh->setNodeGlobal(da);
-          da->decrRef();
-        }
-      if(rank==4)
-        {
-          double coords[12]={-0.3,0.2, -0.3,0.7, 0.2,0.7, 0.2,0.2, 0.7,0.7, 0.7,0.2};
-          int conn[8]={0,1,2,3, 3,2,4,5};
-          //int globalNode[6]={2,6,7,1,8,5};
-          mesh=MEDCouplingUMesh::New("Target mesh Proc4",2);
-          mesh->allocateCells(2);
-          mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);
-          mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+4);
-          mesh->finishInsertingCells();
-          DataArrayDouble *myCoords=DataArrayDouble::New();
-          myCoords->alloc(6,2);
-          std::copy(coords,coords+12,myCoords->getPointer());
-          mesh->setCoords(myCoords);
-          myCoords->decrRef();
-          paramesh=new ParaMESH(mesh,*target_group,targetMeshName);
-          DataArrayInt *da=DataArrayInt::New();
-          const int globalNumberingP4[6]={3,6,7,4,8,5};
-          da->useArray(globalNumberingP4,false,CPP_DEALLOC,6,1);
-          paramesh->setNodeGlobal(da);
-          da->decrRef();
-        }
-      ParaMEDMEM::ComponentTopology comptopo;
-      parafieldP0 = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);
-      parafieldP1 = new ParaFIELD(ON_NODES,NO_TIME,paramesh, comptopo);
-      parafieldP0->getField()->setNature(ConservativeVolumic);
-      parafieldP1->getField()->setNature(ConservativeVolumic);
-    }
-  // test 1 - P0 P1
-  ParaMEDMEM::InterpKernelDEC dec(*source_group,*target_group);
-  if (source_group->containsMyRank())
-    { 
-      dec.setMethod("P0");
-      dec.attachLocalField(parafieldP0);
-      dec.synchronize();
-      dec.setForcedRenormalization(false);
-      dec.sendData();
-      dec.recvData();
-      const double *valueP0=parafieldP0->getField()->getArray()->getPointer();
-      if(rank==0)
-        {
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(34.42857143,valueP0[0],1e-7);
-        }
-      if(rank==1)
-        {
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(44.,valueP0[0],1e-7);
-        }
-    }
-  else
-    {
-      dec.setMethod("P1");
-      dec.attachLocalField(parafieldP1);
-      dec.synchronize();
-      dec.setForcedRenormalization(false);
-      dec.recvData();
-      const double *res=parafieldP1->getField()->getArray()->getConstPointer();
-      if(rank==2)
-        {
-          const double expectP2[5]={39.0, 31.0, 31.0, 47.0, 39.0};
-          CPPUNIT_ASSERT_EQUAL(5,parafieldP1->getField()->getNumberOfTuples());
-          CPPUNIT_ASSERT_EQUAL(1,parafieldP1->getField()->getNumberOfComponents());
-          for(int kk=0;kk<5;kk++)
-            CPPUNIT_ASSERT_DOUBLES_EQUAL(expectP2[kk],res[kk],1e-12);
-        }
-      if(rank==3)
-        {
-          const double expectP3[3]={39.0, 31.0, 31.0};
-          CPPUNIT_ASSERT_EQUAL(3,parafieldP1->getField()->getNumberOfTuples());
-          CPPUNIT_ASSERT_EQUAL(1,parafieldP1->getField()->getNumberOfComponents());
-          for(int kk=0;kk<3;kk++)
-            CPPUNIT_ASSERT_DOUBLES_EQUAL(expectP3[kk],res[kk],1e-12);
-        }
-      if(rank==4)
-        {
-          const double expectP4[6]={47.0, 47.0, 47.0, 39.0, 39.0, 31.0};
-          CPPUNIT_ASSERT_EQUAL(6,parafieldP1->getField()->getNumberOfTuples());
-          CPPUNIT_ASSERT_EQUAL(1,parafieldP1->getField()->getNumberOfComponents());
-          for(int kk=0;kk<6;kk++)
-            CPPUNIT_ASSERT_DOUBLES_EQUAL(expectP4[kk],res[kk],1e-12);
-        }
-      dec.sendData();
-    }
-  //
-  delete parafieldP0;
-  delete parafieldP1;
-  mesh->decrRef();
-  delete paramesh;
-  delete self_group;
-  delete target_group;
-  delete source_group;
-  //
-  MPI_Barrier(MPI_COMM_WORLD);
-}
-
-void ParaMEDMEMTest::testInterpKernelDEC2DM1D_P0P0()
-{
-  int size;
-  int rank;
-  MPI_Comm_size(MPI_COMM_WORLD,&size);
-  MPI_Comm_rank(MPI_COMM_WORLD,&rank);
-  //
-  if(size!=3)
-    return ;
-  int nproc_source=2;
-  set<int> procs_source;
-  set<int> procs_target;
-  //
-  for (int i=0; i<nproc_source; i++)
-    procs_source.insert(i);
-  for (int i=nproc_source;i<size; i++)
-    procs_target.insert(i);
-  //
-  ParaMEDMEM::MEDCouplingUMesh *mesh=0;
-  ParaMEDMEM::ParaMESH *paramesh=0;
-  ParaMEDMEM::ParaFIELD *parafield=0;
-  //
-  ParaMEDMEM::CommInterface interface;
-  //
-  ProcessorGroup* target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target);
-  ProcessorGroup* source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source);
-  //
-  MPI_Barrier(MPI_COMM_WORLD);
-  if(source_group->containsMyRank())
-    {
-      double targetCoords[18]={-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 };
-      mesh=MEDCouplingUMesh::New();
-      mesh->setMeshDimension(2);
-      DataArrayDouble *myCoords=DataArrayDouble::New();
-      myCoords->alloc(9,2);
-      std::copy(targetCoords,targetCoords+18,myCoords->getPointer());
-      mesh->setCoords(myCoords);
-      myCoords->decrRef();
-      if(rank==0)
-        {
-          int targetConn[7]={0,3,4,1, 1,4,2};
-          mesh->allocateCells(2);
-          mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn);
-          mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+4);
-          mesh->finishInsertingCells();
-        }
-      else
-        { 
-          int targetConn[11]={4,5,2, 6,7,4,3, 7,8,5,4};
-          mesh->allocateCells(3);
-          mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn);
-          mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+3);
-          mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+7);
-          mesh->finishInsertingCells();
-        }
-      ParaMEDMEM::ComponentTopology comptopo;
-      paramesh=new ParaMESH(mesh,*source_group,"source mesh");
-      parafield=new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);
-      parafield->getField()->setNature(ConservativeVolumic);
-      double *vals=parafield->getField()->getArray()->getPointer();
-      if(rank==0)
-        { vals[0]=7.; vals[1]=8.; }
-      else
-        { vals[0]=9.; vals[1]=10.; vals[2]=11.; }
-    }
-  else
-    {
-      mesh=MEDCouplingUMesh::New("an example of -1 D mesh",-1);
-      ParaMEDMEM::ComponentTopology comptopo;
-      paramesh=new ParaMESH(mesh,*target_group,"target mesh");
-      parafield=new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);
-      parafield->getField()->setNature(ConservativeVolumic);
-    }
-  ParaMEDMEM::InterpKernelDEC dec(*source_group,*target_group);
-  if(source_group->containsMyRank())
-    {
-      dec.setMethod("P0");
-      dec.attachLocalField(parafield);
-      dec.synchronize();
-      dec.setForcedRenormalization(false);
-      dec.sendData();
-      dec.recvData();
-      const double *res=parafield->getField()->getArray()->getConstPointer();
-      if(rank==0)
-        {
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(9.125,res[0],1e-12);
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(9.125,res[1],1e-12);
-        }
-      else
-        {
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(9.125,res[0],1e-12);
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(9.125,res[1],1e-12);
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(9.125,res[2],1e-12);
-        }
-    }
-  else
-    {
-      dec.setMethod("P0");
-      dec.attachLocalField(parafield);
-      dec.synchronize();
-      dec.setForcedRenormalization(false);
-      dec.recvData();
-      const double *res=parafield->getField()->getArray()->getConstPointer();
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(9.125,res[0],1e-12);
-      dec.sendData();
-    }
-  ParaMEDMEM::InterpKernelDEC dec2(*source_group,*target_group);
-  dec2.setMethod("P0");
-  parafield->getField()->setNature(IntegralGlobConstraint);
-  if(source_group->containsMyRank())
-    {
-      double *vals=parafield->getField()->getArray()->getPointer();
-      if(rank==0)
-        { vals[0]=7.; vals[1]=8.; }
-      else
-        { vals[0]=9.; vals[1]=10.; vals[2]=11.; }
-      dec2.attachLocalField(parafield);
-      dec2.synchronize();
-      dec2.sendData();
-      dec2.recvData();
-      const double *res=parafield->getField()->getArray()->getConstPointer();
-      if(rank==0)
-        {
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(11.25,res[0],1e-12);
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(5.625,res[1],1e-12);
-        }
-      else
-        {
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(5.625,res[0],1e-12);
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(11.25,res[1],1e-12);
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(11.25,res[2],1e-12);
-        }
-    }
-  else
-    {
-      dec2.attachLocalField(parafield);
-      dec2.synchronize();
-      dec2.recvData();
-      const double *res=parafield->getField()->getArray()->getConstPointer();
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(45.,res[0],1e-12);
-      dec2.sendData();
-    }
-  //
-  ParaMEDMEM::InterpKernelDEC dec3(*source_group,*target_group);
-  dec3.setMethod("P0");
-  parafield->getField()->setNature(Integral);
-  if(source_group->containsMyRank())
-    {
-      double *vals=parafield->getField()->getArray()->getPointer();
-      if(rank==0)
-        { vals[0]=7.; vals[1]=8.; }
-      else
-        { vals[0]=9.; vals[1]=10.; vals[2]=11.; }
-      dec3.attachLocalField(parafield);
-      dec3.synchronize();
-      dec3.sendData();
-      dec3.recvData();
-      const double *res=parafield->getField()->getArray()->getConstPointer();
-      if(rank==0)
-        {
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(11.25,res[0],1e-12);
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(5.625,res[1],1e-12);
-        }
-      else
-        {
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(5.625,res[0],1e-12);
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(11.25,res[1],1e-12);
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(11.25,res[2],1e-12);
-        }
-    }
-  else
-    {
-      dec3.attachLocalField(parafield);
-      dec3.synchronize();
-      dec3.recvData();
-      const double *res=parafield->getField()->getArray()->getConstPointer();
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(45.,res[0],1e-12);
-      dec3.sendData();
-    }
-  //
-  ParaMEDMEM::InterpKernelDEC dec4(*source_group,*target_group);
-  dec4.setMethod("P0");
-  parafield->getField()->setNature(RevIntegral);
-  if(source_group->containsMyRank())
-    {
-      double *vals=parafield->getField()->getArray()->getPointer();
-      if(rank==0)
-        { vals[0]=7.; vals[1]=8.; }
-      else
-        { vals[0]=9.; vals[1]=10.; vals[2]=11.; }
-      dec4.attachLocalField(parafield);
-      dec4.synchronize();
-      dec4.sendData();
-      dec4.recvData();
-      const double *res=parafield->getField()->getArray()->getConstPointer();
-       if(rank==0)
-        {
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(9.125,res[0],1e-12);
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(9.125,res[1],1e-12);
-        }
-      else
-        {
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(9.125,res[0],1e-12);
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(9.125,res[1],1e-12);
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(9.125,res[2],1e-12);
-        }
-    }
-  else
-    {
-      dec4.attachLocalField(parafield);
-      dec4.synchronize();
-      dec4.recvData();
-      const double *res=parafield->getField()->getArray()->getConstPointer();
-      CPPUNIT_ASSERT_DOUBLES_EQUAL(9.125,res[0],1e-12);
-      dec4.sendData();
-    }
-  delete parafield;
-  delete paramesh;
-  mesh->decrRef();
-  delete target_group;
-  delete source_group;
-  //
-  MPI_Barrier(MPI_COMM_WORLD);
-}
-
-void ParaMEDMEMTest::testInterpKernelDECPartialProcs()
-{
-  int size;
-  int rank;
-  MPI_Comm_size(MPI_COMM_WORLD,&size);
-  MPI_Comm_rank(MPI_COMM_WORLD,&rank);
-  //
-  if(size!=3)
-    return ;
-  set<int> procs_source;
-  set<int> procs_target;
-  //
-  procs_source.insert(0);
-  procs_target.insert(1);
-  //
-  ParaMEDMEM::MEDCouplingUMesh *mesh=0;
-  ParaMEDMEM::ParaMESH *paramesh=0;
-  ParaMEDMEM::ParaFIELD *parafield=0;
-  //
-  ParaMEDMEM::CommInterface interface;
-  //
-  MPI_Barrier(MPI_COMM_WORLD);
-  double targetCoords[8]={ 0.,0., 1., 0., 0., 1., 1., 1. };
-  CommInterface comm;
-  int grpIds[2]={0,1};
-  MPI_Group grp,group_world;
-  comm.commGroup(MPI_COMM_WORLD,&group_world);
-  comm.groupIncl(group_world,2,grpIds,&grp);
-  MPI_Comm partialComm;
-  comm.commCreate(MPI_COMM_WORLD,grp,&partialComm);
-  //
-  ProcessorGroup* target_group=0;
-  ProcessorGroup* source_group=0;
-  //
-  ParaMEDMEM::InterpKernelDEC *dec=0;
-  if(rank==0 || rank==1)
-    {
-      target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target,partialComm);
-      source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source,partialComm);
-      if(source_group->containsMyRank())
-        {    
-          mesh=MEDCouplingUMesh::New();
-          mesh->setMeshDimension(2);
-          DataArrayDouble *myCoords=DataArrayDouble::New();
-          myCoords->alloc(4,2);
-          std::copy(targetCoords,targetCoords+8,myCoords->getPointer());
-          mesh->setCoords(myCoords);
-          myCoords->decrRef();
-          int targetConn[4]={0,2,3,1};
-          mesh->allocateCells(1);
-          mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn);
-          mesh->finishInsertingCells();
-          ParaMEDMEM::ComponentTopology comptopo;
-          paramesh=new ParaMESH(mesh,*source_group,"source mesh");
-          parafield=new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);
-          parafield->getField()->setNature(ConservativeVolumic);
-          double *vals=parafield->getField()->getArray()->getPointer();
-          vals[0]=7.;
-          dec=new ParaMEDMEM::InterpKernelDEC(*source_group,*target_group);
-          dec->attachLocalField(parafield);
-          dec->synchronize();
-          dec->sendData();
-          dec->recvData();
-        }
-      else
-        {
-          mesh=MEDCouplingUMesh::New();
-          mesh->setMeshDimension(2);
-          DataArrayDouble *myCoords=DataArrayDouble::New();
-          myCoords->alloc(4,2);
-          std::copy(targetCoords,targetCoords+8,myCoords->getPointer());
-          mesh->setCoords(myCoords);
-          myCoords->decrRef();
-          int targetConn[6]={0,2,1,2,3,1};
-          mesh->allocateCells(2);
-          mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn);
-          mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+3);
-          mesh->finishInsertingCells();
-          ParaMEDMEM::ComponentTopology comptopo;
-          paramesh=new ParaMESH(mesh,*target_group,"target mesh");
-          parafield=new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);
-          parafield->getField()->setNature(ConservativeVolumic);
-          dec=new ParaMEDMEM::InterpKernelDEC(*source_group,*target_group);
-          dec->attachLocalField(parafield);
-          dec->synchronize();
-          dec->recvData();
-          dec->sendData();
-        }
-    }
-  delete parafield;
-  delete paramesh;
-  if(mesh)
-    mesh->decrRef();
-  delete target_group;
-  delete source_group;
-  delete dec;
-  MPI_Barrier(MPI_COMM_WORLD);
-}
-
-/*!
- * Tests an asynchronous exchange between two codes
- * one sends data with dtA as an interval, the max time being tmaxA
- * the other one receives with dtB as an interval, the max time being tmaxB
- */
-void ParaMEDMEMTest::testAsynchronousInterpKernelDEC_2D(double dtA, double tmaxA, 
-                                                        double dtB, double tmaxB, bool WithPointToPoint, bool Asynchronous,
-                                                        bool WithInterp, const char *srcMeth, const char *targetMeth)
-{
-  std::string srcM(srcMeth);
-  std::string targetM(targetMeth);
-  int size;
-  int rank;
-  MPI_Comm_size(MPI_COMM_WORLD,&size);
-  MPI_Comm_rank(MPI_COMM_WORLD,&rank);
- 
-  //the test is meant to run on five processors
-  if (size !=5) return ;
-   
-  int nproc_source = 3;
-  set<int> self_procs;
-  set<int> procs_source;
-  set<int> procs_target;
-  
-  for (int i=0; i<nproc_source; i++)
-    procs_source.insert(i);
-  for (int i=nproc_source; i<size; i++)
-    procs_target.insert(i);
-  self_procs.insert(rank);
-  
-  ParaMEDMEM::CommInterface interface;
-    
-  ParaMEDMEM::ProcessorGroup* self_group = new ParaMEDMEM::MPIProcessorGroup(interface,self_procs);
-  ParaMEDMEM::ProcessorGroup* target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target);
-  ParaMEDMEM::ProcessorGroup* source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source);
-    
-  //loading the geometry for the source group
-
-  ParaMEDMEM::InterpKernelDEC dec (*source_group,*target_group);
-  
-  ParaMEDMEM::MEDCouplingUMesh* mesh;
-  ParaMEDMEM::ParaMESH* paramesh;
-  ParaMEDMEM::ParaFIELD* parafield;
-  
-  ICoCo::Field* icocofield ;
-
-  string tmp_dir                    = getenv("TMP");
-  if (tmp_dir == "")
-    tmp_dir = "/tmp";
-  string filename_xml1              = getResourceFile("square1_split");
-  string filename_xml2              = getResourceFile("square2_split"); 
-  //string filename_seq_wr            = makeTmpFile("");
-  //string filename_seq_med           = makeTmpFile("myWrField_seq_pointe221.med");
-  
-  // To remove tmp files from disk
-  ParaMEDMEMTest_TmpFilesRemover aRemover;
-  
-  MPI_Barrier(MPI_COMM_WORLD);
-
-  if (source_group->containsMyRank())
-    {
-      string master = filename_xml1;
-      
-      ostringstream strstream;
-      strstream <<master<<rank+1<<".med";
-      ostringstream meshname ;
-      meshname<< "Mesh_2_"<< rank+1;
-      
-      mesh=MEDLoader::ReadUMeshFromFile(strstream.str().c_str(),meshname.str().c_str(),0);
-
-      paramesh=new ParaMESH (mesh,*source_group,"source mesh");
-    
-      //      ParaMEDMEM::ParaSUPPORT* parasupport=new UnstructuredParaSUPPORT( support,*source_group);
-      ParaMEDMEM::ComponentTopology comptopo;
-      if(srcM=="P0")
-        {
-          parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);
-          parafield->getField()->setNature(ConservativeVolumic);//InvertIntegral);//ConservativeVolumic);
-        }
-      else
-        parafield = new ParaFIELD(ON_NODES,NO_TIME,paramesh, comptopo);
-
-      int nb_local;
-      if(srcM=="P0")
-        nb_local=mesh->getNumberOfCells();
-      else
-        nb_local=mesh->getNumberOfNodes();
-      //      double * value= new double[nb_local];
-      double *value=parafield->getField()->getArray()->getPointer();
-      for(int ielem=0; ielem<nb_local;ielem++)
-        value[ielem]=0.0;
-    
-      //      ICoCo::Field* icocofield=new ICoCo::MEDField(paramesh,parafield);
-      icocofield=new ICoCo::MEDField((MEDCouplingUMesh *)paramesh->getCellMesh(),parafield->getField());
-     
-      dec.attachLocalField(icocofield);
-
-
-    }
-  
-  //loading the geometry for the target group
-  if (target_group->containsMyRank())
-    {
-      string master= filename_xml2;
-      ostringstream strstream;
-      strstream << master<<(rank-nproc_source+1)<<".med";
-      ostringstream meshname ;
-      meshname<< "Mesh_3_"<<rank-nproc_source+1;
-      
-      mesh = MEDLoader::ReadUMeshFromFile(strstream.str().c_str(),meshname.str().c_str(),0);
-
-      paramesh=new ParaMESH (mesh,*target_group,"target mesh");
-      //      ParaMEDMEM::ParaSUPPORT* parasupport=new UnstructuredParaSUPPORT(support,*target_group);
-      ParaMEDMEM::ComponentTopology comptopo;
-      if(targetM=="P0")
-        {
-          parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);
-          parafield->getField()->setNature(ConservativeVolumic);//InvertIntegral);//ConservativeVolumic);
-        }
-      else
-        parafield = new ParaFIELD(ON_NODES,NO_TIME,paramesh, comptopo);
-      
-      int nb_local;
-      if(targetM=="P0")
-        nb_local=mesh->getNumberOfCells();
-      else
-        nb_local=mesh->getNumberOfNodes();
-                        
-      double *value=parafield->getField()->getArray()->getPointer();
-      for(int ielem=0; ielem<nb_local;ielem++)
-        value[ielem]=0.0;
-      //      ICoCo::Field* icocofield=new ICoCo::MEDField(paramesh,parafield);
-      icocofield=new ICoCo::MEDField((MEDCouplingUMesh *)paramesh->getCellMesh(),parafield->getField());
-      
-      dec.attachLocalField(icocofield);
-    }
-    
-  
-  //attaching a DEC to the source group 
-  
-  if (source_group->containsMyRank())
-    { 
-      cout<<"DEC usage"<<endl;
-      dec.setAsynchronous(Asynchronous);
-      if ( WithInterp ) {
-        dec.setTimeInterpolationMethod(LinearTimeInterp);
-      }
-      if ( WithPointToPoint ) {
-        dec.setAllToAllMethod(PointToPoint);
-      }
-      else {
-        dec.setAllToAllMethod(Native);
-      }
-      dec.synchronize();
-      dec.setForcedRenormalization(false);
-      for (double time=0; time<tmaxA+1e-10; time+=dtA)
-        {
-          cout << "testAsynchronousInterpKernelDEC_2D" << rank << " time " << time
-               << " dtA " << dtA << " tmaxA " << tmaxA << endl ;
-          if ( time+dtA < tmaxA+1e-7 ) {
-            dec.sendData( time , dtA );
-          }
-          else {
-            dec.sendData( time , 0 );
-          }
-          double* value = parafield->getField()->getArray()->getPointer();
-          int nb_local=parafield->getField()->getMesh()->getNumberOfCells();
-          for (int i=0; i<nb_local;i++)
-            value[i]= time+dtA;
-
-       
-        }
-    }
-  
-  //attaching a DEC to the target group
-  if (target_group->containsMyRank())
-    {
-      cout<<"DEC usage"<<endl;
-      dec.setAsynchronous(Asynchronous);
-      if ( WithInterp ) {
-        dec.setTimeInterpolationMethod(LinearTimeInterp);
-      }
-      if ( WithPointToPoint ) {
-        dec.setAllToAllMethod(PointToPoint);
-      }
-      else {
-        dec.setAllToAllMethod(Native);
-      }
-      dec.synchronize();
-      dec.setForcedRenormalization(false);
-      vector<double> times;
-      for (double time=0; time<tmaxB+1e-10; time+=dtB)
-        {
-          cout << "testAsynchronousInterpKernelDEC_2D" << rank << " time " << time
-               << " dtB " << dtB << " tmaxB " << tmaxB << endl ;
-          dec.recvData( time );
-          double vi = parafield->getVolumeIntegral(0,true);
-          cout << "testAsynchronousInterpKernelDEC_2D" << rank << " time " << time
-               << " VolumeIntegral " << vi
-               << " time*10000 " << time*10000 << endl ;
-          
-          CPPUNIT_ASSERT_DOUBLES_EQUAL(vi,time*10000,0.001);
-        }
-      
-    }
-  
-  delete source_group;
-  delete target_group;
-  delete self_group;
-  delete parafield ;
-  delete paramesh ;
-  mesh->decrRef() ;
-  delete icocofield ;
-
-  cout << "testAsynchronousInterpKernelDEC_2D" << rank << " MPI_Barrier " << endl ;
- 
-  if (Asynchronous) MPI_Barrier(MPI_COMM_WORLD);
-  cout << "end of InterpKernelDEC_2D test"<<endl;
-}
diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_MEDLoader.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_MEDLoader.cxx
deleted file mode 100644
index 325b46f03..000000000
--- a/src/ParaMEDMEMTest/ParaMEDMEMTest_MEDLoader.cxx
+++ /dev/null
@@ -1,457 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "ParaMEDMEMTest.hxx"
-#include <cppunit/TestAssert.h>
-#include "MEDLoader.hxx"
-#include "MEDCouplingUMesh.hxx"
-#include "MEDCouplingFieldDouble.hxx"
-
-#include <algorithm>
-#include <numeric>
-#include <iostream>
-#include <iterator>
-
-using namespace std;
-using namespace INTERP_KERNEL;
-using namespace ParaMEDMEM;
-
-void ParaMEDMEMTest::testMEDLoaderRead1()
-{
-  string fileName=getResourceFile("pointe_import22.med");
-  vector<string> meshNames=MEDLoader::GetMeshNames(fileName.c_str());
-  CPPUNIT_ASSERT_EQUAL(1,(int)meshNames.size());
-  MEDCouplingUMesh *mesh=MEDLoader::ReadUMeshFromFile(fileName.c_str(),meshNames[0].c_str(),0);
-  CPPUNIT_ASSERT_EQUAL(3,mesh->getSpaceDimension());
-  CPPUNIT_ASSERT_EQUAL(3,mesh->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(16,mesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(19,mesh->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(3,(int)mesh->getAllTypes().size());
-  for(int i=0;i<12;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_TETRA4,mesh->getTypeOfCell(i));
-  for(int i=12;i<14;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_HEXA8,mesh->getTypeOfCell(i));
-  for(int i=14;i<16;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_PYRA5,mesh->getTypeOfCell(i));
-  CPPUNIT_ASSERT_EQUAL(90,mesh->getNodalConnectivity()->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(701,std::accumulate(mesh->getNodalConnectivity()->getPointer(),mesh->getNodalConnectivity()->getPointer()+90,0));
-  CPPUNIT_ASSERT_EQUAL(711,std::accumulate(mesh->getNodalConnectivityIndex()->getPointer(),mesh->getNodalConnectivityIndex()->getPointer()+17,0));
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(46.,std::accumulate(mesh->getCoords()->getPointer(),mesh->getCoords()->getPointer()+57,0),1e-12);
-  mesh->decrRef();
-  //
-  vector<string> families=MEDLoader::GetMeshFamilyNames(fileName.c_str(),meshNames[0].c_str());
-  CPPUNIT_ASSERT_EQUAL(8,(int)families.size());
-  CPPUNIT_ASSERT(families[2]=="FAMILLE_ELEMENT_3");
-  //
-  vector<string> families2;
-  families2.push_back(families[2]);
-  mesh=MEDLoader::ReadUMeshFromFamilies(fileName.c_str(),meshNames[0].c_str(),0,families2);
-  CPPUNIT_ASSERT_EQUAL(3,mesh->getSpaceDimension());
-  CPPUNIT_ASSERT_EQUAL(3,mesh->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(2,mesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(19,mesh->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(2,(int)mesh->getAllTypes().size());
-  CPPUNIT_ASSERT_EQUAL(NORM_TETRA4,mesh->getTypeOfCell(0));
-  CPPUNIT_ASSERT_EQUAL(NORM_PYRA5,mesh->getTypeOfCell(1));
-  CPPUNIT_ASSERT_EQUAL(11,mesh->getNodalConnectivity()->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(132,std::accumulate(mesh->getNodalConnectivity()->getPointer(),mesh->getNodalConnectivity()->getPointer()+11,0));
-  CPPUNIT_ASSERT_EQUAL(16,std::accumulate(mesh->getNodalConnectivityIndex()->getPointer(),mesh->getNodalConnectivityIndex()->getPointer()+3,0));
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(46.,std::accumulate(mesh->getCoords()->getPointer(),mesh->getCoords()->getPointer()+57,0),1e-12);
-  mesh->decrRef();
-  //
-  vector<string> groups=MEDLoader::GetMeshGroupsNames(fileName.c_str(),meshNames[0].c_str());
-  CPPUNIT_ASSERT_EQUAL(5,(int)groups.size());
-  CPPUNIT_ASSERT(groups[0]=="groupe1");
-  CPPUNIT_ASSERT(groups[1]=="groupe2");
-  CPPUNIT_ASSERT(groups[2]=="groupe3");
-  CPPUNIT_ASSERT(groups[3]=="groupe4");
-  CPPUNIT_ASSERT(groups[4]=="groupe5");
-  vector<string> groups2;
-  groups2.push_back(groups[0]);
-  mesh=MEDLoader::ReadUMeshFromGroups(fileName.c_str(),meshNames[0].c_str(),0,groups2);
-  CPPUNIT_ASSERT_EQUAL(3,mesh->getSpaceDimension());
-  CPPUNIT_ASSERT_EQUAL(3,mesh->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(7,mesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(19,mesh->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(2,(int)mesh->getAllTypes().size());
-  for(int i=0;i<6;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_TETRA4,mesh->getTypeOfCell(i));
-  CPPUNIT_ASSERT_EQUAL(NORM_PYRA5,mesh->getTypeOfCell(6));
-  CPPUNIT_ASSERT_EQUAL(36,mesh->getNodalConnectivity()->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(254,std::accumulate(mesh->getNodalConnectivity()->getPointer(),mesh->getNodalConnectivity()->getPointer()+36,0));
-  CPPUNIT_ASSERT_EQUAL(141,std::accumulate(mesh->getNodalConnectivityIndex()->getPointer(),mesh->getNodalConnectivityIndex()->getPointer()+8,0));
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(46.,std::accumulate(mesh->getCoords()->getPointer(),mesh->getCoords()->getPointer()+57,0),1e-12);
-  mesh->decrRef();
-  //
-  std::vector<std::string> fieldsName=MEDLoader::GetCellFieldNamesOnMesh(fileName.c_str(),meshNames[0].c_str());
-  CPPUNIT_ASSERT_EQUAL(2,(int)fieldsName.size());
-  CPPUNIT_ASSERT(fieldsName[0]=="fieldcelldoublescalar");
-  CPPUNIT_ASSERT(fieldsName[1]=="fieldcelldoublevector");
-  std::vector<std::pair<int,int> > its0=MEDLoader::GetCellFieldIterations(fileName.c_str(),fieldsName[0].c_str());
-  CPPUNIT_ASSERT_EQUAL(1,(int)its0.size());
-  CPPUNIT_ASSERT_EQUAL(-1,its0[0].first);
-  CPPUNIT_ASSERT_EQUAL(-1,its0[0].second);
-  std::vector<std::pair<int,int> > its1=MEDLoader::GetCellFieldIterations(fileName.c_str(),fieldsName[1].c_str());
-  CPPUNIT_ASSERT_EQUAL(1,(int)its1.size());
-  CPPUNIT_ASSERT_EQUAL(-1,its1[0].first);
-  CPPUNIT_ASSERT_EQUAL(-1,its1[0].second);
-  //
-  MEDCouplingFieldDouble *field0=MEDLoader::ReadFieldDoubleCell(fileName.c_str(),meshNames[0].c_str(),0,fieldsName[0].c_str(),its0[0].first,its0[0].second);
-  field0->checkCoherency();
-  CPPUNIT_ASSERT(field0->getName()==fieldsName[0]);
-  CPPUNIT_ASSERT_EQUAL(1,field0->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(16,field0->getNumberOfTuples());
-  const double expectedValues[16]={1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,3.,3.,2.,2.};
-  double diffValue[16];
-  std::transform(field0->getArray()->getPointer(),field0->getArray()->getPointer()+16,expectedValues,diffValue,std::minus<double>());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,*std::max_element(diffValue,diffValue+16),1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,*std::min_element(diffValue,diffValue+16),1e-12);
-  const MEDCouplingUMesh *constMesh=dynamic_cast<const MEDCouplingUMesh *>(field0->getMesh());
-  CPPUNIT_ASSERT(constMesh);
-  CPPUNIT_ASSERT_EQUAL(3,constMesh->getSpaceDimension());
-  CPPUNIT_ASSERT_EQUAL(3,constMesh->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(16,constMesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(19,constMesh->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(3,(int)constMesh->getAllTypes().size());
-  for(int i=0;i<12;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_TETRA4,constMesh->getTypeOfCell(i));
-  for(int i=12;i<14;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_HEXA8,constMesh->getTypeOfCell(i));
-  for(int i=14;i<16;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_PYRA5,constMesh->getTypeOfCell(i));
-  CPPUNIT_ASSERT_EQUAL(90,constMesh->getNodalConnectivity()->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(701,std::accumulate(constMesh->getNodalConnectivity()->getPointer(),constMesh->getNodalConnectivity()->getPointer()+90,0));
-  CPPUNIT_ASSERT_EQUAL(711,std::accumulate(constMesh->getNodalConnectivityIndex()->getPointer(),constMesh->getNodalConnectivityIndex()->getPointer()+17,0));
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(46.,std::accumulate(constMesh->getCoords()->getPointer(),constMesh->getCoords()->getPointer()+57,0),1e-12);
-  field0->decrRef();
-  //
-  MEDCouplingFieldDouble *field1=MEDLoader::ReadFieldDoubleCell(fileName.c_str(),meshNames[0].c_str(),0,fieldsName[1].c_str(),its1[0].first,its1[0].second);
-  field1->checkCoherency();
-  CPPUNIT_ASSERT(field1->getName()==fieldsName[1]);
-  CPPUNIT_ASSERT_EQUAL(3,field1->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(16,field1->getNumberOfTuples());
-  const double expectedValues2[48]={1.,0.,1.,1.,0.,1.,1.,0.,1.,2.,1.,0.,2.,1.,0.,2.,1.,0.,3.,0.,1.,3.,0.,1.,3.,0.,1.,4.,1.,0.,4.,1.,0.,4.,1.,0.,6.,1.,1.,6.,0.,0.,5.,0.,0.,5.,1.,1.};
-  double diffValue2[48];
-  std::transform(field1->getArray()->getPointer(),field1->getArray()->getPointer()+48,expectedValues2,diffValue2,std::minus<double>());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,*std::max_element(diffValue2,diffValue2+48),1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,*std::min_element(diffValue2,diffValue2+48),1e-12);
-  constMesh=dynamic_cast<const MEDCouplingUMesh *>(field1->getMesh());
-  CPPUNIT_ASSERT(constMesh);
-  CPPUNIT_ASSERT_EQUAL(3,constMesh->getSpaceDimension());
-  CPPUNIT_ASSERT_EQUAL(3,constMesh->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(16,constMesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(19,constMesh->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(3,(int)constMesh->getAllTypes().size());
-  for(int i=0;i<12;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_TETRA4,constMesh->getTypeOfCell(i));
-  for(int i=12;i<14;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_HEXA8,constMesh->getTypeOfCell(i));
-  for(int i=14;i<16;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_PYRA5,constMesh->getTypeOfCell(i));
-  CPPUNIT_ASSERT_EQUAL(90,constMesh->getNodalConnectivity()->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(701,std::accumulate(constMesh->getNodalConnectivity()->getPointer(),constMesh->getNodalConnectivity()->getPointer()+90,0));
-  CPPUNIT_ASSERT_EQUAL(711,std::accumulate(constMesh->getNodalConnectivityIndex()->getPointer(),constMesh->getNodalConnectivityIndex()->getPointer()+17,0));
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(46.,std::accumulate(constMesh->getCoords()->getPointer(),constMesh->getCoords()->getPointer()+57,0),1e-12);
-  field1->decrRef();
-  //fields on nodes
-  std::vector<std::string> fieldsNameNode=MEDLoader::GetNodeFieldNamesOnMesh(fileName.c_str(),meshNames[0].c_str());
-  CPPUNIT_ASSERT_EQUAL(2,(int)fieldsNameNode.size());
-  CPPUNIT_ASSERT(fieldsNameNode[0]=="fieldnodedouble");
-  CPPUNIT_ASSERT(fieldsNameNode[1]=="fieldnodeint");
-  std::vector<std::pair<int,int> > its0Node=MEDLoader::GetNodeFieldIterations(fileName.c_str(),fieldsNameNode[0].c_str());
-  CPPUNIT_ASSERT_EQUAL(3,(int)its0Node.size());
-  CPPUNIT_ASSERT_EQUAL(1,its0Node[0].first);
-  CPPUNIT_ASSERT_EQUAL(-1,its0Node[0].second);
-  CPPUNIT_ASSERT_EQUAL(2,its0Node[1].first);
-  CPPUNIT_ASSERT_EQUAL(-1,its0Node[1].second);
-  CPPUNIT_ASSERT_EQUAL(-1,its0Node[2].first);//strange but like that
-  CPPUNIT_ASSERT_EQUAL(-1,its0Node[2].second);
-  MEDCouplingFieldDouble *field0Nodes=MEDLoader::ReadFieldDoubleNode(fileName.c_str(),meshNames[0].c_str(),0,fieldsNameNode[0].c_str(),its0Node[0].first,its0Node[0].second);
-  field0Nodes->checkCoherency();
-  CPPUNIT_ASSERT(field0Nodes->getName()==fieldsNameNode[0]);
-  CPPUNIT_ASSERT_EQUAL(1,field0Nodes->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(19,field0Nodes->getNumberOfTuples());
-  const double expectedValues3[19]={1.,1.,1.,2.,2.,2.,3.,3.,3.,4.,4.,4.,5.,5.,5.,6.,6.,6.,7.};
-  double diffValue3[19];
-  std::transform(field0Nodes->getArray()->getPointer(),field0Nodes->getArray()->getPointer()+19,expectedValues3,diffValue3,std::minus<double>());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,*std::max_element(diffValue3,diffValue3+19),1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,*std::min_element(diffValue3,diffValue3+19),1e-12);
-  constMesh=dynamic_cast<const MEDCouplingUMesh *>(field0Nodes->getMesh());
-  CPPUNIT_ASSERT(constMesh);
-  field0Nodes->decrRef();
-  //
-  field0Nodes=MEDLoader::ReadFieldDoubleNode(fileName.c_str(),meshNames[0].c_str(),0,fieldsNameNode[0].c_str(),its0Node[1].first,its0Node[1].second);
-  field0Nodes->checkCoherency();
-  CPPUNIT_ASSERT(field0Nodes->getName()==fieldsNameNode[0]);
-  CPPUNIT_ASSERT_EQUAL(1,field0Nodes->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(19,field0Nodes->getNumberOfTuples());
-  const double expectedValues4[19]={1.,2.,2.,2.,3.,3.,3.,4.,4.,4.,5.,5.,5.,6.,6.,6.,7.,7.,7.};
-  std::transform(field0Nodes->getArray()->getPointer(),field0Nodes->getArray()->getPointer()+19,expectedValues4,diffValue3,std::minus<double>());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,*std::max_element(diffValue3,diffValue3+19),1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,*std::min_element(diffValue3,diffValue3+19),1e-12);
-  constMesh=dynamic_cast<const MEDCouplingUMesh *>(field0Nodes->getMesh());
-  CPPUNIT_ASSERT(constMesh);
-  CPPUNIT_ASSERT_EQUAL(3,constMesh->getSpaceDimension());
-  CPPUNIT_ASSERT_EQUAL(3,constMesh->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(16,constMesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(19,constMesh->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(3,(int)constMesh->getAllTypes().size());
-  for(int i=0;i<12;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_TETRA4,constMesh->getTypeOfCell(i));
-  for(int i=12;i<14;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_HEXA8,constMesh->getTypeOfCell(i));
-  for(int i=14;i<16;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_PYRA5,constMesh->getTypeOfCell(i));
-  CPPUNIT_ASSERT_EQUAL(90,constMesh->getNodalConnectivity()->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(701,std::accumulate(constMesh->getNodalConnectivity()->getPointer(),constMesh->getNodalConnectivity()->getPointer()+90,0));
-  CPPUNIT_ASSERT_EQUAL(711,std::accumulate(constMesh->getNodalConnectivityIndex()->getPointer(),constMesh->getNodalConnectivityIndex()->getPointer()+17,0));
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(46.,std::accumulate(constMesh->getCoords()->getPointer(),constMesh->getCoords()->getPointer()+57,0),1e-12);
-  field0Nodes->decrRef();
-  //
-  field0Nodes=MEDLoader::ReadFieldDoubleNode(fileName.c_str(),meshNames[0].c_str(),0,fieldsNameNode[0].c_str(),its0Node[2].first,its0Node[2].second);
-  field0Nodes->checkCoherency();
-  CPPUNIT_ASSERT(field0Nodes->getName()==fieldsNameNode[0]);
-  CPPUNIT_ASSERT_EQUAL(1,field0Nodes->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(19,field0Nodes->getNumberOfTuples());
-  const double expectedValues5[19]={1.,1.,1.,2.,2.,2.,3.,3.,3.,4.,4.,4.,5.,5.,5.,6.,6.,6.,7.};
-  std::transform(field0Nodes->getArray()->getPointer(),field0Nodes->getArray()->getPointer()+19,expectedValues5,diffValue3,std::minus<double>());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,*std::max_element(diffValue3,diffValue3+19),1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,*std::min_element(diffValue3,diffValue3+19),1e-12);
-  constMesh=dynamic_cast<const MEDCouplingUMesh *>(field0Nodes->getMesh());
-  CPPUNIT_ASSERT(constMesh);
-  CPPUNIT_ASSERT_EQUAL(3,constMesh->getSpaceDimension());
-  CPPUNIT_ASSERT_EQUAL(3,constMesh->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(16,constMesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(19,constMesh->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(3,(int)constMesh->getAllTypes().size());
-  for(int i=0;i<12;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_TETRA4,constMesh->getTypeOfCell(i));
-  for(int i=12;i<14;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_HEXA8,constMesh->getTypeOfCell(i));
-  for(int i=14;i<16;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_PYRA5,constMesh->getTypeOfCell(i));
-  CPPUNIT_ASSERT_EQUAL(90,constMesh->getNodalConnectivity()->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(701,std::accumulate(constMesh->getNodalConnectivity()->getPointer(),constMesh->getNodalConnectivity()->getPointer()+90,0));
-  CPPUNIT_ASSERT_EQUAL(711,std::accumulate(constMesh->getNodalConnectivityIndex()->getPointer(),constMesh->getNodalConnectivityIndex()->getPointer()+17,0));
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(46.,std::accumulate(constMesh->getCoords()->getPointer(),constMesh->getCoords()->getPointer()+57,0),1e-12);
-  field0Nodes->decrRef();
-}
-
-void ParaMEDMEMTest::testMEDLoaderPolygonRead()
-{
-  string fileName=getResourceFile("polygones.med");
-  vector<string> meshNames=MEDLoader::GetMeshNames(fileName.c_str());
-  CPPUNIT_ASSERT_EQUAL(1,(int)meshNames.size());
-  CPPUNIT_ASSERT(meshNames[0]=="Bord");
-  MEDCouplingUMesh *mesh=MEDLoader::ReadUMeshFromFile(fileName.c_str(),meshNames[0].c_str(),0);
-  mesh->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(3,mesh->getSpaceDimension());
-  CPPUNIT_ASSERT_EQUAL(2,mesh->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(538,mesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(579,mesh->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(2,(int)mesh->getAllTypes().size());
-  for(int i=0;i<514;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_QUAD4,mesh->getTypeOfCell(i));
-  for(int i=514;i<538;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_POLYGON,mesh->getTypeOfCell(i));
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,std::accumulate(mesh->getCoords()->getPointer(),mesh->getCoords()->getPointer()+1737,0),1e-12);
-  const double expectedVals1[12]={1.4851585216522212,-0.5,0.,1.4851585216522212,-0.4,0.,1.4851585216522212,-0.3,0., 1.5741585216522211, -0.5, 0. };
-  double diffValue1[12];
-  std::transform(mesh->getCoords()->getPointer(),mesh->getCoords()->getPointer()+12,expectedVals1,diffValue1,std::minus<double>());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,*std::max_element(diffValue1,diffValue1+12),1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,*std::min_element(diffValue1,diffValue1+12),1e-12);
-  CPPUNIT_ASSERT_EQUAL(2768,mesh->getNodalConnectivity()->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(651050,std::accumulate(mesh->getNodalConnectivity()->getPointer(),mesh->getNodalConnectivity()->getPointer()+2768,0));
-  CPPUNIT_ASSERT_EQUAL(725943,std::accumulate(mesh->getNodalConnectivityIndex()->getPointer(),mesh->getNodalConnectivityIndex()->getPointer()+539,0));
-  mesh->decrRef();
-  //
-  std::vector<std::string> fieldsName=MEDLoader::GetCellFieldNamesOnMesh(fileName.c_str(),meshNames[0].c_str());
-  CPPUNIT_ASSERT_EQUAL(3,(int)fieldsName.size());
-  CPPUNIT_ASSERT(fieldsName[0]=="bord_:_distorsion");
-  CPPUNIT_ASSERT(fieldsName[1]=="bord_:_familles");
-  CPPUNIT_ASSERT(fieldsName[2]=="bord_:_non-ortho");
-  std::vector<std::pair<int,int> > its0=MEDLoader::GetCellFieldIterations(fileName.c_str(),fieldsName[0].c_str());
-  CPPUNIT_ASSERT_EQUAL(1,(int)its0.size());
-  MEDCouplingFieldDouble *field=MEDLoader::ReadFieldDoubleCell(fileName.c_str(),meshNames[0].c_str(),0,fieldsName[0].c_str(),its0[0].first,its0[0].second);
-  field->checkCoherency();
-  CPPUNIT_ASSERT(field->getName()==fieldsName[0]);
-  CPPUNIT_ASSERT_EQUAL(1,field->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(538,field->getNumberOfTuples());
-  const MEDCouplingUMesh *constMesh=dynamic_cast<const MEDCouplingUMesh *>(field->getMesh());
-  CPPUNIT_ASSERT(constMesh);
-  CPPUNIT_ASSERT_EQUAL(3,constMesh->getSpaceDimension());
-  CPPUNIT_ASSERT_EQUAL(2,constMesh->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(538,constMesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(579,constMesh->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(2,(int)constMesh->getAllTypes().size());
-  for(int i=0;i<514;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_QUAD4,constMesh->getTypeOfCell(i));
-  for(int i=514;i<538;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_POLYGON,constMesh->getTypeOfCell(i));
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,std::accumulate(constMesh->getCoords()->getPointer(),constMesh->getCoords()->getPointer()+1737,0),1e-12);
-  std::transform(constMesh->getCoords()->getPointer(),constMesh->getCoords()->getPointer()+12,expectedVals1,diffValue1,std::minus<double>());
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,*std::max_element(diffValue1,diffValue1+12),1e-12);
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,*std::min_element(diffValue1,diffValue1+12),1e-12);
-  CPPUNIT_ASSERT_EQUAL(2768,constMesh->getNodalConnectivity()->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(651050,std::accumulate(constMesh->getNodalConnectivity()->getPointer(),constMesh->getNodalConnectivity()->getPointer()+2768,0));
-  CPPUNIT_ASSERT_EQUAL(725943,std::accumulate(constMesh->getNodalConnectivityIndex()->getPointer(),constMesh->getNodalConnectivityIndex()->getPointer()+539,0));
-  const double *values=field->getArray()->getPointer();
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(2.87214203182918,std::accumulate(values,values+538,0.),1e-12);
-  field->decrRef();
-}
-
-void ParaMEDMEMTest::testMEDLoaderPolyhedronRead()
-{
-  string fileName=getResourceFile("poly3D.med");
-  vector<string> meshNames=MEDLoader::GetMeshNames(fileName.c_str());
-  CPPUNIT_ASSERT_EQUAL(1,(int)meshNames.size());
-  CPPUNIT_ASSERT(meshNames[0]=="poly3D");
-  MEDCouplingUMesh *mesh=MEDLoader::ReadUMeshFromFile(fileName.c_str(),meshNames[0].c_str(),0);
-  mesh->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(3,mesh->getSpaceDimension());
-  CPPUNIT_ASSERT_EQUAL(3,mesh->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(3,mesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(19,mesh->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(2,(int)mesh->getAllTypes().size());
-  CPPUNIT_ASSERT_EQUAL(NORM_TETRA4,mesh->getTypeOfCell(0));
-  CPPUNIT_ASSERT_EQUAL(NORM_POLYHED,mesh->getTypeOfCell(1));
-  CPPUNIT_ASSERT_EQUAL(NORM_POLYHED,mesh->getTypeOfCell(2));
-  CPPUNIT_ASSERT_EQUAL(98,mesh->getNodalConnectivity()->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(725,std::accumulate(mesh->getNodalConnectivity()->getPointer(),mesh->getNodalConnectivity()->getPointer()+98,0));
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(110.,std::accumulate(mesh->getCoords()->getPointer(),mesh->getCoords()->getPointer()+57,0),1e-12);
-  CPPUNIT_ASSERT_EQUAL(155,std::accumulate(mesh->getNodalConnectivityIndex()->getPointer(),mesh->getNodalConnectivityIndex()->getPointer()+4,0));
-  mesh->decrRef();
-  //
-  mesh=MEDLoader::ReadUMeshFromFile(fileName.c_str(),meshNames[0].c_str(),-1);
-  mesh->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(3,mesh->getSpaceDimension());
-  CPPUNIT_ASSERT_EQUAL(2,mesh->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(17,mesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(19,mesh->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(3,(int)mesh->getAllTypes().size());
-  for(int i=0;i<6;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_TRI3,mesh->getTypeOfCell(i));
-  for(int i=6;i<14;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_QUAD4,mesh->getTypeOfCell(i));
-  for(int i=14;i<17;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_POLYGON,mesh->getTypeOfCell(i));
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(110.,std::accumulate(mesh->getCoords()->getPointer(),mesh->getCoords()->getPointer()+57,0),1e-12);
-  CPPUNIT_ASSERT_EQUAL(83,mesh->getNodalConnectivity()->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(619,std::accumulate(mesh->getNodalConnectivity()->getPointer(),mesh->getNodalConnectivity()->getPointer()+83,0));
-  mesh->decrRef();
-  //
-  vector<string> families=MEDLoader::GetMeshFamilyNames(fileName.c_str(),meshNames[0].c_str());
-  CPPUNIT_ASSERT_EQUAL(4,(int)families.size());
-  CPPUNIT_ASSERT(families[0]=="FAMILLE_FACE_POLYGONS3");
-  CPPUNIT_ASSERT(families[1]=="FAMILLE_FACE_QUAD41");
-  CPPUNIT_ASSERT(families[2]=="FAMILLE_FACE_TRIA32");
-  CPPUNIT_ASSERT(families[3]=="FAMILLE_ZERO");
-  vector<string> families2;
-  families2.push_back(families[0]);
-  mesh=MEDLoader::ReadUMeshFromFamilies(fileName.c_str(),meshNames[0].c_str(),-1,families2);
-  mesh->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(3,mesh->getSpaceDimension());
-  CPPUNIT_ASSERT_EQUAL(2,mesh->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(3,mesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(19,mesh->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(1,(int)mesh->getAllTypes().size());
-  for(int i=0;i<3;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_POLYGON,mesh->getTypeOfCell(i));
-  CPPUNIT_ASSERT_EQUAL(19,mesh->getNodalConnectivity()->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(117,std::accumulate(mesh->getNodalConnectivity()->getPointer(),mesh->getNodalConnectivity()->getPointer()+19,0));
-  mesh->decrRef();
-  //
-  mesh=MEDLoader::ReadUMeshFromFamilies(fileName.c_str(),meshNames[0].c_str(),0,families2);
-  CPPUNIT_ASSERT_EQUAL(3,mesh->getSpaceDimension());
-  CPPUNIT_ASSERT_EQUAL(0,mesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(19,mesh->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(3,mesh->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(0,(int)mesh->getAllTypes().size());
-  mesh->decrRef();
-}
-
-void ParaMEDMEMTest::testMEDLoaderWrite1()
-{
-  const char meshName[]="MEDLoaderWrite1";
-  string outFileName=makeTmpFile("toto22137.med");
-  double targetCoords[18]={-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 };
-  int targetConn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
-  MEDCouplingUMesh *mesh=MEDCouplingUMesh::New();
-  mesh->setMeshDimension(2);
-  mesh->allocateCells(5);
-  mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn);
-  mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+4);
-  mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+7);
-  mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+10);
-  mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+14);
-  mesh->finishInsertingCells();
-  DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->alloc(9,2);
-  std::copy(targetCoords,targetCoords+18,myCoords->getPointer());
-  mesh->setCoords(myCoords);
-  myCoords->decrRef();
-  mesh->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(2,mesh->getSpaceDimension());
-  CPPUNIT_ASSERT_EQUAL(2,mesh->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(5,mesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(9,mesh->getNumberOfNodes());
-  bool normalThrow=false;
-  try
-    {
-      MEDLoader::WriteUMesh(outFileName.c_str(),mesh,true);
-    }
-  catch(INTERP_KERNEL::Exception& e)
-    {
-      normalThrow=true;
-    }
-  CPPUNIT_ASSERT(normalThrow);
-  mesh->setName(meshName);
-  MEDLoader::WriteUMesh(outFileName.c_str(),mesh,true);
-  mesh->decrRef();
-  //
-  mesh=MEDLoader::ReadUMeshFromFile(outFileName.c_str(),meshName,0);
-  CPPUNIT_ASSERT_EQUAL(2,mesh->getSpaceDimension());
-  CPPUNIT_ASSERT_EQUAL(2,mesh->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(5,mesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(9,mesh->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(2,(int)mesh->getAllTypes().size());
-  for(int i=0;i<2;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_TRI3,mesh->getTypeOfCell(i));
-  for(int i=2;i<5;i++)
-    CPPUNIT_ASSERT_EQUAL(NORM_QUAD4,mesh->getTypeOfCell(i));
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(3.6,std::accumulate(mesh->getCoords()->getPointer(),mesh->getCoords()->getPointer()+18,0.),1.e-12);
-  mesh->decrRef();
-}
-
-void ParaMEDMEMTest::testMEDLoaderPolygonWrite()
-{
-  string fileName=getResourceFile("polygones.med");
-  vector<string> meshNames=MEDLoader::GetMeshNames(fileName.c_str());
-  CPPUNIT_ASSERT_EQUAL(1,(int)meshNames.size());
-  CPPUNIT_ASSERT(meshNames[0]=="Bord");
-  MEDCouplingUMesh *mesh=MEDLoader::ReadUMeshFromFile(fileName.c_str(),meshNames[0].c_str(),0);
-  mesh->checkCoherency();
-  string outFileName=makeTmpFile("toto22138.med");
-  MEDLoader::WriteUMesh(outFileName.c_str(),mesh,true);
-  //
-  MEDCouplingUMesh *mesh2=MEDLoader::ReadUMeshFromFile(outFileName.c_str(),meshNames[0].c_str(),0);
-  //
-  mesh2->decrRef();
-  mesh->decrRef();
-}
diff --git a/src/ParaMEDMEMTest/test_perf.cxx b/src/ParaMEDMEMTest/test_perf.cxx
deleted file mode 100644
index 9c40165c0..000000000
--- a/src/ParaMEDMEMTest/test_perf.cxx
+++ /dev/null
@@ -1,337 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include <time.h>
-#include <sys/times.h>
-#include <sys/time.h>
-#include "ParaMEDMEMTest.hxx"
-#include <cppunit/TestAssert.h>
-
-#include "CommInterface.hxx"
-#include "ProcessorGroup.hxx"
-#include "MPIProcessorGroup.hxx"
-#include "Topology.hxx"
-#include "DEC.hxx"
-#include "MxN_Mapping.hxx"
-#include "InterpKernelDEC.hxx"
-#include "ParaMESH.hxx"
-#include "ParaFIELD.hxx"
-#include "ComponentTopology.hxx"
-#include "ICoCoMEDField.hxx"
-#include "MEDLoader.hxx"
- 
-#include <string>
-#include <cstring>
-
-// use this define to enable lines, execution of which leads to Segmentation Fault
-#define ENABLE_FAULTS
-
-// use this define to enable CPPUNIT asserts and fails, showing bugs
-#define ENABLE_FORCED_FAILURES
-
-#ifndef CLK_TCK 
-#include <unistd.h>
-#define CLK_TCK sysconf(_SC_CLK_TCK);
-#endif 
-
-using namespace std;
-using namespace ParaMEDMEM;
- 
-void testInterpKernelDEC_2D(const string& filename1, const string& meshname1,
-                            const string& filename2, const string& meshname2,
-                            int nproc_source, double epsilon, bool tri, bool all);
-void get_time( float *telps, float *tuser, float *tsys, float *tcpu );
-
-int main(int argc, char *argv[])
-{
-  string filename1, filename2;
-  string meshname1, meshname2;
-  int nproc_source=1, rank;
-  double epsilon=1.e-6;
-  int count=0;
-  bool tri=false;
-  bool all=false;
-
-  MPI_Init(&argc,&argv);
-
-  for(int i=1;i<argc;i++){
-    if( strcmp(argv[i],"-f1") == 0 ){
-      filename1 = argv[++i];
-      count++;
-    }
-    else if( strcmp(argv[i],"-f2") == 0 ){
-      filename2 = argv[++i];
-      count++;
-    }
-    else if( strcmp(argv[i],"-m1") == 0 ){
-      meshname1 = argv[++i];
-      count++;
-    }
-    else if( strcmp(argv[i],"-m2") == 0 ){
-      meshname2 = argv[++i];
-      count++;
-    }
-    else if( strcmp(argv[i],"-ns") == 0 ){
-      nproc_source = atoi(argv[++i]);
-    }
-    else if( strcmp(argv[i],"-eps") == 0 ){
-      epsilon = atof(argv[++i]);
-    }
-    else if( strcmp(argv[i],"-tri") == 0 ){
-      tri = true;
-    }
-    else if( strcmp(argv[i],"-all") == 0 ){
-      all = true;
-    }
-  }
-
-  if( count != 4 ){
-    cout << "usage test_perf -f1 filename1 -m1 meshname1 -f2 filename2 -m2 meshname2 (-ns nproc_source -eps epsilon -tri -all)" << endl;
-    exit(0);
-  }
-
-  MPI_Comm_rank(MPI_COMM_WORLD,&rank);
-  testInterpKernelDEC_2D(filename1,meshname1,filename2,meshname2,nproc_source,epsilon,tri,all);
-
-  MPI_Finalize();
-}
-
-void testInterpKernelDEC_2D(const string& filename_xml1, const string& meshname1,
-                            const string& filename_xml2, const string& meshname2,
-                            int nproc_source, double epsilon, bool tri, bool all)
-{
-  float tcpu, tcpu_u, tcpu_s, telps;
-  int size;
-  int rank;
-  MPI_Comm_size(MPI_COMM_WORLD,&size);
-  MPI_Comm_rank(MPI_COMM_WORLD,&rank);
- 
-  set<int> self_procs;
-  set<int> procs_source;
-  set<int> procs_target;
-  
-  for (int i=0; i<nproc_source; i++)
-    procs_source.insert(i);
-  for (int i=nproc_source; i<size; i++)
-    procs_target.insert(i);
-  self_procs.insert(rank);
-  
-  ParaMEDMEM::CommInterface interface;
-    
-  ParaMEDMEM::ProcessorGroup* self_group = new ParaMEDMEM::MPIProcessorGroup(interface,self_procs);
-  ParaMEDMEM::ProcessorGroup* target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target);
-  ParaMEDMEM::ProcessorGroup* source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source);
-  
-  //loading the geometry for the source group
-
-  ParaMEDMEM::InterpKernelDEC dec (*source_group,*target_group);
-  if(tri)
-    dec.setIntersectionType(INTERP_KERNEL::Triangulation);
-  else
-    dec.setIntersectionType(INTERP_KERNEL::Convex);
-
-  ParaMEDMEM::MEDCouplingUMesh* mesh;
-  ParaMEDMEM::ParaMESH* paramesh;
-  ParaMEDMEM::ParaFIELD* parafield;
-  ICoCo::Field* icocofield ;
-  
-  // To remove tmp files from disk
-  ParaMEDMEMTest_TmpFilesRemover aRemover;
-  
-  MPI_Barrier(MPI_COMM_WORLD);
-  if (source_group->containsMyRank()){
-    string master = filename_xml1;
-      
-    ostringstream strstream;
-    if( nproc_source == 1 )
-      strstream <<master<<".med";
-    else
-      strstream <<master<<rank+1<<".med";
-
-    ostringstream meshname ;
-    if( nproc_source == 1 )
-      meshname<< meshname1;
-    else
-      meshname<< meshname1<<"_"<< rank+1;
-      
-    get_time( &telps, &tcpu_u, &tcpu_s, &tcpu );
-    mesh=MEDLoader::ReadUMeshFromFile(strstream.str().c_str(),meshname.str().c_str(),0);
-    get_time( &telps, &tcpu_u, &tcpu_s, &tcpu );
-    if( rank == 0 )
-      cout << "IO : Telapse = " << telps << " TuserCPU = " << tcpu_u << " TsysCPU = " << tcpu_s << " TCPU = " << tcpu << endl;
-    mesh->incrRef();
-    
-    paramesh=new ParaMESH (mesh,*source_group,"source mesh");
-    
-    ParaMEDMEM::ComponentTopology comptopo;
-    parafield = new ParaFIELD(ON_CELLS, NO_TIME, paramesh, comptopo);
-
-    int nb_local=mesh->getNumberOfCells();
-    double *value=parafield->getField()->getArray()->getPointer();
-    for(int ielem=0; ielem<nb_local;ielem++)
-      value[ielem]=1.0;
-    
-    icocofield=new ICoCo::MEDField((MEDCouplingUMesh *)paramesh->getCellMesh(),parafield->getField());
-     
-    dec.attachLocalField(icocofield);
-  }
-  
-  //loading the geometry for the target group
-  if (target_group->containsMyRank()){
-    string master= filename_xml2;
-    ostringstream strstream;
-    if( (size-nproc_source) == 1 )
-      strstream << master<<".med";
-    else
-      strstream << master<<(rank-nproc_source+1)<<".med";
-    ostringstream meshname ;
-    if( (size-nproc_source) == 1 )
-      meshname<< meshname2;
-    else
-      meshname<< meshname2<<"_"<<rank-nproc_source+1;
-      
-    get_time( &telps, &tcpu_u, &tcpu_s, &tcpu );
-    mesh = MEDLoader::ReadUMeshFromFile(strstream.str().c_str(),meshname.str().c_str(),0);
-    get_time( &telps, &tcpu_u, &tcpu_s, &tcpu );
-    mesh->incrRef();
-
-    paramesh=new ParaMESH (mesh,*target_group,"target mesh");
-    ParaMEDMEM::ComponentTopology comptopo;
-    parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);
-
-    int nb_local=mesh->getNumberOfCells();
-    double *value=parafield->getField()->getArray()->getPointer();
-    for(int ielem=0; ielem<nb_local;ielem++)
-      value[ielem]=0.0;
-    icocofield=new ICoCo::MEDField((MEDCouplingUMesh *)paramesh->getCellMesh(),parafield->getField());
-      
-    dec.attachLocalField(icocofield);
-  }
-    
-  
-  //attaching a DEC to the source group 
-  double field_before_int;
-  double field_after_int;
-  
-  if (source_group->containsMyRank()){ 
-    field_before_int = parafield->getVolumeIntegral(0,true);
-    get_time( &telps, &tcpu_u, &tcpu_s, &tcpu );
-    dec.synchronize();
-    get_time( &telps, &tcpu_u, &tcpu_s, &tcpu );
-    if( rank == 0 )
-      cout << "SYNCHRONIZE : Telapse = " << telps << " TuserCPU = " << tcpu_u << " TsysCPU = " << tcpu_s << " TCPU = " << tcpu << endl;
-    cout<<"DEC usage"<<endl;
-    dec.setForcedRenormalization(false);
-    if(all)
-      dec.setAllToAllMethod(PointToPoint);
-
-    get_time( &telps, &tcpu_u, &tcpu_s, &tcpu );
-    dec.sendData();
-    
-    get_time( &telps, &tcpu_u, &tcpu_s, &tcpu );
-    if( rank == 0 )
-      cout << "SEND DATA : Telapse = " << telps << " TuserCPU = " << tcpu_u << " TsysCPU = " << tcpu_s << " TCPU = " << tcpu << endl;
-    dec.recvData();
-     
-    field_after_int = parafield->getVolumeIntegral(0,true);
-//    CPPUNIT_ASSERT_DOUBLES_EQUAL(field_before_int, field_after_int, epsilon);
-      
-  }
-  
-  //attaching a DEC to the target group
-  if (target_group->containsMyRank()){
-    get_time( &telps, &tcpu_u, &tcpu_s, &tcpu );
-    dec.synchronize();
-    get_time( &telps, &tcpu_u, &tcpu_s, &tcpu );
-    dec.setForcedRenormalization(false);
-    if(all)
-      dec.setAllToAllMethod(PointToPoint);
-
-    get_time( &telps, &tcpu_u, &tcpu_s, &tcpu );
-    dec.recvData();
-    get_time( &telps, &tcpu_u, &tcpu_s, &tcpu );
-    dec.sendData();
-  }
-  
-  get_time( &telps, &tcpu_u, &tcpu_s, &tcpu );
-  if( rank == 0 )
-    cout << "RECV DATA : Telapse = " << telps << " TuserCPU = " << tcpu_u << " TsysCPU = " << tcpu_s << " TCPU = " << tcpu << endl;
-
-  delete source_group;
-  delete target_group;
-  delete self_group;
-  delete paramesh;
-  delete parafield;
-  mesh->decrRef() ;
-  delete icocofield;
-
-  MPI_Barrier(MPI_COMM_WORLD);
-  cout << "end of InterpKernelDEC_2D test"<<endl;
-}
-
-void get_time( float *telps, float *tuser, float *tsys, float *tcpu )
-{
-
-  /* Variables declaration */
-  static time_t zsec = 0;
-  static long zusec = 0;
-  time_t nsec;
-  long nusec;
-  static clock_t zclock = 0;
-  clock_t nclock;
-  static clock_t zuser = 0;
-  static clock_t zsys = 0;
-  clock_t nuser, nsys;
-
-  struct timeval tp;
-  struct timezone tzp;
-  struct tms local;
-
-  MPI_Barrier(MPI_COMM_WORLD);
-
-  /* Elapsed time reading */
-
-  gettimeofday(&tp,&tzp);
-  nsec = tp.tv_sec;
-  nusec = tp.tv_usec;
-  *telps = (float)(nsec-zsec) + (float)(nusec-zusec)/(float)CLOCKS_PER_SEC;
-  
-  zsec = nsec;
-  zusec = nusec;
-
-  /* User and system CPU time reading */
-
-  times(&local);
-  nuser = local.tms_utime;
-  nsys = local.tms_stime;
-  *tuser = (float)(nuser-zuser) / (float)CLK_TCK;
-  *tsys = (float)(nsys-zsys) / (float)CLK_TCK;
-
-  zuser = nuser;
-  zsys = nsys;
-
-  /* CPU time reading */
-
-  nclock = clock();
-  *tcpu = (float)(nclock-zclock) / (float)CLOCKS_PER_SEC;
-  zclock = nclock;
-
-}
-
-
diff --git a/src/ParaMEDMEM_Swig/test_InterpKernelDEC.py b/src/ParaMEDMEM_Swig/test_InterpKernelDEC.py
deleted file mode 100755
index 2a9a77d29..000000000
--- a/src/ParaMEDMEM_Swig/test_InterpKernelDEC.py
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/usr/bin/env python
-#  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2010  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
-#
-
-from libParaMEDMEM_Swig import *
-import sys, os
-import unittest
-import math
-
-class ParaMEDMEMBasicsTest(unittest.TestCase):
-    def testInterpKernelDEC_2D(self):
-        MPI_Init(sys.argv)
-        size = MPI_Comm_size(MPI_COMM_WORLD)
-        rank = MPI_Comm_rank(MPI_COMM_WORLD)
-        if size != 5:
-            raise RuntimeError, "Expect MPI_COMM_WORLD size == 5"
-        print rank
-        nproc_source = 3
-        procs_source = range( nproc_source )
-        procs_target = range( size - nproc_source + 1, size)
-        
-        interface = CommInterface()
-        target_group = MPIProcessorGroup(interface, procs_target)
-        source_group = MPIProcessorGroup(interface, procs_source)
-        dec = InterpKernelDEC(source_group, target_group)
-        
-        mesh       =0
-        support    =0
-        paramesh   =0
-        parafield  =0
-        icocofield =0
-        data_dir = os.environ['MED_ROOT_DIR']
-        tmp_dir  = os.environ['TMP']
-        
-        if not tmp_dir or len(tmp_dir)==0:
-            tmp_dir = "/tmp"
-            pass
-        
-        filename_xml1 = os.path.join(data_dir, "share/salome/resources/med/square1_split")
-        filename_xml2 = os.path.join(data_dir, "share/salome/resources/med/square2_split")
-        
-        MPI_Barrier(MPI_COMM_WORLD)
-        if source_group.containsMyRank():
-            filename = filename_xml1 + str(rank+1) + ".med"
-            meshname = "Mesh_2_" + str(rank+1)
-            mesh=MEDLoader.ReadUMeshFromFile(filename,meshname,0)
-            paramesh=ParaMESH(mesh,source_group,"source mesh")
-            comptopo = ComponentTopology()
-            parafield = ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo)
-            parafield.getField().setNature(ConservativeVolumic)
-            nb_local=mesh.getNumberOfCells()
-            value = [1.0]*nb_local
-            parafield.getField().setValues(value)
-            icocofield = ICoCoMEDField(mesh,parafield.getField())
-            dec.setMethod("P0")
-            dec.attachLocalField(icocofield)
-            pass
-        else:
-            filename = filename_xml2 + str(rank - nproc_source + 1) + ".med"
-            meshname = "Mesh_3_" + str(rank - nproc_source + 1)
-            mesh=MEDLoader.ReadUMeshFromFile(filename,meshname,0)
-            paramesh=ParaMESH(mesh,target_group,"target mesh")
-            comptopo = ComponentTopology()
-            parafield = ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo)
-            parafield.getField().setNature(ConservativeVolumic)
-            nb_local=mesh.getNumberOfCells()
-            value = [0.0]*nb_local
-            parafield.getField().setValues(value)
-            icocofield = ICoCoMEDField(mesh,parafield.getField())
-            dec.setMethod("P0")
-            dec.attachLocalField(icocofield)
-            pass
-        
-        if source_group.containsMyRank():
-            field_before_int = parafield.getVolumeIntegral(0,True)
-            dec.synchronize()
-            dec.setForcedRenormalization(False)
-            dec.sendData()
-            dec.recvData()
-            field_after_int=parafield.getVolumeIntegral(0,True);
-            self.failUnless(math.fabs(field_after_int-field_before_int)<1e-8)
-            pass
-        else:
-            dec.synchronize()
-            dec.setForcedRenormalization(False)
-            dec.recvData()
-            dec.sendData()
-            pass
-        ## end
-        interface = 0
-        target_group = 0
-        source_group = 0
-        dec = 0
-        mesh       =0
-        support    =0
-        paramesh   =0
-        parafield  =0
-        icocofield =0
-        MPI_Barrier(MPI_COMM_WORLD)
-        MPI_Finalize()
-        pass
-    pass
-
-unittest.main()
diff --git a/src/ParaMEDMEM_Swig/test_IntersectionDEC.py b/src/ParaMEDMEM_Swig/test_IntersectionDEC.py
new file mode 100755
index 000000000..c36cb6cf0
--- /dev/null
+++ b/src/ParaMEDMEM_Swig/test_IntersectionDEC.py
@@ -0,0 +1,148 @@
+#!/usr/bin/env python
+
+# Copyright (C) 2005  OPEN CASCADE, CEA, EDF R&D, LEG
+#           PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
+# 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
+# 
+from ParaMEDMEM import *
+import sys, os
+
+# testIntersectionDEC_2D
+
+MPI_Init(sys.argv)
+
+size = MPI_Comm_size(MPI_COMM_WORLD)
+rank = MPI_Comm_rank(MPI_COMM_WORLD)
+if size != 5:
+    raise RuntimeError, "Expect MPI_COMM_WORLD size == 5"
+
+nproc_source = 3
+procs_source = range( nproc_source )
+procs_target = range( size - nproc_source + 1, size)
+
+interface = CommInterface()
+
+target_group = MPIProcessorGroup(interface, procs_target)
+source_group = MPIProcessorGroup(interface, procs_source)
+
+dec = IntersectionDEC(source_group, target_group)
+
+mesh       =0
+support    =0
+paramesh   =0
+parafield  =0
+parasupport=0
+icocofield =0
+
+data_dir = os.environ['MED_ROOT_DIR']
+tmp_dir  = os.environ['TMP']
+
+if not tmp_dir or len(tmp_dir)==0:
+    tmp_dir = "/tmp"
+    pass
+
+filename_xml1 = os.path.join(data_dir, "share/salome/resources/med/square1_split")
+filename_xml2 = os.path.join(data_dir, "share/salome/resources/med/square2_split")
+
+MPI_Barrier(MPI_COMM_WORLD)
+
+if source_group.containsMyRank():
+
+    filename = filename_xml1 + str(rank+1) + ".med"
+    meshname = "Mesh_2_" + str(rank+1)
+
+    mesh = MESH(MED_DRIVER, filename, meshname)
+    support = SUPPORT(mesh, "all elements", MED_CELL)
+    paramesh = ParaMESH(mesh, source_group, "source mesh")
+
+    parasupport = UnstructuredParaSUPPORT( support, source_group)
+    comptopo = ComponentTopology()
+
+    parafield = ParaFIELD(parasupport, comptopo)
+
+    nb_local = support.getNumberOfElements(MED_ALL_ELEMENTS);
+
+    value = [1.0]*nb_local
+
+    parafield.getField().setValue(value)
+    icocofield = ICoCo_MEDField(paramesh,parafield)
+    dec.attachLocalField(icocofield,'P0')
+    pass
+
+if target_group.containsMyRank():
+
+    filename = filename_xml2 + str(rank - nproc_source + 1) + ".med"
+    meshname = "Mesh_3_" + str(rank - nproc_source + 1)
+
+    mesh = MESH(MED_DRIVER, filename, meshname)
+    support = SUPPORT(mesh, "all elements", MED_CELL)
+    paramesh = ParaMESH(mesh, target_group, "target mesh")
+
+    parasupport = UnstructuredParaSUPPORT( support, target_group)
+    comptopo = ComponentTopology()
+    parafield = ParaFIELD(parasupport, comptopo)
+
+    nb_local = support.getNumberOfElements(MED_ALL_ELEMENTS)
+    value = [0.0]*nb_local
+
+    parafield.getField().setValue(value)
+    icocofield = ICoCo_MEDField(paramesh,parafield)
+
+    dec.attachLocalField(icocofield, 'P0')
+    pass
+
+if source_group.containsMyRank():
+    field_before_int = parafield.getVolumeIntegral(1)
+    dec.synchronize()
+    print "DEC usage"
+    dec.setForcedRenormalization(False)
+
+    dec.sendData()
+    print "writing 1"
+    paramesh.write(MED_DRIVER,"./sourcesquareb");
+    filename = "./sourcesquareb_" + str(source_group.myRank()+1)
+    parafield.write(MED_DRIVER, "./sourcesquareb", "boundary");
+
+    print "b dec.recvData()"
+    dec.recvData()
+    print "writing 2"
+    paramesh.write(MED_DRIVER, "./sourcesquare")
+    parafield.write(MED_DRIVER, "./sourcesquare", "boundary")
+
+    filename = "./sourcesquare_" + str(source_group.myRank()+1)
+    field_after_int = parafield.getVolumeIntegral(1)
+    print "field_before_int", field_before_int,"field_after_int", field_after_int
+
+    pass
+
+if target_group.containsMyRank():
+    dec.synchronize()
+    print "TARGET: after dec.synchronize()"
+    dec.setForcedRenormalization(False)
+
+    dec.recvData()
+    paramesh.write(0, "./targetsquareb")
+    parafield.write(0, "./targetsquareb", "boundary")
+    dec.sendData();
+    paramesh.write(0, "./targetsquare")
+    parafield.write(0, "./targetsquare", "boundary")
+    pass
+
+
+MPI_Barrier(MPI_COMM_WORLD)
+MPI_Finalize()
+print "### End of testIntersectionDEC_2D"
diff --git a/src/RENUMBER/Makefile.am b/src/RENUMBER/Makefile.am
deleted file mode 100644
index 397ed5c44..000000000
--- a/src/RENUMBER/Makefile.am
+++ /dev/null
@@ -1,94 +0,0 @@
-#  Copyright (C) 2007-2010  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
-#
-
-#  MED MEDMEM : MED files in memory
-#
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-# this directory must be recompiled before Test folder
-
-if CPPUNIT_IS_OK
-# SUBDIRS=. Test
-endif
-
-lib_LTLIBRARIES= librenumber.la
-
-salomeinclude_HEADERS= \
-RENUMBER_Renumbering.hxx \
-RenumberingFactory.hxx
-
-if MED_ENABLE_METIS
-    salomeinclude_HEADERS+= RENUMBER_METISRenumbering.hxx
-endif
-if BOOST_IS_OK
-    salomeinclude_HEADERS+= RENUMBER_BOOSTRenumbering.hxx
-endif
-
-dist_librenumber_la_SOURCES= \
-RENUMBER_Renumbering.cxx \
-RenumberingFactory.cxx
-
-if MED_ENABLE_METIS
-    dist_librenumber_la_SOURCES+= RENUMBER_METISRenumbering.cxx
-endif
-if BOOST_IS_OK
-    dist_librenumber_la_SOURCES+= RENUMBER_BOOSTRenumbering.cxx 
-endif
-
-librenumber_la_CPPFLAGS= $(MED2_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
-	$(BOOST_CPPFLAGS) \
-	-I$(srcdir)/../MEDMEM -I$(srcdir)/../MEDWrapper/V2_1/Core -I$(srcdir)/../INTERP_KERNEL/Bases
-
-librenumber_la_LDFLAGS= 
-#libmedsplitter_la_LDFLAGS= $(MED2_LIBS) $(HDF5_LIBS) $(STDLIB) \
-#	../MEDMEM/libmedmem.la ../MEDWrapper/V2_1/Core/libmed_V2_1.la
-
-if MED_ENABLE_METIS
-  librenumber_la_CPPFLAGS+= $(METIS_CPPFLAGS)
-  librenumber_la_LDFLAGS+= $(METIS_LIBS)
-endif 
-if BOOST_IS_OK
-  librenumber_la_CPPFLAGS+= $(BOOST_CPPFLAGS) -DENABLE_BOOST
-  librenumber_la_LDFLAGS+= $(BOOST_LIBS)
-endif
-if MED_ENABLE_KERNEL
-  librenumber_la_CPPFLAGS+= ${KERNEL_CXXFLAGS}
-  librenumber_la_LDFLAGS+= ${KERNEL_LDFLAGS} -lSALOMELocalTrace 
-endif
-
-librenumber_la_LDFLAGS+= $(MED2_LIBS) $(HDF5_LIBS) $(STDLIB) \
-	../MEDMEM/libmedmem.la ../MEDWrapper/V2_1/Core/libmed_V2_1.la  ../INTERP_KERNEL/libinterpkernel.la
-
-# Executables targets
-bin_PROGRAMS= renumber
-
-dist_renumber_SOURCES= renumbering.cxx
-
-renumber_CPPFLAGS= $(librenumber_la_CPPFLAGS)
-renumber_LDADD= $(librenumber_la_LDFLAGS) -lm $(BOOST_LIBS) librenumber.la
-if MED_ENABLE_KERNEL
-  renumber_LDADD+= -lSALOMEBasics
-endif
-
-OBSOLETE_FILES = 
-#	MEDSPLITTER_SequentialTopology.cxx \
-#	test_HighLevelAPI.cxx
-
-EXTRA_DIST += $(OBSOLETE_FILES) testRenumbering.py
-
diff --git a/src/RENUMBER/RENUMBER_BOOSTRenumbering.cxx b/src/RENUMBER/RENUMBER_BOOSTRenumbering.cxx
deleted file mode 100644
index deef9f1f7..000000000
--- a/src/RENUMBER/RENUMBER_BOOSTRenumbering.cxx
+++ /dev/null
@@ -1,53 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include <boost/config.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/cuthill_mckee_ordering.hpp>
-#include <boost/graph/properties.hpp>
-#include <boost/graph/bandwidth.hpp>
-
-#include "RENUMBER_BOOSTRenumbering.hxx"
-
-void BOOSTRenumbering::renumber(const int* graph,const int* index_graph,int nb_cell,std::vector<int>& iperm,std::vector<int>& perm)
-{
-  iperm.resize(nb_cell,0);
-  perm.resize(nb_cell,0);
-
-  typedef boost::adjacency_list<boost::vecS, boost::vecS, boost::undirectedS, 
-     boost::property<boost::vertex_color_t, boost::default_color_type,
-       boost::property<boost::vertex_degree_t,int> > > Graph;
-  typedef boost::graph_traits<Graph>::vertex_descriptor Vertex;
-  typedef boost::graph_traits<Graph>::vertices_size_type size_type;
-  Graph G(nb_cell);
-  for (int i=0;i<nb_cell;++i)
-    for (int j=index_graph[i]-1;j<index_graph[i+1]-1;++j)
-      add_edge(i,graph[j]-1,G);
-  boost::property_map<Graph, boost::vertex_index_t>::type
-    index_map = boost::get(boost::vertex_index, G);
-  boost::cuthill_mckee_ordering(G, iperm.rbegin(), boost::get(boost::vertex_color, G),
-                           boost::make_degree_map(G));
-  for (size_type c = 0; c != iperm.size(); ++c)
-    perm[index_map[iperm[c]]] = c;
-  for(int i=0;i<nb_cell;++i)
-    {
-      perm[i]+=1;
-      iperm[i]+=1;
-    }
-}
diff --git a/src/RENUMBER/RENUMBER_BOOSTRenumbering.hxx b/src/RENUMBER/RENUMBER_BOOSTRenumbering.hxx
deleted file mode 100644
index 04f30d9ec..000000000
--- a/src/RENUMBER/RENUMBER_BOOSTRenumbering.hxx
+++ /dev/null
@@ -1,31 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef BOOSTRENUMBERING_HXX_
-#define BOOSTRENUMBERING_HXX_
-
-#include "RENUMBER_Renumbering.hxx"
-
-class BOOSTRenumbering:public Renumbering
-{
-public:
-  virtual void renumber(const int* graph,const int* index_graph,int nb_cell,std::vector<int>& iperm,std::vector<int>& perm);
-};
-
-#endif /*BOOSTRENUMBERING_HXX_*/
diff --git a/src/RENUMBER/RENUMBER_METISRenumbering.cxx b/src/RENUMBER/RENUMBER_METISRenumbering.cxx
deleted file mode 100644
index 3a98fdf0c..000000000
--- a/src/RENUMBER/RENUMBER_METISRenumbering.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-extern "C"
-{
-#include "metis.h"
-}
-
-#include "RENUMBER_METISRenumbering.hxx"
-
-void METISRenumbering::renumber(const int* graph,const int* index_graph,int nb_cell,std::vector<int>& iperm,std::vector<int>& perm)
-{
-  iperm.resize(nb_cell,0);
-  perm.resize(nb_cell,0);
-  int num_flag=1;
-  int options=0;
-  METIS_NodeND(&nb_cell,(int*)index_graph,(int*)graph,&num_flag,&options,&iperm[0],&perm[0]);
-}
diff --git a/src/RENUMBER/RENUMBER_METISRenumbering.hxx b/src/RENUMBER/RENUMBER_METISRenumbering.hxx
deleted file mode 100644
index f590a0ebd..000000000
--- a/src/RENUMBER/RENUMBER_METISRenumbering.hxx
+++ /dev/null
@@ -1,31 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef METISRENUMBERING_HXX_
-#define METISRENUMBERING_HXX_
-
-#include "RENUMBER_Renumbering.hxx"
-
-class METISRenumbering:public Renumbering
-{
-public:
-  virtual void renumber(const int* graph,const int* index_graph,int nb_cell,std::vector<int>& iperm,std::vector<int>& perm);
-};
-
-#endif /*METISRENUMBERING_HXX_*/
diff --git a/src/RENUMBER/RENUMBER_Renumbering.cxx b/src/RENUMBER/RENUMBER_Renumbering.cxx
deleted file mode 100644
index 83f12ed41..000000000
--- a/src/RENUMBER/RENUMBER_Renumbering.cxx
+++ /dev/null
@@ -1,19 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
diff --git a/src/RENUMBER/RENUMBER_Renumbering.hxx b/src/RENUMBER/RENUMBER_Renumbering.hxx
deleted file mode 100644
index 2c5afe43e..000000000
--- a/src/RENUMBER/RENUMBER_Renumbering.hxx
+++ /dev/null
@@ -1,30 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef RENUMBERING_HXX_
-#define RENUMBERING_HXX_
-#include <vector>
-
-class Renumbering
-{
-public:
-  virtual void renumber(const int* graphe,const int* index_graphe,int nb_cell,std::vector<int>& iperm,std::vector<int>& perm)=0;
-}; 
-
-#endif /*RENUMBERING_HXX_*/
diff --git a/src/RENUMBER/RenumberingFactory.cxx b/src/RENUMBER/RenumberingFactory.cxx
deleted file mode 100644
index 36f256929..000000000
--- a/src/RENUMBER/RenumberingFactory.cxx
+++ /dev/null
@@ -1,83 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include "RenumberingFactory.hxx"
-#include "RENUMBER_Renumbering.hxx"
-#ifdef ENABLE_METIS
-#include "RENUMBER_METISRenumbering.hxx"
-#endif
-#ifdef ENABLE_BOOST
-#include "RENUMBER_BOOSTRenumbering.hxx"
-#endif
-
-#include <iostream>
-
-using namespace std;
-
-namespace MED_RENUMBER
-{
-  Renumbering* RenumberingFactory(const string &s)
-  {
-#ifdef ENABLE_METIS
-#ifdef ENABLE_BOOST
-    if (s=="METIS")
-      {
-        return new METISRenumbering;
-      }
-    else if(s=="BOOST")
-      {
-        return new BOOSTRenumbering;
-      }
-    else 
-      {
-        std::cerr << "The method has to be METIS or BOOST" << std::endl;
-        return 0;
-      }
-#endif
-#ifndef ENABLE_BOOST
-    if (s=="METIS")
-      {
-        return new METISRenumbering;
-      }
-    else
-      {
-        std::cerr << "The method has to be METIS!" << std::endl;
-        return 0;
-      }
-#endif
-#endif
-#ifndef ENABLE_METIS
-#ifdef ENABLE_BOOST
-    if (s=="BOOST")
-      {
-        return new BOOSTRenumbering;
-      }
-    else
-      {
-        std::cerr << "The method has to be BOOST!" << std::endl;
-        return 0;
-      }
-#endif
-#ifndef ENABLE_BOOST
-    std::cerr << "Error, no method compiled" << std::endl;
-    return 0;
-#endif
-#endif
-  }
-}
diff --git a/src/RENUMBER/RenumberingFactory.hxx b/src/RENUMBER/RenumberingFactory.hxx
deleted file mode 100644
index 3ddd2cab8..000000000
--- a/src/RENUMBER/RenumberingFactory.hxx
+++ /dev/null
@@ -1,31 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#ifndef RENUMBERINGFACTORY_HXX_
-#define RENUMBERINGFACTORY_HXX_
-
-#include <string>
-#include "RENUMBER_Renumbering.hxx"
-
-namespace MED_RENUMBER
-{
-  Renumbering* RenumberingFactory(const std::string& s);
-}
-
-#endif /*RENUMBERINGFACTORY_HXX_*/
diff --git a/src/RENUMBER/renumbering.cxx b/src/RENUMBER/renumbering.cxx
deleted file mode 100644
index c06003951..000000000
--- a/src/RENUMBER/renumbering.cxx
+++ /dev/null
@@ -1,366 +0,0 @@
-//  Copyright (C) 2007-2010  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
-//
-
-#include <string>
-#include <stdlib.h>
-#include <iostream>
-#include <fstream>
-
-#include "MEDMEM_Family.hxx"
-#include "MEDMEM_Mesh.hxx"
-#include "MEDMEM_Meshing.hxx"
-#include "MEDMEM_MedMeshDriver.hxx"
-#include "MEDMEM_Connectivity.hxx"
-#include "MEDMEM_Field.hxx"
-#include "MEDMEM_DriversDef.hxx"
-#include "MEDMEM_Med.hxx"
-#include "MEDMEM_MedMeshDriver22.hxx"
-
-#include "RenumberingFactory.hxx"
-
-#include <time.h>
-using namespace MEDMEM;
-using namespace std;
-using namespace MED_EN;
-using namespace MED_RENUMBER;
-
-void computeNeighbour(const MESH* mesh,const medGeometryElement& Type, vector<list<int> >& neighbour, int& ntot,int& nb_cell)
-{
-  CONNECTIVITY* conn = (CONNECTIVITY*)mesh->getConnectivityptr();
-  conn->calculateFullDescendingConnectivity(MED_CELL);
-  const int* rev_conn=mesh->getReverseConnectivity(MED_EN::MED_DESCENDING, MED_EN::MED_CELL);
-  const int* rev_conn_index=mesh->getReverseConnectivityIndex(MED_EN::MED_DESCENDING, MED_EN::MED_CELL);
-  int nb_face= mesh->getNumberOfElementsWithPoly(MED_FACE,MED_ALL_ELEMENTS);
-  int nb_edge = mesh->getNumberOfElementsWithPoly(MED_EDGE,MED_ALL_ELEMENTS);
-  nb_cell= mesh->getNumberOfElementsWithPoly(MED_CELL,Type);
-
-  int nb_constituent;
-  if(mesh->getMeshDimension()==2)
-    nb_constituent = nb_edge;
-  else if (mesh->getMeshDimension()==3)
-    nb_constituent = nb_face;
-  else
-    throw MEDEXCEPTION("Wrong dimension");
-
-  neighbour.resize(nb_cell,(list<int>)0);
-  ntot=0;
-  for(int i=0;i<nb_constituent;++i)
-    {
-      for(int j=rev_conn_index[i]-1;j<rev_conn_index[i+1]-1;++j)
-        {
-          for(int k=j+1;k<rev_conn_index[i+1]-1;++k)
-            {
-              if(rev_conn[j]!=0 && rev_conn[k]!=0)
-                {
-                  ntot+=2;
-                  neighbour[rev_conn[j]-1].push_back(rev_conn[k]);
-                  neighbour[rev_conn[k]-1].push_back(rev_conn[j]);
-                }
-            }
-        }
-    }
-}
-
-void changeConnectivity(MESH& mesh, const medGeometryElement& Type, const int& nb_cell, const vector<int>& iperm)
-{
-  if(Type==MED_POLYHEDRA)
-    {
-      int *conn_face_index_init=(int*)mesh.getPolyhedronFacesIndex();
-      int *conn_index_init=(int*)mesh.getPolyhedronIndex(MED_FULL_INTERLACE);
-      int *conn_init=(int*)mesh.getPolyhedronConnectivity(MED_FULL_INTERLACE);
-
-      int *conn_index_renum=new int[nb_cell+1];
-      int *conn_face_index_renum=new int[conn_index_init[nb_cell]];
-      int *conn_renum=new int[conn_face_index_init[conn_index_init[nb_cell]-1]-1];
-
-      int i_cell,i_face,i_conn;
-      int iter_face=0;
-      int iter_conn=0;
-      int i2;
-      conn_index_renum[0]=1;
-      conn_face_index_renum[0]=1;
-      for(i_cell=0;i_cell<nb_cell;++i_cell)
-        {
-          i2=iperm[i_cell]-1;
-          for(i_face=conn_index_init[i2]-1;i_face<conn_index_init[i2+1]-1;++i_face)
-            {
-              for(i_conn=conn_face_index_init[i_face]-1;i_conn<conn_face_index_init[i_face+1]-1;++i_conn)
-                {
-                  conn_renum[iter_conn]=conn_init[i_conn];
-                  ++iter_conn;
-                }
-              conn_face_index_renum[iter_face+1]=iter_conn+1;
-              ++iter_face;
-            }
-          conn_index_renum[i_cell+1]=iter_face+1;
-        }
-      memcpy(conn_face_index_init,conn_face_index_renum,sizeof(int)*conn_index_init[nb_cell]);
-      memcpy(conn_index_init,conn_index_renum,sizeof(int)*(nb_cell+1));
-      memcpy(conn_init,conn_renum, sizeof(int)*(conn_face_index_init[conn_index_init[nb_cell]-1]-1));
-
-      delete[] conn_index_renum;
-      delete[] conn_face_index_renum;
-      delete[] conn_renum;
-    }
-  else if (Type==MED_POLYGON)
-    {
-      int *conn_init=(int*)mesh.getPolygonsConnectivity(MED_FULL_INTERLACE,MED_CELL);
-      int *conn_index_init=(int*)mesh.getPolygonsConnectivityIndex(MED_FULL_INTERLACE,MED_CELL);
-      int *conn_index_renum=new int[nb_cell+1];
-      int *conn_renum=new int[conn_index_init[nb_cell]-1];
-
-      int iter=0;
-      int i2;
-      conn_index_renum[0]=1;
-      for(int i=0;i<nb_cell;++i)
-        {
-          i2=iperm[i]-1;
-          for(int k=conn_index_init[i2];k<conn_index_init[i2+1];++k)
-            {
-              conn_renum[iter]=conn_init[k-1];
-              ++iter;
-            }
-          conn_index_renum[i+1]=iter+1;
-        }
-      memcpy(conn_index_init,conn_index_renum,sizeof(int)*(nb_cell+1));
-      memcpy(conn_init,conn_renum, sizeof(int)*(conn_index_init[nb_cell]-1));
-
-      delete[] conn_renum;
-      delete[] conn_index_renum;
-    }
-  else
-    {
-      const int *conn_init=mesh.getConnectivity(MED_FULL_INTERLACE,MED_NODAL,MED_CELL,Type);
-      const int *conn_index_init=mesh.getConnectivityIndex(MED_NODAL,MED_CELL);
-      int *conn_renum=new int[conn_index_init[nb_cell]-1];
-      int *conn_index_renum=new int[nb_cell+1];
-
-      int iter=0;
-      int i2;
-      conn_index_renum[0]=1;
-      for(int i=0;i<nb_cell;++i)
-        {
-          i2=iperm[i]-1;
-          for(int k=conn_index_init[i2];k<conn_index_init[i2+1];++k)
-            {
-              conn_renum[iter]=conn_init[k-1];
-              ++iter;
-            }
-          conn_index_renum[i+1]=iter+1;
-        }
-
-      CONNECTIVITY* myConnectivity=(CONNECTIVITY*)mesh.getConnectivityptr();
-      myConnectivity->setNodal(conn_renum,MED_CELL,Type);
-      delete[] conn_renum;
-      delete[] conn_index_renum;
-    }
-}
-
-void changeFamily(MESH* mesh, const medGeometryElement& Type, const vector<int>& perm)
-{
-  int nb_families=mesh->getNumberOfFamilies(MED_CELL);
-  for (int i=0;i<nb_families;++i)
-    {
-      const FAMILY* family=mesh->getFamily(MED_CELL,i+1);
-      if (!family->isOnAllElements())
-        {
-          int nb_elem=family->getNumberOfElements(Type);
-          int *number=(int *)family->getNumber(Type);
-          for(int j=0;j<nb_elem;++j)
-            number[j]=perm[number[j]-1];
-        }
-    }
-}
-
-int main (int argc, char** argv)
-{
-  double t_begin,t_read_st,t_read_mesh,t_compute_graph,t_connectiv,t_family,t_field;
-  t_begin=clock();
-  if (argc <5)
-    {
-      cerr << "Usage : " << argv[0] 
-           << " filename_in meshname method[BOOST/METIS] filename_out" << endl << endl;
-      return -1;
-    }
-  string filename_in = argv[1];
-  string meshname = argv[2];
-  string type_renum = argv[3];
-  string filename_out = argv[4];
-
-  if(type_renum!="METIS" && type_renum!="BOOST")
-    {
-      cout << "The method has to be METIS or BOOST!" << endl;
-      exit(-1);
-    }
-
-  string s="rm "+filename_out;
-  system(s.c_str());
-
-  // Reading file structure
-  const MED med_struct (MED_DRIVER,filename_in);
-  int nb_mesh, nb_fields;
-  deque<string> mesh_names,f_names;
-  nb_mesh=med_struct.getNumberOfMeshes();
-  nb_fields=med_struct.getNumberOfFields();
-  mesh_names=med_struct.getMeshNames();
-  f_names=med_struct.getFieldNames();
-  if(nb_mesh!=1)
-    {
-      cout << "There are many meshes in the file" << endl;
-      return -1;
-    }
-  if(mesh_names[0].c_str()!=meshname)
-    {
-      cout << "Mesh name does not match" << endl;
-      return -1;
-    }
-  vector<string> field_names;
-  vector<int> iternumber;
-  vector<int> ordernumber;
-  vector<int> types;
-  int nb_fields_tot=0;
-  for (int ifield = 0; ifield < nb_fields; ifield++)
-    {
-      deque<DT_IT_> dtit=med_struct.getFieldIteration(f_names[ifield]);
-      for (deque<DT_IT_>::const_iterator iter =dtit.begin(); iter!=dtit.end(); iter++)
-        {
-          field_names.push_back(f_names[ifield]);
-          iternumber.push_back(iter->dt);
-          ordernumber.push_back(iter->it);
-          ++nb_fields_tot;
-          FIELD_* field = med_struct.getField(f_names[ifield],iter->dt,iter->it);
-          if (dynamic_cast<FIELD<double>*>(field))
-            types.push_back(1);
-          else
-            types.push_back(0);
-
-        }
-    }
-  t_read_st=clock();
-
-  // Reading mesh
-  MESH myMesh;
-  myMesh.setName(meshname);
-  MED_MESH_RDONLY_DRIVER22 *drv22=new MED_MESH_RDONLY_DRIVER22(filename_in,&myMesh);
-  drv22->desactivateFacesComputation();
-  int newDrv=myMesh.addDriver(*drv22);
-  delete drv22;
-  myMesh.read(newDrv);
-  int nb_type=myMesh.getNumberOfTypesWithPoly(MED_CELL);
-  if (nb_type!=1)
-    {
-      cout << "Mesh must have only one type of cell" << endl;
-      return -1;
-    }
-  medGeometryElement *Types = myMesh.getTypesWithPoly(MED_CELL);
-  medGeometryElement Type=Types[0];
-  delete[] Types;
-
-  t_read_mesh=clock();
-  MESH* workMesh=new MESH(myMesh);
-  cout << "Building the graph    ";
-  cout.flush();
-  int ntot,nb_cell;
-  vector<list<int> > neighbour;
-  computeNeighbour(workMesh,Type,neighbour,ntot,nb_cell);
-  int* graph=new int[ntot];
-  int* graph_index=new int[nb_cell+1];
-  graph_index[0]=1;
-  int count=0;
-  for(int i=0;i<nb_cell;++i)
-    {
-      for (list<int>::const_iterator it=neighbour[i].begin();it!=neighbour[i].end();++it)
-        {
-          graph[count]=*it;
-          ++count;
-        }
-      graph_index[i+1]=count+1;
-    }
-
-
-  // Compute permutation
-  vector<int> iperm,perm;
-  Renumbering* renumb= RenumberingFactory(type_renum);
-  renumb->renumber(graph,graph_index,nb_cell,iperm,perm);
-  delete renumb;
-  delete workMesh;
-  t_compute_graph=clock();
-  cout << " : " << (t_compute_graph-t_read_mesh)/(double) CLOCKS_PER_SEC << "s" << endl;
-  cout.flush();
-
-  // Connectivity
-  cout << "Computing connectivity";
-  cout.flush();
-  MESH meshRenum(myMesh);
-  changeConnectivity(meshRenum,Type,nb_cell,iperm);
-  t_connectiv=clock();
-  cout << " : " << (t_connectiv-t_compute_graph)/(double) CLOCKS_PER_SEC << "s" << endl;
-  cout.flush();
-
-  // Familles
-  cout << "Computing families    ";
-  cout.flush();
-  changeFamily(&meshRenum,Type,perm);
-  int drv3=meshRenum.addDriver(MED_DRIVER,filename_out,meshRenum.getName());
-  meshRenum.write(drv3);
-  t_family=clock();
-  cout << " : " << (t_family-t_connectiv)/(double) CLOCKS_PER_SEC << "s" << endl;
-  cout.flush();
-
-  // Fields
-  cout << "Computing fields      ";
-  cout.flush();
-  bool exist_type;
-  for(int ifield=0;ifield<nb_fields_tot;++ifield)
-    {
-      exist_type=false;
-      FIELD<double> myField(MED_DRIVER,filename_in,field_names[ifield],iternumber[ifield],ordernumber[ifield]);
-      FIELD<double> newField(myField);
-      const SUPPORT* mySupport=newField.getSupport();
-      const medGeometryElement *typesOfSupport = mySupport->getTypes();
-      for(int t=0;t<mySupport->getNumberOfTypes();++t)
-        {
-          if(typesOfSupport[t]==Type)
-            {
-              exist_type=true;
-              break;
-            }
-        }
-      if(exist_type)
-        {
-          for(int i=0;i<mySupport->getNumberOfElements(Type);++i)
-            {
-              for(int j=0;j<newField.getNumberOfComponents();++j)
-                {
-                  newField.setValueIJ(i+1,j+1,myField.getValueIJ(iperm[i],j+1));
-                }
-            }
-        }
-      int drv=newField.addDriver(MED_DRIVER,filename_out,field_names[ifield]);
-      newField.write(drv);
-    }
-  t_field=clock();
-  cout << " : " << (t_field-t_family)/(double) CLOCKS_PER_SEC << "s" << endl;
-  cout.flush();
-
-  delete[] graph_index;
-  delete[] graph;
-
-  return 0;
-}
diff --git a/src/RENUMBER/testRenumbering.py b/src/RENUMBER/testRenumbering.py
deleted file mode 100755
index 3f2ecba5c..000000000
--- a/src/RENUMBER/testRenumbering.py
+++ /dev/null
@@ -1,321 +0,0 @@
-#!/usr/bin/env python
-#  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2010  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
-#
-
-from libMEDMEM_Swig import *
-import os
-import sys
-
-##                                         ***************
-##                                         *** TEST 2D ***
-##                                         ***************
-srcdir   = os.getenv("srcdir")
-med_root = os.getenv("MED_ROOT_DIR")
-if srcdir:
-    # make check is being performed
-    dir_renumber="./renumber"
-    dir_mesh = os.path.join( srcdir, "../../resources")
-elif med_root:
-    # hope renumber has been already installed
-    dir_renumber=os.path.join( med_root, "bin/salome/renumber")
-    dir_mesh = os.path.join( med_root, "share/salome/resources/med")
-else:
-    # initial version
-    dir_renumber="../../../MED_INSTALL/bin/salome/renumber"
-    dir_mesh="../../resources"
-
-filename="Test2D.med"
-meshname="Mesh_1"
-
-print "TEST 2D Boost"
-method="BOOST"
-string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
-eval("os.system("+string_to_execute+")")
-m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-
-field_ini=[2,3,12,13,14,15,4,5,6,7,8,9,16,17,0,1,10,11]
-s = SUPPORT(m,"Support on all",MED_CELL)
-f = FIELDDOUBLE(s,2)
-id=f.addDriver(MED_DRIVER,dir_mesh+"/out_"+filename,"Test field")
-f.read(id);
-field=True
-for i in range(9):
-    field=field&(f.getValueIJ(i+1,1)==field_ini[i*2])
-    field=field&(f.getValueIJ(i+1,2)==field_ini[i*2+1])
-f.rmDriver(id)
-
-nbcell2dboost=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
-connectivite=[2,6,13,11,11,13,14,12,6,5,15,13,12,14,10,4,13,15,16,14,5,1,7,15,14,16,9,10,15,7,8,16,16,8,3,9]
-connectivite_index=[1,5,9,13,17,21,25,29,33,37]
-conn=m.getConnectivity(MED_FULL_INTERLACE,MED_NODAL,MED_CELL,MED_QUAD4)
-conn_index=m.getConnectivityIndex(MED_NODAL,MED_CELL);
-conn2dboost=(len(conn)==len(connectivite))
-if conn2dboost:
-    for i in range(0,len(connectivite)):
-        conn2dboost=conn2dboost&(conn[i]==connectivite[i])
-conn_index2dboost=(len(conn_index)==len(connectivite_index))
-if conn_index2dboost:
-    for i in range(0,len(connectivite_index)):
-        conn_index2dboost=conn_index2dboost&(conn_index[i]==connectivite_index[i])
-Boost2D=conn2dboost&conn_index2dboost&(nbcell2dboost==9)&field
-os.remove(dir_mesh+"/out_"+filename)
-
-
-print "TEST 2D Metis"
-method="METIS"
-string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
-eval("os.system("+string_to_execute+")")
-m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-nbcell2dmetis=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
-connectivite=[12,14,10,4,2,6,13,11,11,13,14,12,16,8,3,9,5,1,7,15,15,7,8,16,14,16,9,10,6,5,15,13,13,15,16,14]
-connectivite_index=[1,5,9,13,17,21,25,29,33,37]
-conn=m.getConnectivity(MED_FULL_INTERLACE,MED_NODAL,MED_CELL,MED_QUAD4)
-conn_index=m.getConnectivityIndex(MED_NODAL,MED_CELL);
-conn2dmetis=(len(conn)==len(connectivite))
-if conn2dmetis:
-    for i in range(0,len(connectivite)):
-        conn2dmetis=conn2dmetis&(conn[i]==connectivite[i])
-conn_index2dmetis=(len(conn_index)==len(connectivite_index))
-if conn_index2dmetis:
-    for i in range(0,len(connectivite_index)):
-        conn_index2dmetis=conn_index2dmetis&(conn_index[i]==connectivite_index[i])
-Metis2D=conn2dmetis&conn_index2dmetis&(nbcell2dmetis==9)
-os.remove(dir_mesh+"/out_"+filename)
-
-## *** Avec polygone ***
-
-filename="Test2Dpoly.med"
-meshname="Mesh_1"
-
-
-print "TEST 2D Boost with polygons"
-method="BOOST"
-string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
-eval("os.system("+string_to_execute+")")
-m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-nbcell2dpolyboost=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
-connectivite=[2,5,9,10,11,10,9,12,5,6,8,9,4,11,12,16,12,9,8,13,6,1,7,8,16,12,13,15,13,8,7,14,15,13,14,3]
-connectivite_index=[1,5,9,13,17,21,25,29,33,37]
-conn=m.getPolygonsConnectivity(MED_FULL_INTERLACE,MED_CELL)
-conn_index=m.getPolygonsConnectivityIndex(MED_FULL_INTERLACE,MED_CELL);
-conn2dpolyboost=(len(conn)==len(connectivite))
-if conn2dpolyboost:
-    for i in range(0,len(connectivite)):
-        conn2dpolyboost=conn2dpolyboost&(conn[i]==connectivite[i])
-conn_index2dpolyboost=(len(conn_index)==len(connectivite_index))
-if conn_index2dpolyboost:
-    for i in range(0,len(connectivite_index)):
-        conn_index2dpolyboost=conn_index2dpolyboost&(conn_index[i]==connectivite_index[i])
-PolyBoost2D=conn2dpolyboost&conn_index2dpolyboost&(nbcell2dpolyboost==9)
-os.remove(dir_mesh+"/out_"+filename)
-
-print "TEST 2D Metis with polygons"
-method="METIS"
-string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
-eval("os.system("+string_to_execute+")")
-m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-nbcell2dpolymetis=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
-connectivite=[6,1,7,8,2,5,9,10,5,6,8,9,15,13,14,3,4,11,12,16,16,12,13,15,11,10,9,12,12,9,8,13,13,8,7,14]
-connectivite_index=[1,5,9,13,17,21,25,29,33,37]
-conn=m.getPolygonsConnectivity(MED_FULL_INTERLACE,MED_CELL)
-conn_index=m.getPolygonsConnectivityIndex(MED_FULL_INTERLACE,MED_CELL);
-conn2dpolymetis=(len(conn)==len(connectivite))
-if conn2dpolymetis:
-    for i in range(0,len(connectivite)):
-        conn2dpolymetis=conn2dpolymetis&(conn[i]==connectivite[i])
-conn_index2dpolymetis=(len(conn_index)==len(connectivite_index))
-if conn_index2dpolymetis:
-    for i in range(0,len(connectivite_index)):
-        conn_index2dpolymetis=conn_index2dpolymetis&(conn_index[i]==connectivite_index[i])
-PolyMetis2D=conn2dpolymetis&conn_index2dpolymetis&(nbcell2dpolymetis==9)
-os.remove(dir_mesh+"/out_"+filename)
-
-
-##                                         ***************
-##                                         *** TEST 3D ***
-##                                         ***************
-
-
-filename="Test3D.med"
-meshname="Mesh_1"
-
-
-print "TEST 3D Boost"
-method="BOOST"
-string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
-eval("os.system("+string_to_execute+")")
-m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-nbcell3dboost=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
-connectivite=[23,13,5,18,27,22,14,26,17,6,13,23,25,16,22,27,27,22,14,26,24,15,7,20,9,23,18,1,21,27,26,10,25,16,22,27,19,8,15,24,2,17,23,9,12,25,27,21,21,27,26,10,11,24,20,3,12,25,27,21,4,19,24,11]
-connectivite_index=[1,9,17,25,33,41,49,57,65]
-conn=m.getConnectivity(MED_FULL_INTERLACE,MED_NODAL,MED_CELL,MED_HEXA8)
-conn_index=m.getConnectivityIndex(MED_NODAL,MED_CELL);
-conn3dboost=(len(conn)==len(connectivite))
-if conn3dboost:
-    for i in range(0,len(connectivite)):
-        conn3dboost=conn3dboost&(conn[i]==connectivite[i])
-conn_index3dboost=(len(conn_index)==len(connectivite_index))
-if conn_index3dboost:
-    for i in range(0,len(connectivite_index)):
-        conn_index3dboost=conn_index3dboost&(conn_index[i]==connectivite_index[i])
-Boost3D=conn3dboost&conn_index3dboost&(nbcell3dboost==8)
-os.remove(dir_mesh+"/out_"+filename)
-
-
-print "TEST 3D Metis"
-method="METIS"
-string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
-eval("os.system("+string_to_execute+")")
-m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-nbcell3dmetis=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
-connectivite=[12,25,27,21,4,19,24,11,27,22,14,26,24,15,7,20,17,6,13,23,25,16,22,27,9,23,18,1,21,27,26,10,23,13,5,18,27,22,14,26,25,16,22,27,19,8,15,24,2,17,23,9,12,25,27,21,21,27,26,10,11,24,20,3]
-connectivite_index=[1,9,17,25,33,41,49,57,65]
-conn=m.getConnectivity(MED_FULL_INTERLACE,MED_NODAL,MED_CELL,MED_HEXA8)
-conn_index=m.getConnectivityIndex(MED_NODAL,MED_CELL);
-conn3dmetis=(len(conn)==len(connectivite))
-if conn3dmetis:
-    for i in range(0,len(connectivite)):
-        conn3dmetis=conn3dmetis&(conn[i]==connectivite[i])
-conn_index3dmetis=(len(conn_index)==len(connectivite_index))
-if conn_index3dmetis:
-    for i in range(0,len(connectivite_index)):
-        conn_index3dmetis=conn_index3dmetis&(conn_index[i]==connectivite_index[i])
-Metis3D=conn3dmetis&conn_index3dmetis&(nbcell3dmetis==8)
-os.remove(dir_mesh+"/out_"+filename)
-
-
-## *** Avec polyedres ***
-
-## 23,13,5,18,27,26,14,22,23,27,22,13,13,22,14,5,5,14,26,18,18,26,27,23,
-## 21,27,26,10,11,3,20,24,21,11,24,27,27,24,20,26,26,20,3,10,10,3,11,21,
-## 12,25,27,21,4,11,24,19,12,4,19,25,25,19,24,27,27,24,11,21,21,11,4,12,
-## 9,23,18,1,21,10,26,27,9,21,27,23,23,27,26,18,18,26,10,1,1,10,21,9,
-## 2,17,23,9,12,21,27,25,2,12,25,17,17,25,27,23,23,27,21,9,9,21,12,2,
-## 25,16,22,27,19,24,15,8,25,19,8,16,16,8,15,22,22,15,24,27,27,24,19,25,
-## 17,6,13,23,25,27,22,16,17,25,16,6,6,16,22,13,13,22,27,23,23,27,25,17,
-## 27,22,14,26,24,20,7,15,27,24,15,22,22,15,7,14,14,7,20,26,26,20,24,27,
-
-
-filename="Test3Dpoly.med"
-meshname="Mesh_1"
-
-
-print "TEST 3D Boost with polyhedra"
-method="BOOST"
-string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
-eval("os.system("+string_to_execute+")")
-m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-nbcell3dpolyboost=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
-connectivite=[23,13,5,18,27,26,14,22,23,27,22,13,13,22,14,5,5,14,26,18,18,26,27,23,17,6,13,23,25,27,22,16,17,25,16,6,6,16,22,13,13,22,27,23,23,27,25,17,27,22,14,26,24,20,7,15,27,24,15,22,22,15,7,14,14,7,20,26,26,20,24,27,9,23,18,1,21,10,26,27,9,21,27,23,23,27,26,18,18,26,10,1,1,10,21,9,25,16,22,27,19,24,15,8,25,19,8,16,16,8,15,22,22,15,24,27,27,24,19,25,2,17,23,9,12,21,27,25,2,12,25,17,17,25,27,23,23,27,21,9,9,21,12,2,21,27,26,10,11,3,20,24,21,11,24,27,27,24,20,26,26,20,3,10,10,3,11,21,12,25,27,21,4,11,24,19,12,4,19,25,25,19,24,27,27,24,11,21,21,11,4,12]
-connectivite_face_index=[1,5,9,13,17,21,25,29,33,37,41,45,49,53,57,61,65,69,73,77,81,85,89,93,97,101,105,109,113,117,121,125,129,133,137,141,145,149,153,157,161,165,169,173,177,181,185,189,193]
-connectivite_index=[1,7,13,19,25,31,37,43,49]
-conn=m.getPolyhedronConnectivity(MED_FULL_INTERLACE)
-conn_index=m.getPolyhedronIndex(MED_FULL_INTERLACE)
-conn_face_index=m.getPolyhedronFacesIndex()
-conn3dpolyboost=(len(conn)==len(connectivite))
-if conn3dpolyboost:
-    for i in range(0,len(connectivite)):
-        conn3dpolyboost=conn3dpolyboost&(conn[i]==connectivite[i])
-conn_index3dpolyboost=(len(conn_index)==len(connectivite_index))
-if conn3dpolyboost:
-    for i in range(0,len(connectivite_index)):
-        conn_index3dpolyboost=conn_index3dpolyboost&(conn_index[i]==connectivite_index[i])
-conn_face_index3dpolyboost=(len(conn_face_index)==len(connectivite_face_index))
-if conn_face_index3dpolyboost:
-    for i in range(0,len(connectivite_face_index)):
-        conn_face_index3dpolyboost=conn_face_index3dpolyboost&(conn_face_index[i]==connectivite_face_index[i])
-PolyBoost3D=conn3dpolyboost&conn_index3dpolyboost&conn_face_index3dpolyboost&(nbcell3dpolyboost==8)
-os.remove(dir_mesh+"/out_"+filename)
-
-
-print "TEST 3D Metis with polyhedra"
-method="METIS"
-string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
-eval("os.system("+string_to_execute+")")
-m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-nbcell3dpolymetis=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
-connectivite=[12,25,27,21,4,11,24,19,12,4,19,25,25,19,24,27,27,24,11,21,21,11,4,12,27,22,14,26,24,20,7,15,27,24,15,22,22,15,7,14,14,7,20,26,26,20,24,27,17,6,13,23,25,27,22,16,17,25,16,6,6,16,22,13,13,22,27,23,23,27,25,17,9,23,18,1,21,10,26,27,9,21,27,23,23,27,26,18,18,26,10,1,1,10,21,9,23,13,5,18,27,26,14,22,23,27,22,13,13,22,14,5,5,14,26,18,18,26,27,23,25,16,22,27,19,24,15,8,25,19,8,16,16,8,15,22,22,15,24,27,27,24,19,25,2,17,23,9,12,21,27,25,2,12,25,17,17,25,27,23,23,27,21,9,9,21,12,2,21,27,26,10,11,3,20,24,21,11,24,27,27,24,20,26,26,20,3,10,10,3,11,21]
-connectivite_face_index=[1,5,9,13,17,21,25,29,33,37,41,45,49,53,57,61,65,69,73,77,81,85,89,93,97,101,105,109,113,117,121,125,129,133,137,141,145,149,153,157,161,165,169,173,177,181,185,189,193]
-connectivite_index=[1,7,13,19,25,31,37,43,49]
-conn=m.getPolyhedronConnectivity(MED_FULL_INTERLACE)
-conn_index=m.getPolyhedronIndex(MED_FULL_INTERLACE)
-conn_face_index=m.getPolyhedronFacesIndex()
-conn3dpolymetis=(len(conn)==len(connectivite))
-conn_index3dpolymetis=(len(conn_index)==len(connectivite_index))
-conn_face_index3dpolymetis=(len(conn_face_index)==len(connectivite_face_index))
-if conn3dpolymetis:
-    for i in range(0,len(connectivite)):
-        conn3dpolymetis=conn3dpolymetis&(conn[i]==connectivite[i])
-if conn_index3dpolymetis:
-    for i in range(0,len(connectivite_index)):
-        conn_index3dpolymetis=conn_index3dpolymetis&(conn_index[i]==connectivite_index[i])
-if conn_face_index3dpolymetis:
-    for i in range(0,len(connectivite_face_index)):
-        conn_face_index3dpolymetis=conn_face_index3dpolymetis&(conn_face_index[i]==connectivite_face_index[i])
-PolyMetis3D=conn3dpolymetis&conn_index3dpolymetis&conn_face_index3dpolymetis&(nbcell3dpolymetis==8)
-os.remove(dir_mesh+"/out_"+filename)
-
-
-
-
-print ""
-if Boost2D:
-    print "Boost 2D ok"
-else:
-    print "ERROR Boost 2D"
-if Metis2D:
-    print "Metis 2D ok"
-else:
-    print "ERROR Metis 2D"
-if PolyBoost2D:
-    print "Poly Boost 2D ok"
-else:
-    print "ERROR Poly Boost 2D"
-if PolyMetis2D:
-    print "Poly Metis 2D ok"
-else:
-    print "ERROR Poly Metis 2D"
-if Boost3D:
-    print "Boost 3D ok"
-else:
-    print "ERROR Boost 3D"
-if Metis3D:
-    print "Metis 3D ok"
-else:
-    print "ERROR Metis 3D"
-if PolyBoost3D:
-    print "Poly Boost 3D ok"
-else:
-    print "ERROR Poly Boost 3D"
-if PolyMetis3D:
-    print "Poly Metis 3D ok"
-else:
-    print "ERROR Poly Metis 3D"
-
-
-print ""
-if Boost2D&Metis2D&PolyBoost2D&PolyMetis2D&Boost3D&Metis3D&PolyBoost3D&PolyMetis3D:
-    print "Every mesh correctly renumbered"
-    sys.exit()
-else:
-    print "Error"
-    sys.exit("Error in the renumbering test")
-
-
-- 
2.39.2