diff -ur src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx --- src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx 2010-03-15 17:07:56.860301255 +0100 +++ src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx 2010-03-15 17:33:59.740251721 +0100 @@ -189,7 +189,7 @@ int ncorr = med_2_3::MEDjointInfo(fid,meshname, ijoint+1, name, joint_description, - &distant, name_distant); + (med_int*)&distant, name_distant); for (int ic=0; icisDimensionOK(type,m_collection->getMeshDimension())) continue; int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_CELL,type); if (ntype==0) continue; - med_2_3::MEDglobalNumLire(fid,meshname, array+offset, ntype, + med_2_3::MEDglobalNumLire(fid,meshname, (med_int*)array+offset, ntype, med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type); offset+=ntype; } @@ -259,7 +259,7 @@ int nnode= (m_collection->getMesh())[idomain]->getNumberOfNodes(); { int* array=new int[nnode]; - med_2_3::MEDglobalNumLire(fid,meshname, array, nnode, + med_2_3::MEDglobalNumLire(fid,meshname, (med_int*)array, nnode, med_2_3::MED_NOEUD, med_2_3::MED_POINT1); nodeglobal[idomain]=array; } @@ -280,7 +280,7 @@ int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_FACE,type); if (ntype==0) continue; - med_2_3::MEDglobalNumLire(fid,meshname, array+offset, ntype, + med_2_3::MEDglobalNumLire(fid,meshname, (med_int*)array+offset, ntype, med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type); offset+=ntype; } @@ -348,7 +348,7 @@ jointSort(node_corresp, nbnodes, false); error= - med_2_3::MEDjointEcr(fid, mesh_name, joint_name, node_corresp, nbnodes, + med_2_3::MEDjointEcr(fid, mesh_name, joint_name, (med_int*)node_corresp, nbnodes, med_2_3::MED_NOEUD, med_2_3::MED_POINT1,med_2_3::MED_NOEUD, med_2_3::MED_POINT1); if (error==-1) cout << "erreur creation de joint "<isDimensionOK(type,m_collection->getMeshDimension())) continue; int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_CELL,type); if (ntype==0) continue; - med_2_3::MEDglobalNumEcr(fid,meshchar, array+offset, ntype, + med_2_3::MEDglobalNumEcr(fid,meshchar, (med_int*)array+offset, ntype, med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type); offset+=ntype; @@ -426,7 +426,7 @@ int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(constituent_entity,type); if (ntype==0) continue; - med_2_3::MEDglobalNumEcr(fid,meshchar, array+offset, ntype, + med_2_3::MEDglobalNumEcr(fid,meshchar, (med_int*)array+offset, ntype, med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type); offset+=ntype; @@ -443,7 +443,7 @@ m_collection->getTopology()->getNodeList(idomain,array); - med_2_3::MEDglobalNumEcr(fid,meshchar, array, nnode, + med_2_3::MEDglobalNumEcr(fid,meshchar, (med_int*)array, nnode, med_2_3::MED_NOEUD, med_2_3::MED_POINT1); delete[] array; @@ -507,7 +507,7 @@ corresp.push_back(value[icol]); } int size_joint = corresp.size()/2; - med_2_3::MEDjointEcr(fid, mesh_name, joint_name, &corresp[0], + med_2_3::MEDjointEcr(fid, mesh_name, joint_name, (med_int*)&corresp[0], size_joint, med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)local_type ,med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)distant_type ); @@ -541,7 +541,7 @@ med_2_3::med_geometrie_element distant_geo_elem=(med_2_3::med_geometrie_element)iter->first.second; int size_joint=size/2; //med_2_3::med_err error = - med_2_3::MEDjointEcr(fid, mesh_name, joint_name, corresp, size_joint, med_2_3::MED_MAILLE, + med_2_3::MEDjointEcr(fid, mesh_name, joint_name, (med_int*)corresp, size_joint, med_2_3::MED_MAILLE, local_geo_elem,med_2_3::MED_MAILLE, distant_geo_elem); delete[] corresp; } diff -ur src5.1.3.orig/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx src5.1.3/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx --- src5.1.3.orig/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx 2010-03-15 17:07:56.624073897 +0100 +++ src5.1.3/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx 2010-03-15 17:42:31.140322486 +0100 @@ -34,6 +34,7 @@ #include #include +#include //***************************************************************************** // Some useful macros @@ -46,7 +47,7 @@ * Pair of index. * See definition of GaussIndexList. */ -typedef std::pair < std::set*, std::set > IndexPair; +typedef std::pair < std::set*, std::set > IndexPair; /** * List of gauss index for optimized domain split. diff -ur src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx --- src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx 2010-03-15 17:07:55.512824126 +0100 +++ src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx 2010-03-15 17:23:57.950316309 +0100 @@ -169,11 +169,11 @@ { 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]; + med_int *attide=new med_int[natt]; + med_int *attval=new med_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); + MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro); std::string cur=buildStringFromFortran(nomfam,sizeof(nomfam)); ret[i]=cur; delete [] attdes; @@ -196,11 +196,11 @@ { 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]; + med_int *attide=new med_int[natt]; + med_int *attval=new med_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); + MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro); for(int j=0;j medConnIndex2; int nbOfElt=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); + MEDconnEcr(fid,maa,mesh->getMeshDimension(),(med_int*)&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); + MEDpolygoneConnEcr(fid,maa,(med_int*)&medConnIndex[0],medConnIndex.size(),(med_int*)&medConn[0],MED_MAILLE,MED_NOD); } } }