taking into account modification of InterpolationMatrix::interpol_maillages into...

diff --git a/src/ParaMEDMEM/InterpolationMatrix.cxx b/src/ParaMEDMEM/InterpolationMatrix.cxx
index 4bab4da8c6ff1699adf562d87ade314903a1df20..efd24ff3e5aa209b2d9ae9b46ed0619ab1ee8f61 100644 (file)
--- a/src/ParaMEDMEM/InterpolationMatrix.cxx
+++ b/src/ParaMEDMEM/InterpolationMatrix.cxx
@@ -2,6 +2,8 @@
 #include "ProcessorGroup.hxx"
 #include "MxN_Mapping.hxx"
 #include "InterpolationMatrix.hxx"
+#include "TranslationRotationMatrix.hxx"
+#include "Interpolation.hxx"
 #include "Interpolation2D.hxx"
 #include "Interpolation3DSurf.hxx"
 #include "Interpolation3D.hxx"
@@ -85,7 +87,7 @@ void InterpolationMatrix::addContribution(MEDMEM::MESH& distant_support, int ipr
   
        //computation of the intersection volumes between source and target elements
   int source_size=  _source_support.getNumberOfElements(MED_EN::MED_CELL,MED_EN::MED_ALL_ELEMENTS);  
-  vector<map<int,double> > surfaces = interpolator->interpol_maillages(distant_support,_source_support);
+  vector<map<int,double> > surfaces = interpolator->interpolateMeshes(distant_support,_source_support);
   delete interpolator;  
   if (surfaces.size() != source_size)
     throw MEDEXCEPTION("uncoherent number of rows in interpolation matrix");

diff --git a/src/ParaMEDMEM/Makefile.in b/src/ParaMEDMEM/Makefile.in
index 2354bcfdcbca662952c6e4f02f5eac7f290d0417..dc361443e7b1d8b2eb8910df3cdddac0ce63b864 100644 (file)
--- a/src/ParaMEDMEM/Makefile.in
+++ b/src/ParaMEDMEM/Makefile.in
@@ -108,6 +108,8 @@ LDFLAGSFORBIN+= -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome
 
 CPPFLAGS+=$(MED2_INCLUDES) $(MPI_INCLUDES) $(LAM_INCLUDES) -I/data/tmpawa/vb144235/lam_install/include -I/data/tmpawa/vb144235/fvm/src -DFVM_HAVE_MPI
 
+CPPFLAGS+=-I${srcdir}/../INTERP_KERNEL
+
 CXXFLAGS+=@CXXTMPDPTHFLAGS@ 
 CPPFLAGS+=$(BOOST_CPPFLAGS)
 #LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS)