From: ndjinga <ndjinga>
Date: Tue, 9 Oct 2007 13:04:23 +0000 (+0000)
Subject: taking into account modification of InterpolationMatrix::interpol_maillages into... 
X-Git-Tag: trio_trio_coupling~9
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e147447b6e719363b4c752eb87d7df8d33ba7c70;p=tools%2Fmedcoupling.git

taking into account modification of InterpolationMatrix::interpol_maillages into interpolateMeshes
---

diff --git a/src/ParaMEDMEM/InterpolationMatrix.cxx b/src/ParaMEDMEM/InterpolationMatrix.cxx
index 4bab4da8c..efd24ff3e 100644
--- 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 2354bcfdc..dc361443e 100644
--- 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)