diff -aur MED_SRC_5.1.2.old/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx MED_SRC_5.1.2/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx --- MED_SRC_5.1.2.old/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx 2009-07-06 13:46:24.000000000 +0200 +++ MED_SRC_5.1.2/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx 2009-08-08 10:57:34.000000000 +0200 @@ -182,7 +182,7 @@ med_2_3::med_int njoint = med_2_3::MEDnJoint(fid, meshname); for (int ijoint=0; ijointisDimensionOK(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_2_3::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_2_3::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_2_3::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_2_3::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_2_3::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_2_3::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_2_3::med_int*)array, nnode, med_2_3::MED_NOEUD, med_2_3::MED_POINT1); delete[] array; @@ -499,7 +499,7 @@ { MED_EN::medGeometryElement local_type = (m_collection->getMesh())[idomain]->getElementType(entity,1); MED_EN::medGeometryElement distant_type = (m_collection->getMesh())[idistant]->getElementType(entity,1); - vector corresp; + vector corresp; for (int i=0; ifirst.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_2_3::med_int*)corresp, size_joint, med_2_3::MED_MAILLE, local_geo_elem,med_2_3::MED_MAILLE, distant_geo_elem); delete[] corresp; } diff -aur MED_SRC_5.1.2.old/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx MED_SRC_5.1.2/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx --- MED_SRC_5.1.2.old/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx 2009-07-06 13:46:23.000000000 +0200 +++ MED_SRC_5.1.2/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx 2009-08-08 10:57:34.000000000 +0200 @@ -299,13 +299,13 @@ char desc1[MED_TAILLE_DESC]; char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM]; char desc2[MED_TAILLE_DESC], maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM]; - int dom1, dom2; + med_2_3::med_int dom1, dom2; med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1); med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2); CPPUNIT_ASSERT(strcmp(jn1,"joint_2")==0); CPPUNIT_ASSERT(strcmp(jn2,"joint_1")==0); - CPPUNIT_ASSERT_EQUAL(dom1,1); - CPPUNIT_ASSERT_EQUAL(dom2,0); + CPPUNIT_ASSERT_EQUAL((int)dom1,1); + CPPUNIT_ASSERT_EQUAL((int)dom2,0); // testing node-node correspondency med_2_3::med_entite_maillage typ_ent_loc=med_2_3::MED_NOEUD; @@ -466,11 +466,11 @@ char desc1[MED_TAILLE_DESC]; char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM]; char desc2[MED_TAILLE_DESC], maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM]; - int dom1, dom2; + med_2_3::med_int dom1, dom2; med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1); med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2); - CPPUNIT_ASSERT_EQUAL(dom1,1); - CPPUNIT_ASSERT_EQUAL(dom2,0); + CPPUNIT_ASSERT_EQUAL((int)dom1,1); + CPPUNIT_ASSERT_EQUAL((int)dom2,0); // testing node-node correspondency med_2_3::med_entite_maillage typ_ent_loc=med_2_3::MED_NOEUD; @@ -548,7 +548,7 @@ //testing cells global numbering num = new med_2_3::med_int[2]; MEDglobalNumLire(fid1, meshname1, num, 2, typ_ent_loc, typ_geo_loc); - med_2_3::med_int* globcellref = new int[2]; + med_2_3::med_int* globcellref = new med_2_3::med_int[2]; globcellref[0]=1; globcellref[1]=3; @@ -777,8 +777,8 @@ med_2_3::med_int dom1, dom2; med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1); med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2); - CPPUNIT_ASSERT_EQUAL(dom1,1); - CPPUNIT_ASSERT_EQUAL(dom2,0); + CPPUNIT_ASSERT_EQUAL((int)dom1,1); + CPPUNIT_ASSERT_EQUAL((int)dom2,0); // testing node-node correspondency med_2_3::med_entite_maillage typ_ent_loc=med_2_3::MED_NOEUD; @@ -1142,11 +1142,11 @@ char desc1[MED_TAILLE_DESC+1]; char maa_dist1[MED_TAILLE_NOM+1], jn1[MED_TAILLE_NOM+1]; char desc2[MED_TAILLE_DESC+1], maa_dist2[MED_TAILLE_NOM+1], jn2[MED_TAILLE_NOM+1]; - int dom1, dom2; + med_2_3::med_int dom1, dom2; med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1); med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2); - CPPUNIT_ASSERT_EQUAL(dom1,1); - CPPUNIT_ASSERT_EQUAL(dom2,0); + CPPUNIT_ASSERT_EQUAL((int)dom1,1); + CPPUNIT_ASSERT_EQUAL((int)dom2,0); int nbEdgesFamilies1= med_2_3::MEDnFam(fid1, meshname1); Nur in MED_SRC_5.1.2/src/MEDSPLITTER/Test: MEDSPLITTERTest_MESHCollection.cxx.orig.