From: nri <nri@opencascade.com>
Date: Fri, 25 Jun 2004 13:15:14 +0000 (+0000)
Subject: DCQ : Merge with Ecole Ete a6.
X-Git-Tag: V2_0_0b1~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c30018924a3eeac19636737a9f1c057cae5d9ec7;p=modules%2Fmed.git

DCQ : Merge with Ecole Ete a6.
---

diff --git a/src/MEDMEM/INTERPOLATION/MEDMEM_InterpolationHighLevelObjects.hxx.old b/src/MEDMEM/INTERPOLATION/MEDMEM_InterpolationHighLevelObjects.hxx.old
new file mode 100644
index 000000000..7ab49bb4b
--- /dev/null
+++ b/src/MEDMEM/INTERPOLATION/MEDMEM_InterpolationHighLevelObjects.hxx.old
@@ -0,0 +1,104 @@
+#ifndef MEDMEM_INTERPOLATION_HIGHLEVEL_OBJECTS_HXX
+
+#define MEDMEM_INTERPOLATION_HIGHLEVEL_OBJECTS_HXX
+#include "MEDMEM_Connectivity.hxx"
+#include "MEDMEM_WrapperConnectivity.hxx"
+#include "MEDMEM_dTree.hxx"
+#include "MEDMEM_WrapperNodes.hxx"
+#include "MEDMEM_WrapperMesh.hxx"
+#include "MEDMEM_WrapperCells.hxx"
+#include "MEDMEM_Mapping.hxx"
+
+// DECLARATIONS
+
+template <int DIMENSION> class Meta_dTree : public dTree<Wrapper_Noeud<DIMENSION>,Wrapper_Nuage_Noeud<DIMENSION>,DIMENSION>
+{
+protected :
+	Wrapper_Nuage_Noeud<DIMENSION> * nuagetmp;
+public :
+	Meta_dTree(int nn,double * fullinterlace);
+	~Meta_dTree() {if ((etat==DTREE_RACINE)&&(nuagetmp)) delete nuagetmp;}
+	inline int trouve_plus_proche_point(double *node);
+};
+
+class Meta_Nuage_Maille : public Wrapper_Nuage_Maille<Wrapper_Med_Connectivity>
+{
+protected :
+	Wrapper_Med_Connectivity * connectivite_med;
+public :
+	Meta_Nuage_Maille(CONNECTIVITY * connmed); 
+	Meta_Nuage_Maille():Wrapper_Nuage_Maille<Wrapper_Med_Connectivity>(connectivite_med=new Wrapper_Med_Connectivity) {}
+	~Meta_Nuage_Maille() {if (connectivite_med) delete connectivite_med;}
+};
+
+
+typedef Wrapper_Maillage<Meta_Nuage_Maille> Meta_Maillage;
+
+template <int DIMENSION> class Meta_Mapping : public Mapping<Meta_Maillage,Meta_Nuage_Maille,Wrapper_Nuage_Noeud<DIMENSION>,Wrapper_Noeud<DIMENSION>,DIMENSION>
+{
+protected : 
+	Wrapper_Nuage_Noeud<DIMENSION> * wrapping_nuage_source;
+	Wrapper_Nuage_Noeud<DIMENSION> * wrapping_nuage_cible;
+public :
+	Meta_Mapping(Meta_Maillage * mb,double * noeudssource,int ns,double * noeudscible,int nc);
+	~Meta_Mapping() {if (wrapping_nuage_source) delete wrapping_nuage_source;if (wrapping_nuage_cible) delete wrapping_nuage_cible;}
+	inline int Trouve_Maille_Contenant_Noeud(double * node,int num_maille, int flag_convexe=0);
+	double donne_valeur_interpolee_P1(double * node,vector<double> vals);
+};
+
+// CODE
+
+template <int DIMENSION> Meta_dTree<DIMENSION>::Meta_dTree(int nn,double * fullinterlace)
+:dTree<Wrapper_Noeud<DIMENSION>,Wrapper_Nuage_Noeud<DIMENSION>,DIMENSION>
+(nuagetmp=new Wrapper_Nuage_Noeud<DIMENSION>(nn,fullinterlace))
+	{
+	}
+
+template <int DIMENSION> inline int Meta_dTree<DIMENSION>::trouve_plus_proche_point(double *node)
+	{
+	static Wrapper_Noeud<DIMENSION> nodetmp;
+	nodetmp.positionne(node);
+	return dTree<Wrapper_Noeud<DIMENSION>,Wrapper_Nuage_Noeud<DIMENSION>,DIMENSION>::trouve_plus_proche_point(Wrapper_Noeud<DIMENSION>(nodetmp));
+	}
+	
+//*	
+Meta_Nuage_Maille::Meta_Nuage_Maille(CONNECTIVITY * conmed):Wrapper_Nuage_Maille<Wrapper_Med_Connectivity>(connectivite_med=new Wrapper_Med_Connectivity(conmed))
+	{
+	}
+//*/
+
+template <int DIMENSION> Meta_Mapping<DIMENSION>::Meta_Mapping(Meta_Maillage * mb,double * noeudssource,int ns,double * noeudscible,int nc)
+:Mapping<Meta_Maillage,Meta_Nuage_Maille,Wrapper_Nuage_Noeud<DIMENSION>,Wrapper_Noeud<DIMENSION>,DIMENSION>
+(mb,
+wrapping_nuage_source=new Wrapper_Nuage_Noeud<DIMENSION>(ns,noeudssource),
+wrapping_nuage_cible=new Wrapper_Nuage_Noeud<DIMENSION>(nc,noeudscible))
+	{
+	}
+
+template <int DIMENSION> inline int Meta_Mapping<DIMENSION>::Trouve_Maille_Contenant_Noeud(double * node,int num_maille,int flag_convexe)
+	{
+	int interdit=num_maille;
+	int max_loop=100;
+	int nme=0;
+	static Wrapper_Noeud<DIMENSION> nodetmp;
+	nodetmp.positionne(node);
+	return Mapping<Meta_Maillage,Meta_Nuage_Maille,Wrapper_Nuage_Noeud<DIMENSION>,Wrapper_Noeud<DIMENSION>,DIMENSION>::Trouve_Maille_Contenant_Point_Mth_Co(nodetmp,num_maille,interdit,max_loop,nme,flag_convexe);
+	}
+template <int DIMENSION> double Meta_Mapping<DIMENSION>::donne_valeur_interpolee_P1(double * node,vector<double> vals)
+	{
+	int num_maille_contenant=Trouve_Maille_Contenant_Noeud(node,0);
+	double valeur_interpol=0;
+	vector<double> valeurs=CB->Calcule_Coord_Baryc(num_maille_contenant,node);
+	int i;
+	int num_som;
+	for (i=0;i<valeurs.size();i++) 
+		{
+		cout<<"Lambda(M):"<<i<<" = "<<valeurs[i]<<endl;
+		num_som=mailles_back->DONNE_SOMMET_MAILLE(num_maille_contenant,i);
+		valeur_interpol+=vals[num_som]*valeurs[i];
+		}
+	
+	return valeur_interpol;
+	}
+
+#endif 
diff --git a/src/MEDMEM/INTERPOLATION/Makefile.in b/src/MEDMEM/INTERPOLATION/Makefile.in
index 20a5571fe..b3ff8292e 100644
--- a/src/MEDMEM/INTERPOLATION/Makefile.in
+++ b/src/MEDMEM/INTERPOLATION/Makefile.in
@@ -81,9 +81,9 @@ UseCaseWrapper_Maillage
 
 CPPFLAGS+=-U_DEBUG_ $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -I../
 CXXFLAGS+=-U_DEBUG_ -ftemplate-depth-42 -I${KERNEL_ROOT_DIR}/include/salome 
-LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -lSALOMELocalTrace -L${KERNEL_ROOT_DIR}/lib/salome
+LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -lSalomeLoggerServer -L${KERNEL_ROOT_DIR}/lib/salome
 
-LDFLAGSFORBIN+=$(MED2_LIBS) $(HDF5_LIBS) -L../.libs -lmedmem -lSALOMELocalTrace -L${KERNEL_ROOT_DIR}/lib/salome
+LDFLAGSFORBIN+=$(MED2_LIBS) $(HDF5_LIBS) -L../.libs -lmedmem -lSalomeLoggerServer -L${KERNEL_ROOT_DIR}/lib/salome
 
 LIBSFORBIN=
 
diff --git a/src/MEDMEM/INTERPOLATION/create_mesh_interpolation.c b/src/MEDMEM/INTERPOLATION/create_mesh_interpolation.c
index 963701980..f99bb91d0 100644
--- a/src/MEDMEM/INTERPOLATION/create_mesh_interpolation.c
+++ b/src/MEDMEM/INTERPOLATION/create_mesh_interpolation.c
@@ -1,595 +1,523 @@
 #include <med.h>
 #include <string.h>
 
+#define MED_NOPG   1                   /* -> pas de point de Gauss                    */
+#define MED_NOPFL  ""                  /* -> pas de profils utilisateur               */
+#define MED_NOPFLi "                                "  /* Variable Interne                      */
+#define MED_NOPF   0                   /* -> pas de profils pour _MEDdataseNnumEcrire */
+#define MED_NOPDT -1                   /* rem: pas de pas de temps negatifs           */
+#define MED_NONOR -1                   /* rem: pas de n°ordre negatif                 */
+#define MED_DIM1   1                   /* PAS */
+
+#define MED_ALL    0
+
 /*****************************************************************************************************/
 
 void affiche_noeuds(med_float * nodes,int nnpl)
-{
-  int nbr_nodes=nnpl*nnpl*nnpl;
-  int i;
+	{
+	int nbr_nodes=nnpl*nnpl*nnpl;
+	int i;
+
+	for (i=0;i<nbr_nodes;i++) printf("Noeud %d : ( %4.5f ; %4.5f ; %4.5f )\n",i,nodes[3*i],nodes[3*i+1],nodes[3*i+2]);
+	
+	}
 
-  for (i=0;i<nbr_nodes;i++)
-    printf("Noeud %d : ( %4.5f ; %4.5f ; %4.5f )\n",i,nodes[3*i],nodes[3*i+1],
-	   nodes[3*i+2]);
-}
 
 void cree_nodes(med_float * coord_nodes,int nnpl, int flag)
-{
-  int i,j,k;
-  int nbr_nodes=nnpl*nnpl*nnpl;
-  int num_noeud;
-  int diviseur=nnpl-1+flag;
-	
-  /*coord_nodes=(med_float *) malloc(3*nbr_nodes*sizeof(med_float));*/
-	
-  for (i=0;i<nnpl;i++) for (j=0;j<nnpl;j++) for (k=0;k<nnpl;k++) 
-    {
-      num_noeud=i+nnpl*j+nnpl*nnpl*k;
-
-      if (3*num_noeud  >=3*nbr_nodes)
-	{printf("%d : OUT OF RANGE REQUEST\n",num_noeud);exit(-1);}
-      if (3*num_noeud+1>=3*nbr_nodes)
-	{printf("%d : OUT OF RANGE REQUEST\n",num_noeud);exit(-1);}
-      if (3*num_noeud+2>=3*nbr_nodes)
-	{printf("%d : OUT OF RANGE REQUEST\n",num_noeud);exit(-1);}
-
-      coord_nodes[3*num_noeud  ]= (double) (i+flag)/diviseur;
-      coord_nodes[3*num_noeud+1]= (double) (j+flag)/diviseur;
-      coord_nodes[3*num_noeud+2]= (double) (k+flag)/diviseur;
-    }
+	{
+	int i,j,k;
+	int nbr_nodes=nnpl*nnpl*nnpl;
+	int num_noeud;
+	int diviseur=nnpl-1+flag;
+	
+	/*coord_nodes=(med_float *) malloc(3*nbr_nodes*sizeof(med_float));*/
+	
+	for (i=0;i<nnpl;i++) for (j=0;j<nnpl;j++) for (k=0;k<nnpl;k++) 
+		{
+		num_noeud=i+nnpl*j+nnpl*nnpl*k;
 		
-  affiche_noeuds(coord_nodes,nnpl);
-  
-}
-
+		if (3*num_noeud  >=3*nbr_nodes) {printf("%d : OUT OF RANGE REQUEST\n",num_noeud);exit(-1);}
+		if (3*num_noeud+1>=3*nbr_nodes) {printf("%d : OUT OF RANGE REQUEST\n",num_noeud);exit(-1);}
+		if (3*num_noeud+2>=3*nbr_nodes) {printf("%d : OUT OF RANGE REQUEST\n",num_noeud);exit(-1);}
+		
+		coord_nodes[3*num_noeud  ]= (double) (i+flag)/diviseur;
+		coord_nodes[3*num_noeud+1]= (double) (j+flag)/diviseur;
+		coord_nodes[3*num_noeud+2]= (double) (k+flag)/diviseur;
+		}
+		
+	affiche_noeuds(coord_nodes,nnpl);
+	
+	}
 void cree_num_nodes(med_int * num_nodes,int nnpl)
-{
-  int nbr_nodes=nnpl*nnpl*nnpl;
-  int i;
-  /*num_nodes=(med_int *) malloc(nbr_nodes*sizeof(med_int));*/
-  for (i=0;i<nbr_nodes;i++) num_nodes[i]=i+1;//nbr_nodes+i;
-}
-
+	{
+	int nbr_nodes=nnpl*nnpl*nnpl;
+	int i;
+	/*num_nodes=(med_int *) malloc(nbr_nodes*sizeof(med_int));*/
+	for (i=0;i<nbr_nodes;i++) num_nodes[i]=i+1;//nbr_nodes+i;
+	}
 void cree_Hexa8(med_int * conn_hexa8, int nnpl,med_int * num_nodes)
-{
-  int i,j,k;
-  int i0,j0,k0,i1,j1,k1;
-  int nbr_nodes=nnpl*nnpl*nnpl;
-  int nbr_hexa8=(nnpl-1)*(nnpl-1)*(nnpl-1);
-  int num_hexa8;
-	
-  /*conn_hexa8=(med_int *) malloc(8*nbr_hexa8*sizeof(med_int));*/
-	
-  for (i=0;i<nnpl-1;i++) for (j=0;j<nnpl-1;j++) for (k=0;k<nnpl-1;k++) 
-    {
-      i0=i;j0=j;k0=k;
-      i1=i+1;j1=j+1;k1=k+1;
+	{
+	int i,j,k;
+	int i0,j0,k0,i1,j1,k1;
+	int nbr_nodes=nnpl*nnpl*nnpl;
+	int nbr_hexa8=(nnpl-1)*(nnpl-1)*(nnpl-1);
+	int num_hexa8;
+	
+	/*conn_hexa8=(med_int *) malloc(8*nbr_hexa8*sizeof(med_int));*/
+	
+	for (i=0;i<nnpl-1;i++) for (j=0;j<nnpl-1;j++) for (k=0;k<nnpl-1;k++) 
+		{
+		i0=i;j0=j;k0=k;
+		i1=i+1;j1=j+1;k1=k+1;
 		
-      num_hexa8=i+(nnpl-1)*j+(nnpl-1)*(nnpl-1)*k;
+		num_hexa8=i+(nnpl-1)*j+(nnpl-1)*(nnpl-1)*k;
 		
-      if (8*num_hexa8  >=8*nbr_hexa8)
-	{printf("%d : OUT OF RANGE REQUEST\n",num_hexa8);exit(-1);}
-      if (8*num_hexa8+1>=8*nbr_hexa8)
-	{printf("%d : OUT OF RANGE REQUEST\n",num_hexa8);exit(-1);}
-      if (8*num_hexa8+2>=8*nbr_hexa8)
-	{printf("%d : OUT OF RANGE REQUEST\n",num_hexa8);exit(-1);}
-      if (8*num_hexa8+3>=8*nbr_hexa8)
-	{printf("%d : OUT OF RANGE REQUEST\n",num_hexa8);exit(-1);}
-      if (8*num_hexa8+4>=8*nbr_hexa8)
-	{printf("%d : OUT OF RANGE REQUEST\n",num_hexa8);exit(-1);}
-      if (8*num_hexa8+5>=8*nbr_hexa8)
-	{printf("%d : OUT OF RANGE REQUEST\n",num_hexa8);exit(-1);}
-      if (8*num_hexa8+6>=8*nbr_hexa8)
-	{printf("%d : OUT OF RANGE REQUEST\n",num_hexa8);exit(-1);}
-      if (8*num_hexa8+7>=8*nbr_hexa8)
-	{printf("%d : OUT OF RANGE REQUEST\n",num_hexa8);exit(-1);}
+		if (8*num_hexa8  >=8*nbr_hexa8) {printf("%d : OUT OF RANGE REQUEST\n",num_hexa8);exit(-1);}
+		if (8*num_hexa8+1>=8*nbr_hexa8) {printf("%d : OUT OF RANGE REQUEST\n",num_hexa8);exit(-1);}
+		if (8*num_hexa8+2>=8*nbr_hexa8) {printf("%d : OUT OF RANGE REQUEST\n",num_hexa8);exit(-1);}
+		if (8*num_hexa8+3>=8*nbr_hexa8) {printf("%d : OUT OF RANGE REQUEST\n",num_hexa8);exit(-1);}
+		if (8*num_hexa8+4>=8*nbr_hexa8) {printf("%d : OUT OF RANGE REQUEST\n",num_hexa8);exit(-1);}
+		if (8*num_hexa8+5>=8*nbr_hexa8) {printf("%d : OUT OF RANGE REQUEST\n",num_hexa8);exit(-1);}
+		if (8*num_hexa8+6>=8*nbr_hexa8) {printf("%d : OUT OF RANGE REQUEST\n",num_hexa8);exit(-1);}
+		if (8*num_hexa8+7>=8*nbr_hexa8) {printf("%d : OUT OF RANGE REQUEST\n",num_hexa8);exit(-1);}
 		
-      conn_hexa8[8*num_hexa8  ] = num_nodes[ i0+nnpl*j1+nnpl*nnpl*k1 ]; 
-      conn_hexa8[8*num_hexa8+1] = num_nodes[ i0+nnpl*j0+nnpl*nnpl*k1 ]; 
-      conn_hexa8[8*num_hexa8+2] = num_nodes[ i1+nnpl*j0+nnpl*nnpl*k1 ]; 
-      conn_hexa8[8*num_hexa8+3] = num_nodes[ i1+nnpl*j1+nnpl*nnpl*k1 ]; 
-      conn_hexa8[8*num_hexa8+4] = num_nodes[ i0+nnpl*j1+nnpl*nnpl*k0 ]; 
-      conn_hexa8[8*num_hexa8+5] = num_nodes[ i0+nnpl*j0+nnpl*nnpl*k0 ]; 
-      conn_hexa8[8*num_hexa8+6] = num_nodes[ i1+nnpl*j0+nnpl*nnpl*k0 ]; 
-      conn_hexa8[8*num_hexa8+7] = num_nodes[ i1+nnpl*j1+nnpl*nnpl*k0 ]; 
+		conn_hexa8[8*num_hexa8  ] = num_nodes[ i0+nnpl*j1+nnpl*nnpl*k1 ]; 
+		conn_hexa8[8*num_hexa8+1] = num_nodes[ i0+nnpl*j0+nnpl*nnpl*k1 ]; 
+		conn_hexa8[8*num_hexa8+2] = num_nodes[ i1+nnpl*j0+nnpl*nnpl*k1 ]; 
+		conn_hexa8[8*num_hexa8+3] = num_nodes[ i1+nnpl*j1+nnpl*nnpl*k1 ]; 
+		conn_hexa8[8*num_hexa8+4] = num_nodes[ i0+nnpl*j1+nnpl*nnpl*k0 ]; 
+		conn_hexa8[8*num_hexa8+5] = num_nodes[ i0+nnpl*j0+nnpl*nnpl*k0 ]; 
+		conn_hexa8[8*num_hexa8+6] = num_nodes[ i1+nnpl*j0+nnpl*nnpl*k0 ]; 
+		conn_hexa8[8*num_hexa8+7] = num_nodes[ i1+nnpl*j1+nnpl*nnpl*k0 ]; 
 		
 		
-    }
+		}
 		
-  for (num_hexa8=0;num_hexa8<nbr_hexa8;num_hexa8++)
-    {		
-      printf("Maille numéro %4d :",num_hexa8);		
-      printf("%4d ",conn_hexa8[8*num_hexa8  ]);
-      printf("%4d ",conn_hexa8[8*num_hexa8+1]);
-      printf("%4d ",conn_hexa8[8*num_hexa8+2]);
-      printf("%4d ",conn_hexa8[8*num_hexa8+3]);
-      printf("%4d ",conn_hexa8[8*num_hexa8+4]);
-      printf("%4d ",conn_hexa8[8*num_hexa8+5]);
-      printf("%4d ",conn_hexa8[8*num_hexa8+6]);
-      printf("%4d ",conn_hexa8[8*num_hexa8+7]);
-      printf("\n");
-    }
-}	
-
+	for (num_hexa8=0;num_hexa8<nbr_hexa8;num_hexa8++)
+		{		
+		printf("Maille numéro %4d :",num_hexa8);		
+		printf("%4d ",conn_hexa8[8*num_hexa8  ]);
+		printf("%4d ",conn_hexa8[8*num_hexa8+1]);
+		printf("%4d ",conn_hexa8[8*num_hexa8+2]);
+		printf("%4d ",conn_hexa8[8*num_hexa8+3]);
+		printf("%4d ",conn_hexa8[8*num_hexa8+4]);
+		printf("%4d ",conn_hexa8[8*num_hexa8+5]);
+		printf("%4d ",conn_hexa8[8*num_hexa8+6]);
+		printf("%4d ",conn_hexa8[8*num_hexa8+7]);
+		printf("\n");
+		}
+	}	
 void cree_noms_mailles(char * noms, int nnpl)
-{
-  int nbr_hexa8=(nnpl-1)*(nnpl-1)*(nnpl-1);	
-  int i;
-  char pnom[MED_TAILLE_PNOM+1]="hexa            ";
+	{
+	int nbr_hexa8=(nnpl-1)*(nnpl-1)*(nnpl-1);	
+	int i;
+	char pnom[MED_TAILLE_PNOM+1]="hexa    ";
 	
-  /*noms=(char *) malloc((nbr_hexa8*MED_TAILLE_PNOM+1)*sizeof(char));*/
+	/*noms=(char *) malloc((nbr_hexa8*MED_TAILLE_PNOM+1)*sizeof(char));*/
 	
-  for (i=0;i<nbr_hexa8;i++) strncpy(&noms[i*MED_TAILLE_PNOM],pnom,MED_TAILLE_PNOM);
+	for (i=0;i<nbr_hexa8;i++) strncpy(&noms[i*MED_TAILLE_PNOM],pnom,MED_TAILLE_PNOM);
 	
-  noms[nbr_hexa8*MED_TAILLE_PNOM]='\n';
-}
-
+	noms[nbr_hexa8*MED_TAILLE_PNOM]='\n';
+	
+	}
 void cree_num_mailles(med_int * num_mailles,int nnpl)
-{
-  int nbr_hexa8=(nnpl-1)*(nnpl-1)*(nnpl-1);	
-  int i;
-  
-  /*num_mailles=(med_int *) malloc(nbr_hexa8*sizeof(med_int));*/
-  
-  for (i=0;i<nbr_hexa8;i++) num_mailles[i]=i+1;
-}
-
+	{
+	int nbr_hexa8=(nnpl-1)*(nnpl-1)*(nnpl-1);	
+	int i;
+	
+	/*num_mailles=(med_int *) malloc(nbr_hexa8*sizeof(med_int));*/
+	
+	for (i=0;i<nbr_hexa8;i++) num_mailles[i]=i+1;
+	}
 void cree_fam_nodes(med_int * fam,int nnpl)
-{
-  int nbr_nodes=nnpl*nnpl*nnpl;
-  int i;
-  
-  /*fam=(med_int *) malloc(nbr_nodes*sizeof(med_int));*/
-  
-  for (i=0;i<nbr_nodes;i++) fam[i]=0;
-}
-
+	{
+	int nbr_nodes=nnpl*nnpl*nnpl;
+	int i;
+	
+	/*fam=(med_int *) malloc(nbr_nodes*sizeof(med_int));*/
+	
+	for (i=0;i<nbr_nodes;i++) fam[i]=0;
+	}
 void cree_fam_mailles(med_int * fam,int nnpl)
-{
-  int nbr_hexa8=(nnpl-1)*(nnpl-1)*(nnpl-1);	
-  int i;
-  
-  /*fam=(med_int *) malloc(nbr_hexa8*sizeof(med_int));*/
-  
-  for (i=0;i<nbr_hexa8;i++) fam[i]=0;
-}
-
+	{
+	int nbr_hexa8=(nnpl-1)*(nnpl-1)*(nnpl-1);	
+	int i;
+	
+	/*fam=(med_int *) malloc(nbr_hexa8*sizeof(med_int));*/
+	
+	for (i=0;i<nbr_hexa8;i++) fam[i]=0;
+	}
 void cree_valeurs_champ_node(med_float * val,int nnpl)
-{
-  int i,j,k;
-  int nbr_nodes=nnpl*nnpl*nnpl;
-  int num_noeud;
-  int diviseur=3*(nnpl-1);
-  
-  /*val=(med_float *) malloc(nbr_nodes*sizeof(med_float));*/
-	
-  for (i=0;i<nnpl;i++) for (j=0;j<nnpl;j++) for (k=0;k<nnpl;k++) 
-    {
-      num_noeud=i+nnpl*j+nnpl*nnpl*k;
-      val[num_noeud] = (med_float) (i+j+k)/diviseur;
-    }
-  for (num_noeud=0;num_noeud<nbr_nodes;num_noeud++)
-    printf("Valeur Scalaire noeud %5d : %4.5f\n",num_noeud,val[num_noeud]);
-}
-
+	{
+	int i,j,k;
+	int nbr_nodes=nnpl*nnpl*nnpl;
+	int num_noeud;
+	int diviseur=3*(nnpl-1);
+	
+	/*val=(med_float *) malloc(nbr_nodes*sizeof(med_float));*/
+	
+	for (i=0;i<nnpl;i++) for (j=0;j<nnpl;j++) for (k=0;k<nnpl;k++) 
+		{
+		num_noeud=i+nnpl*j+nnpl*nnpl*k;
+		val[num_noeud] = (med_float) (i+j+k)/diviseur;
+		}
+	for (num_noeud=0;num_noeud<nbr_nodes;num_noeud++) printf("Valeur Scalaire noeud %5d : %4.5f\n",num_noeud,val[num_noeud]);
+	}
 void cree_valeurs_champ_vector_node(med_float * val,int nnpl)
-{
-  int i,j,k;
-  int nbr_nodes=nnpl*nnpl*nnpl;
-  int num_noeud;
-	
-  /*val=(med_float *) malloc(nbr_nodes*sizeof(med_float));*/
-	
-  for (i=0;i<nnpl;i++) for (j=0;j<nnpl;j++) for (k=0;k<nnpl;k++) 
-    {
-      num_noeud=i+nnpl*j+nnpl*nnpl*k;
-      val[3*num_noeud  ] = (med_float) 0;
-      val[3*num_noeud+1] = (med_float) 1;
-      val[3*num_noeud+2] = (med_float) 2;
-    }
-  for (num_noeud=0;num_noeud<nbr_nodes;num_noeud++)
-    printf("Valeur Vectorielle noeud %5d : %4.5f %4.5f %4.5f \n ",num_noeud,
-	   val[3*num_noeud],val[3*num_noeud+1],val[3*num_noeud+2]);
-}
-
+	{
+	int i,j,k;
+	int nbr_nodes=nnpl*nnpl*nnpl;
+	int num_noeud;
+	
+	/*val=(med_float *) malloc(nbr_nodes*sizeof(med_float));*/
+	
+	for (i=0;i<nnpl;i++) for (j=0;j<nnpl;j++) for (k=0;k<nnpl;k++) 
+		{
+		num_noeud=i+nnpl*j+nnpl*nnpl*k;
+		val[3*num_noeud  ] = (med_float) 0;
+		val[3*num_noeud+1] = (med_float) 1;
+		val[3*num_noeud+2] = (med_float) 2;
+		}
+	for (num_noeud=0;num_noeud<nbr_nodes;num_noeud++) printf("Valeur Vectorielle noeud %5d : %4.5f %4.5f %4.5f \n ",num_noeud,val[3*num_noeud],val[3*num_noeud+1],val[3*num_noeud+2]);
+	}
 void cree_valeurs_champ_cell(med_float * val,int nnpl)
-{
-  int i,j,k;
-  int nbr_cells=(nnpl-1)*(nnpl-1)*(nnpl-1);	
-  int num_cell;
+	{
+	int i,j,k;
+	int nbr_cells=(nnpl-1)*(nnpl-1)*(nnpl-1);	
+	int num_cell;
 	
-  med_float diviseur=3*(nnpl-2);
+	med_float diviseur=3*(nnpl-2);
 	
-  /*val=(med_float *) malloc(3*nbr_cells*sizeof(med_float));*/
+	/*val=(med_float *) malloc(3*nbr_cells*sizeof(med_float));*/
 	
-  for (i=0;i<nnpl-1;i++) for (j=0;j<nnpl-1;j++) for (k=0;k<nnpl-1;k++) 
-    {
-      num_cell=i+(nnpl-1)*j+(nnpl-1)*(nnpl-1)*k;
-      val[num_cell  ] =  (med_float) (i+j+k)/diviseur;
-    }
-  for (num_cell=0;num_cell<nbr_cells;num_cell++)
-    printf("Valeur scalaire maille %5d : %4.5f\n ",num_cell,val[num_cell]);
-}	
-
+	for (i=0;i<nnpl-1;i++) for (j=0;j<nnpl-1;j++) for (k=0;k<nnpl-1;k++) 
+		{
+		num_cell=i+(nnpl-1)*j+(nnpl-1)*(nnpl-1)*k;
+		val[num_cell  ] =  (med_float) (i+j+k)/diviseur;
+		}
+	for (num_cell=0;num_cell<nbr_cells;num_cell++) printf("Valeur scalaire maille %5d : %4.5f\n ",num_cell,val[num_cell]);
+	}	
 void cree_valeurs_champ_vector_cell(med_float * val,int nnpl)
-{
-  int i,j,k;
-  int nbr_cells=(nnpl-1)*(nnpl-1)*(nnpl-1);	
-  int num_cell;
-  
-  /*val=(med_float *) malloc(3*nbr_cells*sizeof(med_float));*/
-  
-  for (i=0;i<nnpl-1;i++) for (j=0;j<nnpl-1;j++) for (k=0;k<nnpl-1;k++) 
-    {
-      num_cell=i+(nnpl-1)*j+(nnpl-1)*(nnpl-1)*k;
-      val[3*num_cell  ] = (med_float) 0;
-      val[3*num_cell+1] = (med_float) 1;
-      val[3*num_cell+2] = (med_float) 2; 	   
-    }
-  for (num_cell=0;num_cell<nbr_cells;num_cell++)
-    printf("Valeur Vectorielle maille %5d : %4.5f %4.5f %4.5f \n ",num_cell,
-	   val[3*num_cell],val[3*num_cell+1],val[3*num_cell+2]);
-}
+	{
+	int i,j,k;
+	int nbr_cells=(nnpl-1)*(nnpl-1)*(nnpl-1);	
+	int num_cell;
+	
+	/*val=(med_float *) malloc(3*nbr_cells*sizeof(med_float));*/
+	
+	for (i=0;i<nnpl-1;i++) for (j=0;j<nnpl-1;j++) for (k=0;k<nnpl-1;k++) 
+		{
+		num_cell=i+(nnpl-1)*j+(nnpl-1)*(nnpl-1)*k;
+		val[3*num_cell  ] = (med_float) 0;
+		val[3*num_cell+1] = (med_float) 1;
+		val[3*num_cell+2] = (med_float) 2; 	   
+		}
+	for (num_cell=0;num_cell<nbr_cells;num_cell++) printf("Valeur Vectorielle maille %5d : %4.5f %4.5f %4.5f \n ",num_cell,val[3*num_cell],val[3*num_cell+1],val[3*num_cell+2]);
+	}
 
 	
 /*****************************************************************************************************/
 	
 int main (int argc, char **argv)
-{
+	{
 		
-  int i,j,k;
-  
-  int nnpl;
-  
-  int nbr_nodes, nbr_hexa8;
-  
-  med_err ret;
-  med_idt fromfid;
-  med_idt tofid;
-  char frommaa[MED_TAILLE_NOM+1] = "fromMesh";
-  char frommaadesc[MED_TAILLE_DESC+1] = "First 3D non-structured mesh example for the Interpolation module in Med Memory";
-  char tomaa[MED_TAILLE_NOM+1]   = "toMesh";
-  char tomaadesc[MED_TAILLE_DESC+1] = "Second 3D non-structured mesh example for the Interpolation module in Med Memory";
-  const med_int mdim = 3;
-  med_int fromnnoe;
-  med_int   tonnoe;
-  
-  med_float * tocoo;                   
-  med_float * fromcoo;                 
-  
-  char nomcoo[3*MED_TAILLE_PNOM+1] = "x	            y	            z	            ";
-  char unicoo[3*MED_TAILLE_PNOM+1] = "cm              cm              cm              ";
-  
-  char * nomnoe = NULL ;
-  
-  med_int  * fromnumnoe;              
-  med_int  * fromnufano;              
-  
-  med_int  * tonumnoe;                
-  med_int  * tonufano;                
-  
-  med_int fromnhexa8;
-  med_int  * fromhexa8;                                          
-  
-  med_int tonhexa8;
-  med_int  * tohexa8;                                          
-  
-  
-  char  * fromnomhexa8;             
-  med_int * fromnumhexa8;                                              
-  med_int * fromnufahexa8;                                             
-  
-  char  * tonomhexa8;             
-  med_int * tonumhexa8;                                              
-  med_int * tonufahexa8;                                             
-  
-  /*****************************************************************************************************/
-
-  char nomfam[MED_TAILLE_NOM+1];
-  med_int numfam;
-  char attdes[MED_TAILLE_DESC+1];
-  med_int natt;
-  med_int attide;
-  med_int attval;
-  med_int ngro;
-  char gro[MED_TAILLE_LNOM+1];
-  char gro2[MED_TAILLE_LNOM*2+1];
-  char gro3[MED_TAILLE_LNOM*3+1];
-  int nfame = 1; 
-  int nfamn = 1;
-  
-  /*****************************************************************************************************/
-
-  /* Some fields : one on nodes : double , one on cells : double */
-
-  char champnode[MED_TAILLE_NOM+1]="fieldnodedouble" ;
-  char champnode_comp[MED_TAILLE_PNOM+1]="X+Y+Z           " ;
-  char champnode_unit[MED_TAILLE_PNOM+1]="X+Y+Z           " ;
-  med_float   * fieldnodedouble;
-
-  char champnodevector[MED_TAILLE_NOM+1]="fieldnodedoublevector" ;
-  char champnodevector_comp[MED_TAILLE_PNOM*3+1]="0	        1	        2	        " ;
-  char champnodevector_unit[MED_TAILLE_PNOM*3+1]="O	        1	        2	        " ;
-  med_float   * fieldnodedoublevector;
-
-  char champcellscalar[MED_TAILLE_NOM+1]="fieldcelldouble" ;
-  char champcellscalar_comp[MED_TAILLE_PNOM+1]="X+Y+Z           " ;
-  char champcellscalar_unit[MED_TAILLE_PNOM+1]="X+Y+Z           " ;
-  med_float   * fieldcelldouble;
-
-  char champcell[MED_TAILLE_NOM+1]="fieldcelldoublevector" ;
-  char champcell_comp[MED_TAILLE_PNOM*3+1]="0               1               2               " ;
-  char champcell_unit[MED_TAILLE_PNOM*3+1]="0               1               2               " ;
-  med_float   * fieldcelldoublevector;
-
-  /*****************************************************************************************************/
-
-  if (argc!=2) 
-    {
-      printf("Il manque un paramètre : le nombre de point par ligne\n");
-      exit(-1);
-    }
-  
-  sscanf(argv[1],"%d",&nnpl);
-	
-  printf("VERSION 2.0\n");
-  printf("Traitement avec %d noeuds par ligne\n",nnpl);
-
-  fromnnoe   = nnpl*nnpl*nnpl             ;
-  fromnhexa8 = (nnpl-1)*(nnpl-1)*(nnpl-1) ;
-  tonnoe     = (nnpl-1)*(nnpl-1)*(nnpl-1) ;
-  tonhexa8   = (nnpl-2)*(nnpl-2)*(nnpl-2) ;
-  
-  nbr_nodes=nnpl*nnpl*nnpl;
-  nbr_hexa8=(nnpl-1)*(nnpl-1)*(nnpl-1);
-
-  fromcoo       = (med_float *) malloc(3*nbr_nodes*sizeof(med_float));
-  cree_nodes	    ( fromcoo	    , nnpl, 0 );
-
-  fromnumnoe    = (med_int *) malloc(nbr_nodes*sizeof(med_int));
-  cree_num_nodes    ( fromnumnoe    , nnpl );
-
-  fromnufano    = (med_int *) malloc(nbr_nodes*sizeof(med_int));
-  cree_fam_nodes    ( fromnufano    , nnpl );
-
-  fromhexa8     = (med_int *) malloc(8*nbr_hexa8*sizeof(med_int));
-  cree_Hexa8	    ( fromhexa8     , nnpl ,fromnumnoe);
-
-  fromnomhexa8  = (char *)  malloc((nbr_hexa8*MED_TAILLE_PNOM+1)*sizeof(char));
-  cree_noms_mailles ( fromnomhexa8  , nnpl );
-
-  fromnumhexa8  = (med_int *)   malloc(nbr_hexa8*sizeof(med_int));
-  cree_num_mailles  ( fromnumhexa8  , nnpl );
-
-  fromnufahexa8 = (med_int *)   malloc(nbr_hexa8*sizeof(med_int));
-  cree_fam_mailles  ( fromnufahexa8 , nnpl );
-
-  fieldnodedouble       = (med_float *) malloc(nbr_nodes*sizeof(med_float));
-  cree_valeurs_champ_node	   ( fieldnodedouble	   , nnpl );
-
-  fieldnodedoublevector = (med_float *) malloc(3*nbr_nodes*sizeof(med_float));
-  cree_valeurs_champ_vector_node ( fieldnodedoublevector , nnpl );
-
-  fieldcelldouble       = (med_float *) malloc(nbr_hexa8*sizeof(med_float));
-  cree_valeurs_champ_cell	   ( fieldcelldouble	   , nnpl );
-
-  fieldcelldoublevector = (med_float *) malloc(3*nbr_hexa8*sizeof(med_float));
-  cree_valeurs_champ_vector_cell ( fieldcelldoublevector , nnpl );
-	
-  nbr_nodes=(nnpl-1)*(nnpl-1)*(nnpl-1);
-  nbr_hexa8=(nnpl-2)*(nnpl-2)*(nnpl-2);
-
-  tocoo       = (med_float *) malloc(3*nbr_nodes*sizeof(med_float));
-  cree_nodes	  ( tocoo       , nnpl-1, 1 );
-
-  tonumnoe    = (med_int *)   malloc(nbr_nodes*sizeof(med_int));
-  cree_num_nodes    ( tonumnoe    , nnpl-1 );
-
-  tonufano    = (med_int *)   malloc(nbr_nodes*sizeof(med_int));
-  cree_fam_nodes    ( tonufano    , nnpl-1 );
-
-  tohexa8     = (med_int *)   malloc(8*nbr_hexa8*sizeof(med_int));
-  cree_Hexa8	  ( tohexa8     , nnpl-1 ,tonumnoe);
-
-  tonomhexa8 = (char *) malloc((nbr_hexa8*MED_TAILLE_PNOM+1)*sizeof(char));
-  cree_noms_mailles ( tonomhexa8  , nnpl-1 );
+	int i,j,k;
+	
+	int nnpl;
+	
+	int nbr_nodes, nbr_hexa8;
+
+	med_err ret;
+	med_idt fromfid;
+	med_idt tofid;
+	char frommaa[MED_TAILLE_NOM+1] = "fromMesh";
+	char tomaa[MED_TAILLE_NOM+1]   = "toMesh";
+	const med_int mdim = 3;
+	med_int fromnnoe;
+	med_int   tonnoe;
+	
+	med_float * tocoo;                   
+	med_float * fromcoo;                 
+	
+	char nomcoo[3*MED_TAILLE_PNOM+1] = "x	    y	    z	    ";
+	char unicoo[3*MED_TAILLE_PNOM+1] = "cm      cm      cm      ";
 
-  tonumhexa8  = (med_int *)   malloc(nbr_hexa8*sizeof(med_int));
-  cree_num_mailles  ( tonumhexa8  , nnpl-1 );
+	char * nomnoe = NULL ;
+	
+	med_int  * fromnumnoe;              
+	med_int  * fromnufano;              
+
+	med_int  * tonumnoe;                
+	med_int  * tonufano;                
+
+	med_int fromnhexa8;
+	med_int  * fromhexa8;                                          
+			     
+	med_int tonhexa8;
+	med_int  * tohexa8;                                          
+			     
+			     
+	char  * fromnomhexa8;             
+	med_int * fromnumhexa8;                                              
+	med_int * fromnufahexa8;                                             
+
+	char  * tonomhexa8;             
+	med_int * tonumhexa8;                                              
+	med_int * tonufahexa8;                                             
 
-  tonufahexa8 = (med_int *)   malloc(nbr_hexa8*sizeof(med_int));
-  cree_fam_mailles  ( tonufahexa8 , nnpl-1 );
+/*****************************************************************************************************/
 
-	
-  /*****************************************************************************************************/
-  fromfid = MEDouvrir("fromMesh.med",MED_LECTURE_ECRITURE);
+	char nomfam[MED_TAILLE_NOM+1];
+	med_int numfam;
+	char attdes[MED_TAILLE_DESC+1];
+	med_int natt;
+	med_int attide;
+	med_int attval;
+	med_int ngro;
+	char gro[MED_TAILLE_LNOM+1];
+	char gro2[MED_TAILLE_LNOM*2+1];
+	char gro3[MED_TAILLE_LNOM*3+1];
+	int nfame = 1; 
+	int nfamn = 1;
 
-  if (fromfid < 0)
-    ret = -1;
-  else
-    ret = 0;
+/*****************************************************************************************************/
 
-  printf("MEDouvrir : %d\n",ret);
-  /*****************************************************************************************************/
-  tofid = MEDouvrir("toMesh.med",MED_LECTURE_ECRITURE);
+	/* Some fields : one on nodes : double , one on cells : double */
 
-  if (tofid < 0)
-    ret = -1;
-  else
-    ret = 0;
+	char champnode[MED_TAILLE_NOM+1]="fieldnodedouble" ;
+	char champnode_comp[MED_TAILLE_PNOM+1]="X+Y+Z   " ;
+	char champnode_unit[MED_TAILLE_PNOM+1]="X+Y+Z   " ;
+	med_float   * fieldnodedouble;
 
-  printf("MEDouvrir : %d\n",ret);
-  /*****************************************************************************************************/
-  if (ret == 0)
-    ret = MEDmaaCr(fromfid,frommaa,mdim,MED_NON_STRUCTURE,frommaadesc);
+	char champnodevector[MED_TAILLE_NOM+1]="fieldnodedoublevector" ;
+	char champnodevector_comp[MED_TAILLE_PNOM*3+1]="0	1	2	" ;
+	char champnodevector_unit[MED_TAILLE_PNOM*3+1]="O	1	2	" ;
+	med_float   * fieldnodedoublevector;
 
-  printf("MEDmaaCr : %d\n",ret);
-  /*****************************************************************************************************/
-  if (ret == 0)
-    ret = MEDmaaCr(tofid,tomaa,mdim,MED_NON_STRUCTURE,tomaadesc);
+	char champcellscalar[MED_TAILLE_NOM+1]="fieldcelldouble" ;
+	char champcellscalar_comp[MED_TAILLE_PNOM+1]="X+Y+Z   " ;
+	char champcellscalar_unit[MED_TAILLE_PNOM+1]="X+Y+Z   " ;
+	med_float   * fieldcelldouble;
 
-  printf("MEDmaaCr : %d\n",ret);
-  /*****************************************************************************************************/
-  if (ret == 0)
-    ret = MEDnoeudsEcr(fromfid,frommaa,mdim,fromcoo,MED_FULL_INTERLACE,
-		       MED_CART,nomcoo,unicoo,nomnoe,MED_FAUX,fromnumnoe,
-		       MED_FAUX,fromnufano,fromnnoe);
+	char champcell[MED_TAILLE_NOM+1]="fieldcelldoublevector" ;
+	char champcell_comp[MED_TAILLE_PNOM*3+1]="0       1       2       " ;
+	char champcell_unit[MED_TAILLE_PNOM*3+1]="0       1       2       " ;
+	med_float   * fieldcelldoublevector;
 
-  printf("MEDnoeudsEcr : %d\n",ret);
-  /*****************************************************************************************************/
-  if (ret == 0)
-    ret = MEDnoeudsEcr(tofid,tomaa,mdim,tocoo,MED_FULL_INTERLACE,MED_CART,
-		       nomcoo,unicoo,nomnoe,MED_FAUX,tonumnoe,MED_FAUX,
-		       tonufano,tonnoe);
+/*****************************************************************************************************/
 
-  printf("MEDnoeudsEcr : %d\n",ret);  
+	
+	if (argc!=2) 
+		{
+		printf("Il manque un paramètre : le nombre de point par ligne\n");
+		exit(-1);
+		}
 
-  /*****************************************************************************************************/
-  /* ecriture des mailles MED_HEXA8 :
-     - connectivite
-     - noms (optionnel) 
-     - numeros (optionnel)
-     - numeros des familles */
+	sscanf(argv[1],"%d",&nnpl);
+	
+	printf("VERSION 2.0\n");
+	printf("Traitement avec %d noeuds par ligne\n",nnpl);
 
-  if (ret == 0) 
-    ret = MEDelementsEcr(fromfid,frommaa,mdim,fromhexa8,MED_FULL_INTERLACE,
-			 fromnomhexa8,MED_FAUX,fromnumhexa8,MED_VRAI,
-			 fromnufahexa8,fromnhexa8,MED_MAILLE,
-			 MED_HEXA8,MED_NOD);
+	fromnnoe   = nnpl*nnpl*nnpl             ;
+	fromnhexa8 = (nnpl-1)*(nnpl-1)*(nnpl-1) ;
+	tonnoe     = (nnpl-1)*(nnpl-1)*(nnpl-1) ;
+	tonhexa8   = (nnpl-2)*(nnpl-2)*(nnpl-2) ;
 
-  printf("MEDelementsEcr : %d \n",ret);
-  /*****************************************************************************************************/
-/* ecriture des mailles MED_HEXA8 :
-   - connectivite
-   - noms (optionnel) 
-   - numeros (optionnel)
-   - numeros des familles */
 
-  if (ret == 0) 
-    ret = MEDelementsEcr(tofid,tomaa,mdim,tohexa8,MED_FULL_INTERLACE,
-			 tonomhexa8,MED_FAUX,tonumhexa8,MED_VRAI,tonufahexa8,
-			 tonhexa8,MED_MAILLE,MED_HEXA8,MED_NOD);
 
-  printf("MEDelementsEcr : %d \n",ret);
-  /*****************************************************************************************************/
-  /* ecriture des familles */
-  /* Conventions :
-     - toujours creer une famille de numero 0 ne comportant aucun attribut
-     ni groupe (famille de reference pour les noeuds ou les elements
-     qui ne sont rattaches a aucun groupe ni attribut)
-     - les numeros de familles de noeuds sont > 0
-     - les numeros de familles des elements sont < 0
-   - rien d'imposer sur les noms de familles
-  */ 
-
-  /* la famille 0 */
-
-  if (ret == 0)
-    {
-      strcpy(nomfam,"FAMILLE_0");
-      numfam = 0;
-      ret = MEDfamCr(fromfid,frommaa,nomfam,numfam,&attide,&attval,attdes,0,
-		     gro,0);
-    }
-
-  printf("MEDfamCr : %d \n",ret);
-  /*****************************************************************************************************/
-  if (ret == 0)
-    {
-      strcpy(nomfam,"FAMILLE_0");
-      numfam = 0;
-      ret = MEDfamCr(tofid,tomaa,nomfam,numfam,&attide,&attval,attdes,0,gro,0);
-    }
-
-  printf("MEDfamCr : %d \n",ret);
-  /*****************************************************************************************************/
-  /* Les champs */
-
-  if (ret == 0)
-    {
-      ret = MEDchampCr(fromfid,champnode,MED_FLOAT64,champnode_comp,
-		       champnode_unit,1); 
-
-      printf("MEDchampCr : %d \n",ret); 
-
-      if (ret == 0) 
-	{
-	  ret = MEDchampEcr(fromfid, frommaa, champnode,
-			    (unsigned char *)fieldnodedouble,
-			    MED_FULL_INTERLACE, fromnnoe, MED_NOGAUSS,
-			    MED_ALL, MED_NOPFL, MED_NO_PFLMOD, MED_NOEUD, 0,
-			    MED_NOPDT,"        ", 0. , MED_NONOR);
+	nbr_nodes=nnpl*nnpl*nnpl;
+	nbr_hexa8=(nnpl-1)*(nnpl-1)*(nnpl-1);
 
-	  printf("MEDchampEcr : %d \n",ret);
-	}
-    }
+	fromcoo       = (med_float *) malloc(3*nbr_nodes*sizeof(med_float));		  cree_nodes	    ( fromcoo	    , nnpl, 0 );
+	fromnumnoe    = (med_int *)   malloc(nbr_nodes*sizeof(med_int));		  cree_num_nodes    ( fromnumnoe    , nnpl );
+	fromnufano    = (med_int *)   malloc(nbr_nodes*sizeof(med_int));		  cree_fam_nodes    ( fromnufano    , nnpl );
+	fromhexa8     = (med_int *)   malloc(8*nbr_hexa8*sizeof(med_int));		  cree_Hexa8	    ( fromhexa8     , nnpl ,fromnumnoe);
+	fromnomhexa8  = (char *)      malloc((nbr_hexa8*MED_TAILLE_PNOM+1)*sizeof(char)); cree_noms_mailles ( fromnomhexa8  , nnpl );
+	fromnumhexa8  = (med_int *)   malloc(nbr_hexa8*sizeof(med_int));		  cree_num_mailles  ( fromnumhexa8  , nnpl );
+	fromnufahexa8 = (med_int *)   malloc(nbr_hexa8*sizeof(med_int));		  cree_fam_mailles  ( fromnufahexa8 , nnpl );
 
-  if (ret == 0)
-    {
-      ret = MEDchampCr(fromfid,champcell,MED_FLOAT64,champcell_comp,
-		       champcell_unit,3);
+	fieldnodedouble       = (med_float *) malloc(nbr_nodes*sizeof(med_float));	    cree_valeurs_champ_node	   ( fieldnodedouble	   , nnpl );
+	fieldnodedoublevector = (med_float *) malloc(3*nbr_nodes*sizeof(med_float));	    cree_valeurs_champ_vector_node ( fieldnodedoublevector , nnpl );
+	fieldcelldouble       = (med_float *) malloc(nbr_hexa8*sizeof(med_float));	    cree_valeurs_champ_cell	   ( fieldcelldouble	   , nnpl );
+	fieldcelldoublevector = (med_float *) malloc(3*nbr_hexa8*sizeof(med_float));	    cree_valeurs_champ_vector_cell ( fieldcelldoublevector , nnpl );
+	
 
-      printf("MEDchampCr : %d \n",ret);
+	nbr_nodes=(nnpl-1)*(nnpl-1)*(nnpl-1);
+	nbr_hexa8=(nnpl-2)*(nnpl-2)*(nnpl-2);
 
-      if (ret == 0) 
-	{
-	  ret = MEDchampEcr(fromfid, frommaa, champcell,
-			    (unsigned char *)fieldcelldoublevector,
-			    MED_FULL_INTERLACE, fromnhexa8, MED_NOGAUSS,
-			    MED_ALL, MED_NOPFL, MED_NO_PFLMOD, MED_MAILLE,
-			    MED_HEXA8, MED_NOPDT,"        ", 0., MED_NONOR);
+	tocoo       = (med_float *) malloc(3*nbr_nodes*sizeof(med_float));	        cree_nodes	  ( tocoo       , nnpl-1, 1 );
+	tonumnoe    = (med_int *)   malloc(nbr_nodes*sizeof(med_int)); 		        cree_num_nodes    ( tonumnoe    , nnpl-1 );
+	tonufano    = (med_int *)   malloc(nbr_nodes*sizeof(med_int)); 		        cree_fam_nodes    ( tonufano    , nnpl-1 );
+	tohexa8     = (med_int *)   malloc(8*nbr_hexa8*sizeof(med_int));		cree_Hexa8	  ( tohexa8     , nnpl-1 ,tonumnoe);
+	tonomhexa8  = (char *)      malloc((nbr_hexa8*MED_TAILLE_PNOM+1)*sizeof(char)); cree_noms_mailles ( tonomhexa8  , nnpl-1 );
+	tonumhexa8  = (med_int *)   malloc(nbr_hexa8*sizeof(med_int)); 		        cree_num_mailles  ( tonumhexa8  , nnpl-1 );
+	tonufahexa8 = (med_int *)   malloc(nbr_hexa8*sizeof(med_int)); 		        cree_fam_mailles  ( tonufahexa8 , nnpl-1 );
 
-	  printf("MEDchampEcr : %d \n",ret);
-	}
-    }
-  
-  if (ret == 0)
-    {
-      ret = MEDchampCr(fromfid,champcellscalar,MED_FLOAT64,
-		       champcellscalar_comp,champcellscalar_unit,1); 
+	
+/*****************************************************************************************************/
+	fromfid = MEDouvrir("fromMesh.med",MED_REMP);
+	if (fromfid < 0)
+		ret = -1;
+	else
+		ret = 0;
+	printf("MEDouvrir : %d\n",ret);
+
+/*****************************************************************************************************/
+	tofid = MEDouvrir("toMesh.med",MED_REMP);
+	if (tofid < 0)
+		ret = -1;
+	else
+		ret = 0;
+	printf("MEDouvrir : %d\n",ret);
+/*****************************************************************************************************/
+	if (ret == 0)
+  		ret = MEDmaaCr(fromfid,frommaa,mdim);
+	printf("MEDmaaCr : %d\n",ret);
 
-      printf("MEDchampCr : %d \n",ret); 
+/*****************************************************************************************************/
 
-      if (ret == 0) 
-	{
-	  ret = MEDchampEcr(fromfid, frommaa, champcellscalar,
-			    (unsigned char *)fieldcelldouble,
-			    MED_FULL_INTERLACE, fromnhexa8, MED_NOGAUSS,
-			    MED_ALL, MED_NOPFL, MED_NO_PFLMOD, MED_MAILLE, 
-			    MED_HEXA8, MED_NOPDT,"        ", 0., MED_NONOR);
+	if (ret == 0)
+  		ret = MEDmaaCr(tofid,tomaa,mdim);
+	printf("MEDmaaCr : %d\n",ret);
 
-	  printf("MEDchampEcr : %d \n",ret);
-	}
-    }
-  
-  if (ret == 0)
-    {
-      ret = MEDchampCr(fromfid,champnodevector,MED_FLOAT64,
-		       champnodevector_comp,champnodevector_unit,3);
-      printf("MEDchampCr : %d \n",ret);
-
-      if (ret == 0) 
-	{
-	  ret = MEDchampEcr(fromfid, frommaa, champnodevector,
-			    (unsigned char *)fieldnodedoublevector,
-			    MED_FULL_INTERLACE, fromnnoe, MED_NOGAUSS,
-			    MED_ALL, MED_NOPFL, MED_NO_PFLMOD, MED_NOEUD, 
-			    0, MED_NOPDT,"        ", 0. , MED_NONOR);
+/*****************************************************************************************************/
+	if (ret == 0)
+  		ret = MEDnoeudsEcr(fromfid,frommaa,mdim,fromcoo,MED_FULL_INTERLACE,MED_CART,
+        			     // nomcoo,unicoo,nomnoe,MED_FAUX,fromnumnoe,MED_VRAI,
+				     nomcoo,unicoo,nomnoe,MED_FAUX,fromnumnoe,MED_FAUX,
+	        		     fromnufano,fromnnoe,MED_ECRI);
+	printf("MEDnoeudsEcr : %d\n",ret);
+/*****************************************************************************************************/
 
-	  printf("MEDchampEcr : %d \n",ret);
-	}
-    }
-  
-  
-  /***************************************************************************/
-  ret = MEDfermer(fromfid);
+	if (ret == 0)
+  		ret = MEDnoeudsEcr(tofid,tomaa,mdim,tocoo,MED_FULL_INTERLACE,MED_CART,
+        			     //nomcoo,unicoo,nomnoe,MED_FAUX,tonumnoe,MED_VRAI,
+				     nomcoo,unicoo,nomnoe,MED_FAUX,tonumnoe,MED_FAUX,
+	        		     tonufano,tonnoe,MED_ECRI);
+	printf("MEDnoeudsEcr : %d\n",ret);
 
-  printf("MEDfermer : %d\n",ret);
-  /***************************************************************************/
-  ret = MEDfermer(tofid);
 
-  printf("MEDfermer : %d\n",ret);
+/*****************************************************************************************************/
+/* ecriture des mailles MED_HEXA8 :
+   - connectivite
+   - noms (optionnel) 
+   - numeros (optionnel)
+   - numeros des familles */
+	if (ret == 0) 
+  		ret = MEDelementsEcr(fromfid,frommaa,mdim,fromhexa8,MED_FULL_INTERLACE,
+        		       		fromnomhexa8,MED_FAUX,fromnumhexa8,MED_VRAI,fromnufahexa8,fromnhexa8,
+        	       			MED_MAILLE,MED_HEXA8,MED_NOD,MED_ECRI);
+	printf("MEDelementsEcr : %d \n",ret);
 
-  return 0;
+/*****************************************************************************************************/
+/* ecriture des mailles MED_HEXA8 :
+   - connectivite
+   - noms (optionnel) 
+   - numeros (optionnel)
+   - numeros des familles */
+
+	if (ret == 0) 
+  		ret = MEDelementsEcr(tofid,tomaa,mdim,tohexa8,MED_FULL_INTERLACE,
+        	       			tonomhexa8,MED_FAUX,tonumhexa8,MED_VRAI,tonufahexa8,tonhexa8,
+		        	        MED_MAILLE,MED_HEXA8,MED_NOD,MED_ECRI);
+	printf("MEDelementsEcr : %d \n",ret);
+
+/*****************************************************************************************************/
+/* ecriture des familles */
+/* Conventions :
+   - toujours creer une famille de numero 0 ne comportant aucun attribut
+     ni groupe (famille de reference pour les noeuds ou les elements
+     qui ne sont rattaches a aucun groupe ni attribut)
+   - les numeros de familles de noeuds sont > 0
+   - les numeros de familles des elements sont < 0
+   - rien d'imposer sur les noms de familles
+ */ 
+
+/* la famille 0 */
+	if (ret == 0)
+  		{
+    		strcpy(nomfam,"FAMILLE_0");
+		numfam = 0;
+    		ret = MEDfamCr(fromfid,frommaa,nomfam,numfam,&attide,&attval,attdes,0,gro,0);
+  		}
+	printf("MEDfamCr : %d \n",ret);
+/*****************************************************************************************************/
+
+	if (ret == 0)
+  		{
+    		strcpy(nomfam,"FAMILLE_0");
+    		numfam = 0;
+    		ret = MEDfamCr(tofid,tomaa,nomfam,numfam,&attide,&attval,attdes,0,gro,0);
+  		}
+	printf("MEDfamCr : %d \n",ret);
+
+/*****************************************************************************************************/
+/* Les champs */
+
+	if (ret == 0)
+  		{
+		ret = MEDchampCr(fromfid,champnode,MED_REEL64,champnode_comp,champnode_unit,1); 
+		printf("MEDchampCr : %d \n",ret); 
+    		if (ret == 0) 
+			{
+      			ret = MEDchampEcr(fromfid, frommaa, champnode, (unsigned char *)fieldnodedouble,
+        					MED_FULL_INTERLACE, fromnnoe,
+        					MED_NOPG, MED_ALL, MED_NOPFL, MED_ECRI, MED_NOEUD, 
+        					0, MED_NOPDT,"        ", 0. , MED_NONOR);
+      			printf("MEDchampEcr : %d \n",ret);
+    			}
+  		}
+
+	if (ret == 0)
+  		{
+    		ret = MEDchampCr(fromfid,champcell,MED_REEL64,champcell_comp,champcell_unit,3);
+    		printf("MEDchampCr : %d \n",ret);
+    		if (ret == 0) 
+			{
+      			ret = MEDchampEcr(fromfid, frommaa, champcell, (unsigned char *)fieldcelldoublevector,
+        					MED_FULL_INTERLACE, fromnhexa8,
+        					MED_NOPG, MED_ALL, MED_NOPFL, MED_ECRI, MED_MAILLE, 
+        					MED_HEXA8, MED_NOPDT,"        ", 0., MED_NONOR);
+      			printf("MEDchampEcr : %d \n",ret);
+    			}
+  		}
+
+	if (ret == 0)
+  		{
+		ret = MEDchampCr(fromfid,champcellscalar,MED_REEL64,champcellscalar_comp,champcellscalar_unit,1); 
+		printf("MEDchampCr : %d \n",ret); 
+    		if (ret == 0) 
+			{
+      			ret = MEDchampEcr(fromfid, frommaa, champcellscalar, (unsigned char *)fieldcelldouble,
+        					MED_FULL_INTERLACE, fromnhexa8,
+        					MED_NOPG, MED_ALL, MED_NOPFL, MED_ECRI, MED_MAILLE, 
+        					MED_HEXA8, MED_NOPDT,"        ", 0., MED_NONOR);
+      			printf("MEDchampEcr : %d \n",ret);
+    			}
+  		}
+
+	if (ret == 0)
+  		{
+    		ret = MEDchampCr(fromfid,champnodevector,MED_REEL64,champnodevector_comp,champnodevector_unit,3);
+    		printf("MEDchampCr : %d \n",ret);
+    		if (ret == 0) 
+			{
+      			ret = MEDchampEcr(fromfid, frommaa, champnodevector, (unsigned char *)fieldnodedoublevector,
+        					MED_FULL_INTERLACE, fromnnoe,
+        					MED_NOPG, MED_ALL, MED_NOPFL, MED_ECRI, MED_NOEUD, 
+        					0, MED_NOPDT,"        ", 0. , MED_NONOR);
+      			printf("MEDchampEcr : %d \n",ret);
+    			}
+  		}
+
+
+/***************************************************************************/
+ret = MEDfermer(fromfid);
+printf("MEDfermer : %d\n",ret);
+/***************************************************************************/
+ret = MEDfermer(tofid);
+printf("MEDfermer : %d\n",ret);
+
+return 0;
 }
 
diff --git a/src/MEDMEM/INTERPOLATION/test_MEDMEM_Interpolation.cxx b/src/MEDMEM/INTERPOLATION/test_MEDMEM_Interpolation.cxx
new file mode 100644
index 000000000..5d8112d8e
--- /dev/null
+++ b/src/MEDMEM/INTERPOLATION/test_MEDMEM_Interpolation.cxx
@@ -0,0 +1,56 @@
+#include "MEDMEM_Exception.hxx"
+#include "MEDMEM_define.hxx"
+
+#include "MEDMEM_Field.hxx"
+#include "MEDMEM_Mesh.hxx"
+#include "MEDMEM_Interpolation.hxx"
+
+#include "stdio.h"
+
+main () {
+  
+  const char * fromFileName  = "fromMesh.med";
+  const char * toFileName    = "toMesh.med";
+  //const char * fieldName     = "fieldcelldoublevector"; 
+  const char * fieldName     = "fieldnodedouble";
+
+  const char * fromMeshName  = "fromMesh";
+  const char * toMeshName    = "toMesh";
+
+  try {
+    
+    cout<<"Lecture du Maillage Source : "<<flush; MESH            fromMesh    (MED_DRIVER,fromFileName,fromMeshName);           cout<<"OK !"<<endl;
+    //cout<<"Construction du support    : "<<flush; SUPPORT         fromSupport (&fromMesh,"XsupportX",MED_CELL);                 cout<<"OK !"<<endl;    
+    cout<<"Construction du support    : "<<flush; SUPPORT         fromSupport (&fromMesh,"XsupportX",MED_NODE);                 cout<<"OK !"<<endl;
+    cout<<"Lecture du champ           : "<<flush; FIELD<double>   fromField   (&fromSupport,MED_DRIVER,fromFileName,fieldName); cout<<"OK !"<<endl;
+    cout<<"Lecture du Mailllage Cible : "<<flush; MESH            toMesh      (MED_DRIVER,toFileName,toMeshName);               cout<<"OK !"<<endl;
+    
+    INTERPOLATION<3> myInter (fromField,toMesh);
+    
+    //FIELD<double>   * toField = myInter.interpolate(0,1);
+    FIELD<double>   * toField = myInter.interpolate(1,1);
+    
+    cout<<"Creation du driver"<<endl;
+    
+    toField->addDriver(MED_DRIVER,toFileName,toField->getName()) ;
+
+    cout<<"toField->getName()			= "<<toField->getName() 		 <<endl;
+    cout<<"toField->getDescription()		= "<<toField->getDescription()  	 <<endl;
+    cout<<"toField->getNumberOfComponents()	= "<<toField->getNumberOfComponents()	 <<endl;
+    cout<<"toField->getNumberOfValues() 	= "<<toField->getNumberOfValues()	 <<endl;
+    cout<<"toField->getComponentsNames()	= "<<toField->getComponentsNames()	 <<endl;
+    cout<<"toField->getComponentsDescriptions() = "<<toField->getComponentsDescriptions()<<endl;
+    cout<<"toField->getMEDComponentsUnits()	= "<<toField->getMEDComponentsUnits()	 <<endl;
+    cout<<"toField->getIterationNumber()	= "<<toField->getIterationNumber()	 <<endl;
+    cout<<"toField->getTime()			= "<<toField->getTime() 		 <<endl;
+    cout<<"toField->getOrderNumber()		= "<<toField->getOrderNumber()  	 <<endl;
+    cout<<"toField->getValueType()		= "<<toField->getValueType()		 <<endl;
+
+    toField->write();
+
+    cout<<"Fin"<<endl;
+
+  } catch (MEDEXCEPTION& ex){
+    MESSAGE(ex.what()) ;
+  }
+}
diff --git a/src/MedClient/src/Makefile.in b/src/MedClient/src/Makefile.in
index dd4c7f090..04ae09a31 100644
--- a/src/MedClient/src/Makefile.in
+++ b/src/MedClient/src/Makefile.in
@@ -28,7 +28,7 @@
 top_srcdir=@top_srcdir@
 top_builddir=../../..
 srcdir=@srcdir@
-VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl:${KERNEL_ROOT_DIR}/idl/salome
+VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl
 
 MACHINE=PCLINUX
 
diff --git a/src/MedClient/test/environ/csh/init1.in b/src/MedClient/test/environ/csh/init1.in
index e0eb68e16..d5f917612 100644
--- a/src/MedClient/test/environ/csh/init1.in
+++ b/src/MedClient/test/environ/csh/init1.in
@@ -1,4 +1,4 @@
-cd ${SALOME_ROOT_DIR}/bin
+cd ${KERNEL_ROOT_DIR}/bin
 pwd
 ./allkill || true
 ./killall python || true
diff --git a/src/MedClient/test/environ/csh/init3.in b/src/MedClient/test/environ/csh/init3.in
index 388d8bb64..8bf9383d2 100644
--- a/src/MedClient/test/environ/csh/init3.in
+++ b/src/MedClient/test/environ/csh/init3.in
@@ -1,2 +1,2 @@
-cd ${SALOME_ROOT_DIR}/bin
+cd ${KERNEL_ROOT_DIR}/bin
 csh
diff --git a/src/MedClient/test/environ/csh/runContainer.in b/src/MedClient/test/environ/csh/runContainer.in
index 90fe75670..2d61eb8e8 100644
--- a/src/MedClient/test/environ/csh/runContainer.in
+++ b/src/MedClient/test/environ/csh/runContainer.in
@@ -4,20 +4,20 @@ set CONTAINER_NAME=$1
 
 set PYTHON_VERSION=python@PYTHON_VERSION@
 
-# you must define SALOME_ROOT_DIR and SALOME_SITE_DIR (if you need it)
+# you must define KERNEL_ROOT_DIR and MED_ROOT_DIR (if you need it)
 
-setenv SALOME_ROOT_DIR @prefix@
+setenv KERNEL_ROOT_DIR @prefix@
 
-if ( ${?SALOME_ROOT_DIR} ) then
-  setenv PATH ${SALOME_ROOT_DIR}/bin:${SALOME_ROOT_DIR}/Tests:${PATH}
-  setenv LD_LIBRARY_PATH ${SALOME_ROOT_DIR}/lib:${LD_LIBRARY_PATH}
-  setenv PYTHONPATH ${SALOME_ROOT_DIR}/lib:${SALOME_ROOT_DIR}/lib/${PYTHON_VERSION}/site-packages/salome:${PYTHONPATH}
+if ( ${?KERNEL_ROOT_DIR} ) then
+  setenv PATH ${KERNEL_ROOT_DIR}/bin:${KERNEL_ROOT_DIR}/Tests:${PATH}
+  setenv LD_LIBRARY_PATH ${KERNEL_ROOT_DIR}/lib:${LD_LIBRARY_PATH}
+  setenv PYTHONPATH ${KERNEL_ROOT_DIR}/lib:${KERNEL_ROOT_DIR}/lib/${PYTHON_VERSION}/site-packages/salome:${PYTHONPATH}
 endif
 
-if ( ${?SALOME_SITE_DIR} ) then
-  setenv PATH ${SALOME_SITE_DIR}/bin:${PATH}
-  setenv LD_LIBRARY_PATH ${SALOME_SITE_DIR}/lib:${LD_LIBRARY_PATH}
-  setenv PYTHONPATH ${SALOME_SITE_DIR}/lib:${SALOME_SITE_DIR}/lib/${PYTHON_VERSION}/site-packages/salome:${PYTHONPATH}
+if ( ${?MED_ROOT_DIR} ) then
+  setenv PATH ${MED_ROOT_DIR}/bin:${PATH}
+  setenv LD_LIBRARY_PATH ${MED_ROOT_DIR}/lib:${LD_LIBRARY_PATH}
+  setenv PYTHONPATH ${MED_ROOT_DIR}/lib:${MED_ROOT_DIR}/lib/${PYTHON_VERSION}/site-packages/salome:${PYTHONPATH}
 endif
 
 if ( -d ${HOME}/.salome/bin ) then
@@ -50,8 +50,8 @@ set CONTAINER_TYPE = `echo ${CONTAINER_NAME} | grep 'Py$'`
 echo ${?CONTAINER_TYPE}
 
 if ( ${?CONTAINER_TYPE} ) then
-	( ${SALOME_ROOT_DIR}/bin/SALOME_ContainerPy.py ${CONTAINER_NAME} &)
+	( ${KERNEL_ROOT_DIR}/bin/SALOME_ContainerPy.py ${CONTAINER_NAME} &)
 else
-	( ${SALOME_ROOT_DIR}/bin/SALOME_Container ${CONTAINER_NAME} & )
+	( ${KERNEL_ROOT_DIR}/bin/SALOME_Container ${CONTAINER_NAME} & )
 endif
 
diff --git a/src/MedClient/test/environ/csh/runEnvironTests.in b/src/MedClient/test/environ/csh/runEnvironTests.in
index 23d4400bc..69655e197 100644
--- a/src/MedClient/test/environ/csh/runEnvironTests.in
+++ b/src/MedClient/test/environ/csh/runEnvironTests.in
@@ -1,7 +1,7 @@
 #
 [ -f ~/.Xresources ] && xrdb ~/.Xresources
 
-setenv SALOME_BIN_TESTS ${SALOME_ROOT_DIR}/MED/src/MedClient/test/environ
+setenv SALOME_BIN_TESTS ${MED_ROOT_DIR}/MED/src/MedClient/test/environ
 
 [ -f ${SALOME_BIN_TESTS}/killEnviron ] && ${SALOME_BIN_TESTS}/killEnviron
 
@@ -27,6 +27,6 @@ echo "kill -9 $! >& /dev/null" >> ${SALOME_BIN_TESTS}/killEnviron
 ${TERMINAL} ${TITRE3} -e ${SALOME_BIN_TESTS}/csh/init3 &
 echo "kill -9 $! >& /dev/null" >> ${SALOME_BIN_TESTS}/killEnviron
 
-echo "cd ${SALOME_ROOT_DIR}/bin ; ./allkill ; killall python >& /dev/null" >> ${SALOME_BIN_TESTS}/killEnviron
+echo "cd ${MED_ROOT_DIR}/bin ; ./allkill ; killall python >& /dev/null" >> ${SALOME_BIN_TESTS}/killEnviron
 echo "\\rm -f ${SALOME_BIN_TESTS}/killEnviron" >> ${SALOME_BIN_TESTS}/killEnviron
 chmod u+x ${SALOME_BIN_TESTS}/killEnviron
diff --git a/src/MedClient/test/environ/csh/stopContainer.in b/src/MedClient/test/environ/csh/stopContainer.in
index 5d3a362be..95cfa69e4 100644
--- a/src/MedClient/test/environ/csh/stopContainer.in
+++ b/src/MedClient/test/environ/csh/stopContainer.in
@@ -34,19 +34,19 @@ fi
 
 PYTHON_VERSION=python2.2
 
-# you must define SALOME_ROOT_DIR and SALOME_SITE_DIR (if you need it)
+# you must define KERNEL_ROOT_DIR and MED_ROOT_DIR (if you need it)
 
-if test -n ${SALOME_ROOT_DIR}
+if test -n ${KERNEL_ROOT_DIR}
 then
-  export PATH=${SALOME_ROOT_DIR}/bin:${PATH}
-  export LD_LIBRARY_PATH=${SALOME_ROOT_DIR}/lib:${LD_LIBRARY_PATH}
-  export PYTHONPATH=${SALOME_ROOT_DIR}/lib:${SALOME_ROOT_DIR}/lib/${PYTHON_VERSION}/site-packages/salome:${PYTHONPATH}
+  export PATH=${KERNEL_ROOT_DIR}/bin:${PATH}
+  export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib:${LD_LIBRARY_PATH}
+  export PYTHONPATH=${KERNEL_ROOT_DIR}/lib:${KERNEL_ROOT_DIR}/lib/${PYTHON_VERSION}/site-packages/salome:${PYTHONPATH}
 fi
-if test -n ${SALOME_SITE_DIR}
+if test -n ${MED_ROOT_DIR}
 then
-  export PATH=${SALOME_SITE_DIR}/bin:${PATH}
-  export LD_LIBRARY_PATH=${SALOME_SITE_DIR}/lib:${LD_LIBRARY_PATH}
-  export PYTHONPATH=${SALOME_SITE_DIR}/lib:${SALOME_SITE_DIR}/lib/${PYTHON_VERSION}/site-packages/salome:${PYTHONPATH}
+  export PATH=${MED_ROOT_DIR}/bin:${PATH}
+  export LD_LIBRARY_PATH=${MED_ROOT_DIR}/lib:${LD_LIBRARY_PATH}
+  export PYTHONPATH=${MED_ROOT_DIR}/lib:${MED_ROOT_DIR}/lib/${PYTHON_VERSION}/site-packages/salome:${PYTHONPATH}
 fi
 
 if test -d ${HOME}/.salome/bin
diff --git a/src/MedClient/test/environ/runTestMedCorba.in b/src/MedClient/test/environ/runTestMedCorba.in
index 0e33fed11..c152b3c71 100644
--- a/src/MedClient/test/environ/runTestMedCorba.in
+++ b/src/MedClient/test/environ/runTestMedCorba.in
@@ -2,19 +2,19 @@
  
 PYTHON_VERSION=python@PYTHON_VERSION@                                                                 
 
-if test -n $SALOME_ROOT_DIR
+if test -n $MED_ROOT_DIR
 then
-  export PATH=$SALOME_ROOT_DIR/bin:${PATH}
-  export LD_LIBRARY_PATH=$SALOME_ROOT_DIR/lib:${LD_LIBRARY_PATH}
-  export PYTHONPATH=${SALOME_ROOT_DIR}/lib:${SALOME_ROOT_DIR}/lib/$PYTHON_VERSION/site-packages/salome:${SALOME_ROOT_DIR}/share/salome/resources:${PYTHONPATH}
+  export PATH=$MED_ROOT_DIR/bin:${PATH}
+  export LD_LIBRARY_PATH=$MED_ROOT_DIR/lib:${LD_LIBRARY_PATH}
+  export PYTHONPATH=${MED_ROOT_DIR}/lib:${MED_ROOT_DIR}/lib/$PYTHON_VERSION/site-packages/salome:${MED_ROOT_DIR}/share/salome/resources:${PYTHONPATH}
   # add bin, because some script are in (SALOME_SWIG) !!!!
-  export PYTHONPATH=${SALOME_ROOT_DIR}/bin:${PYTHONPATH}
+  export PYTHONPATH=${MED_ROOT_DIR}/bin:${PYTHONPATH}
 fi
-if test -n $SALOME_SITE_DIR
+if test -n $MED_ROOT_DIR
 then
-  export PATH=$SALOME_SITE_DIR/bin:${PATH}
-  export LD_LIBRARY_PATH=$SALOME_SITE_DIR/lib:${LD_LIBRARY_PATH}
-  export PYTHONPATH=${SALOME_SITE_DIR}/lib:${SALOME_SITE_DIR}/lib/$PYTHON_VERSION/site-packages/salome:${SALOME_SITE_DIR}/share/salome/resources:${PYTHONPATH}
+  export PATH=$MED_ROOT_DIR/bin:${PATH}
+  export LD_LIBRARY_PATH=$MED_ROOT_DIR/lib:${LD_LIBRARY_PATH}
+  export PYTHONPATH=${MED_ROOT_DIR}/lib:${MED_ROOT_DIR}/lib/$PYTHON_VERSION/site-packages/salome:${MED_ROOT_DIR}/share/salome/resources:${PYTHONPATH}
 fi
 
 mkdir -p resultats
diff --git a/src/MedClient/test/test1/Makefile.in b/src/MedClient/test/test1/Makefile.in
index d40d1998f..560a739e3 100644
--- a/src/MedClient/test/test1/Makefile.in
+++ b/src/MedClient/test/test1/Makefile.in
@@ -28,7 +28,7 @@
 top_srcdir=@top_srcdir@
 top_builddir=../../../..
 srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:@srcdir@/resources:@top_srcdir@/idl:${KERNEL_ROOT_DIR}/idl/salome
+VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:@srcdir@/resources:@top_srcdir@/idl
 
 @COMMENCE@
 
diff --git a/src/MedClient/test/test1/TestMedCorba1.py b/src/MedClient/test/test1/TestMedCorba1.py
index 51e414e9d..c62ef22ce 100644
--- a/src/MedClient/test/test1/TestMedCorba1.py
+++ b/src/MedClient/test/test1/TestMedCorba1.py
@@ -1,5 +1,5 @@
 import os
-BASE = os.environ["SALOME_ROOT_DIR"] + '/share/salome/resources/'
+BASE = os.environ["MED_ROOT_DIR"] + '/share/salome/resources/'
 
 fileName = BASE + 'pointe.med'
 fileName = BASE + 'carre_en_quad4_seg2.med'
diff --git a/src/MedClient/test/test1/TestMedCorba2.py b/src/MedClient/test/test1/TestMedCorba2.py
index 04960610c..6376e4da3 100644
--- a/src/MedClient/test/test1/TestMedCorba2.py
+++ b/src/MedClient/test/test1/TestMedCorba2.py
@@ -1,5 +1,5 @@
 import os
-BASE = os.environ["SALOME_ROOT_DIR"] + '/share/salome/resources/'
+BASE = os.environ["MED_ROOT_DIR"] + '/share/salome/resources/'
 
 fileName = BASE + 'pointe.med'
 fileName = BASE + 'carre_en_quad4_seg2.med'
diff --git a/src/MedClient/test/test1/TestMedCorba3.py b/src/MedClient/test/test1/TestMedCorba3.py
index a13b7555d..9ec34ebe2 100644
--- a/src/MedClient/test/test1/TestMedCorba3.py
+++ b/src/MedClient/test/test1/TestMedCorba3.py
@@ -1,5 +1,5 @@
 import os
-BASE = os.environ["SALOME_ROOT_DIR"] + '/share/salome/resources/'
+BASE = os.environ["MED_ROOT_DIR"] + '/share/salome/resources/'
 
 fileName = BASE + 'pointe.med'
 fileName = BASE + 'carre_en_quad4_seg2.med'
diff --git a/src/MedClient/test/test1/TestMedCorba4.py b/src/MedClient/test/test1/TestMedCorba4.py
index 341db6e7d..f937a640d 100644
--- a/src/MedClient/test/test1/TestMedCorba4.py
+++ b/src/MedClient/test/test1/TestMedCorba4.py
@@ -1,5 +1,5 @@
 import os
-BASE = os.environ["SALOME_ROOT_DIR"] + '/share/salome/resources/'
+BASE = os.environ["MED_ROOT_DIR"] + '/share/salome/resources/'
 
 fileName = BASE + 'pointe.med'
 fileName = BASE + 'carre_en_quad4_seg2.med'
diff --git a/src/MedClient/test/test1/TestMedCorba5.py b/src/MedClient/test/test1/TestMedCorba5.py
index 7b5b47da9..f18add816 100644
--- a/src/MedClient/test/test1/TestMedCorba5.py
+++ b/src/MedClient/test/test1/TestMedCorba5.py
@@ -1,5 +1,5 @@
 import os
-BASE = os.environ["SALOME_ROOT_DIR"] + '/share/salome/resources/'
+BASE = os.environ["MED_ROOT_DIR"] + '/share/salome/resources/'
 
 fileName = BASE + 'pointe.med'
 fileName = BASE + 'carre_en_quad4_seg2.med'
diff --git a/src/MedClient/test/test1/resources/CatalogModuleTest.xml b/src/MedClient/test/test1/resources/CatalogModuleTest.xml
new file mode 100644
index 000000000..431ae25c8
--- /dev/null
+++ b/src/MedClient/test/test1/resources/CatalogModuleTest.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='us-ascii' ?>
+ 
+<!-- XML component catalog -->
+<begin-catalog>
+
+<!-- Path prefix information -->
+
+<path-prefix-list>
+</path-prefix-list>
+
+<!-- Component list -->
+<component-list>
+        <component>
+                <!-- Component identification -->
+                <component-name>Compo1Py</component-name>
+                <component-type>Solver</component-type>
+                <component-author>RASCLE</component-author>
+                <component-version> 1.0</component-version>
+                <component-comment>Essai Aster</component-comment>
+                <component-multistudy>1</component-multistudy>
+                <component-icone>ModuleASTER.png</component-icone>
+        <constraint>hostname = localhost</constraint>
+        </component>
+</component-list>
+</begin-catalog>
diff --git a/src/MedClient/test/test2/Makefile.in b/src/MedClient/test/test2/Makefile.in
index 3d323f8fd..30976ae43 100644
--- a/src/MedClient/test/test2/Makefile.in
+++ b/src/MedClient/test/test2/Makefile.in
@@ -28,7 +28,7 @@
 top_srcdir=@top_srcdir@
 top_builddir=../../../..
 srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl:${KERNEL_ROOT_DIR}/idl/salome
+VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl
 
 @COMMENCE@
 
diff --git a/src/MedClient/test/test2/TestMedCorba6.py b/src/MedClient/test/test2/TestMedCorba6.py
index 7b6dc840e..403690f02 100644
--- a/src/MedClient/test/test2/TestMedCorba6.py
+++ b/src/MedClient/test/test2/TestMedCorba6.py
@@ -3,7 +3,7 @@ import os
 ## ne fonctionne pas ?
 ## import salome
 
-BASE = os.environ["SALOME_ROOT_DIR"] + '/share/salome/resources/'
+BASE = os.environ["MED_ROOT_DIR"] + '/share/salome/resources/'
 
 fileName = BASE + 'pointe.med'
 fileName = BASE + 'carre_en_quad4_seg2.med'
diff --git a/src/MedClient/test/test2/TestMedCorba7.py b/src/MedClient/test/test2/TestMedCorba7.py
index f0672e41f..46e2e4dbc 100644
--- a/src/MedClient/test/test2/TestMedCorba7.py
+++ b/src/MedClient/test/test2/TestMedCorba7.py
@@ -1,6 +1,6 @@
 import os
 
-BASE = os.environ["SALOME_ROOT_DIR"] + '/share/salome/resources/'
+BASE = os.environ["MED_ROOT_DIR"] + '/share/salome/resources/'
 
 fileName = BASE + 'pointe.med'
 fileName = BASE + 'test_hydro_darcy1a_out.med'
diff --git a/src/MedClient/test/test2/TestMedCorba8.py b/src/MedClient/test/test2/TestMedCorba8.py
index b141b1e62..74538d53d 100644
--- a/src/MedClient/test/test2/TestMedCorba8.py
+++ b/src/MedClient/test/test2/TestMedCorba8.py
@@ -2,7 +2,7 @@ import os
 
 # import salome
 
-BASE = os.environ["SALOME_ROOT_DIR"] + '/share/salome/resources/'
+BASE = os.environ["MED_ROOT_DIR"] + '/share/salome/resources/'
 
 fileName = BASE + 'pointe.med'
 fileName = BASE + 'test_hydro_darcy1a_out.med'