Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 223871 Details for
Bug 155974
[science overlay] sci-misc/salome-* (New packages)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
partially solve med_int issues
salome-med-5.1.3-med_int.patch (text/plain), 12.15 KB, created by
Etienne Lorriaux
on 2010-03-16 11:51:59 UTC
(
hide
)
Description:
partially solve med_int issues
Filename:
MIME Type:
Creator:
Etienne Lorriaux
Created:
2010-03-16 11:51:59 UTC
Size:
12.15 KB
patch
obsolete
>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; ic<ncorr; ic++) > { >@@ -209,7 +209,7 @@ > { > > med_2_3::MEDjointLire(fid, meshname, name, >- node_corresp,ncouples, >+ (med_int*)node_corresp,ncouples, > cor_typent_local, cor_typgeo_local, > cor_typent_dist, cor_typgeo_dist > ); >@@ -247,7 +247,7 @@ > if (!m_collection->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::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 "<<endl; > >@@ -388,7 +388,7 @@ > if (!m_collection->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 <vector> > #include <set> >+#include <med.h> > > //***************************************************************************** > // Some useful macros >@@ -46,7 +47,7 @@ > * Pair of index. > * See definition of GaussIndexList. > */ >-typedef std::pair < std::set<int>*, std::set<int> > IndexPair; >+typedef std::pair < std::set<med_int>*, std::set<med_int> > 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<ngro;j++) > { > std::string cur=buildStringFromFortran(gro+j*MED_TAILLE_LNOM,MED_TAILLE_LNOM); >@@ -446,11 +446,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)); > if(std::find(fams.begin(),fams.end(),cur)!=fams.end()) > ret.push_back(numfam); >@@ -474,11 +474,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)); > for(int j=0;j<ngro;j++) > { >@@ -566,12 +566,12 @@ > MEDLoader::MEDConnOfOneElemType elem(typmai2[i],connTab,0,fam,curNbOfElem,-1); > int *tmp=new int[curNbOfElem]; > char *noms=new char[MED_TAILLE_PNOM*curNbOfElem+1]; >- MEDelementsLire(fid,nommaa,Mdim,connTab,MED_FULL_INTERLACE,noms,&inoele,tmp,&inuele,fam,curNbOfElem,whichEntity,curMedType,MED_NOD); >+ MEDelementsLire(fid,nommaa,Mdim,(med_int*)connTab,MED_FULL_INTERLACE,noms,&inoele,(med_int*)tmp,&inuele,(med_int*)fam,curNbOfElem,whichEntity,curMedType,MED_NOD); > delete [] tmp; > delete [] noms; > //trying to read global numbering > int *globArr=new int[curNbOfElem]; >- if(MEDglobalNumLire(fid,nommaa,globArr,curNbOfElem,whichEntity,curMedType)==0) >+ if(MEDglobalNumLire(fid,nommaa,(med_int*)globArr,curNbOfElem,whichEntity,curMedType)==0) > elem.setGlobal(globArr); > else > delete [] globArr; >@@ -590,9 +590,9 @@ > int *index=new int[curNbOfPolyElem+1]; > int *locConn=new int[arraySize]; > int *fam=new int[curNbOfPolyElem]; >- MEDLoader::MEDConnOfOneElemType elem(INTERP_KERNEL::NORM_POLYGON,locConn,index,fam,curNbOfPolyElem,arraySize); >- MEDpolygoneConnLire(fid,nommaa,index,curNbOfPolyElem+1,locConn,whichPolyEntity,MED_NOD); >- MEDfamLire(fid,nommaa,fam,curNbOfPolyElem,MED_MAILLE,MED_POLYGONE); >+ MEDLoader::MEDConnOfOneElemType elem(INTERP_KERNEL::NORM_POLYGON,locConn,index,fam,curNbOfPolyElem,(int)arraySize); >+ MEDpolygoneConnLire(fid,nommaa,(med_int*)index,curNbOfPolyElem+1,(med_int*)locConn,whichPolyEntity,MED_NOD); >+ MEDfamLire(fid,nommaa,(med_int*)fam,curNbOfPolyElem,MED_MAILLE,MED_POLYGONE); > conn.push_back(elem); > } > curNbOfPolyElem=MEDnEntMaa(fid,nommaa,MED_CONN,MED_MAILLE,MED_POLYEDRE,MED_NOD); >@@ -604,8 +604,8 @@ > int *indexFace=new int[indexFaceLgth]; > int *locConn=new int[connFaceLgth]; > int *fam=new int[curNbOfPolyElem]; >- MEDpolyedreConnLire(fid,nommaa,index,curNbOfPolyElem+1,indexFace,indexFaceLgth,locConn,MED_NOD); >- MEDfamLire(fid,nommaa,fam,curNbOfPolyElem,MED_MAILLE,MED_POLYEDRE); >+ MEDpolyedreConnLire(fid,nommaa,(med_int*)index,curNbOfPolyElem+1,(med_int*)indexFace,indexFaceLgth,(med_int*)locConn,MED_NOD); >+ MEDfamLire(fid,nommaa,(med_int*)fam,curNbOfPolyElem,MED_MAILLE,MED_POLYEDRE); > int arraySize=connFaceLgth; > for(int i=0;i<curNbOfPolyElem;i++) > arraySize+=index[i+1]-index[i]-1; >@@ -1051,11 +1051,11 @@ > std::vector<int> 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); > } > } > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 155974
:
102571
|
102572
|
102573
|
114639
|
114650
|
114651
|
114653
|
114655
|
114657
|
114659
|
114660
|
114662
|
114664
|
120027
|
120226
|
131980
|
131981
|
131983
|
137331
|
137336
|
137338
|
137719
|
138048
|
138578
|
138580
|
138581
|
138582
|
138583
|
138584
|
138586
|
138588
|
138877
|
138896
|
138925
|
138960
|
139043
|
139045
|
139956
|
139958
|
139964
|
139965
|
139973
|
140002
|
140005
|
140007
|
140030
|
140032
|
140064
|
140066
|
140068
|
140071
|
140073
|
140086
|
140088
|
140280
|
140283
|
140301
|
140303
|
140366
|
140368
|
140373
|
140375
|
140378
|
140385
|
140386
|
140455
|
140466
|
140468
|
140472
|
140474
|
140637
|
141242
|
141243
|
141250
|
141252
|
141254
|
141256
|
141257
|
141462
|
141473
|
141474
|
141475
|
141565
|
141572
|
142892
|
142894
|
142905
|
143984
|
143986
|
144011
|
144061
|
144063
|
144084
|
144086
|
144089
|
144091
|
144093
|
144098
|
144105
|
144107
|
144117
|
144119
|
144182
|
144184
|
144185
|
144187
|
144188
|
144198
|
144223
|
144305
|
144306
|
144308
|
144310
|
144311
|
144313
|
144314
|
144316
|
144318
|
144320
|
144347
|
144348
|
144350
|
144352
|
144353
|
144354
|
144356
|
144357
|
144557
|
145883
|
145885
|
145887
|
146138
|
146414
|
147142
|
147146
|
148604
|
148606
|
148607
|
148609
|
148611
|
148613
|
148615
|
148617
|
148618
|
148619
|
150326
|
151031
|
151032
|
151034
|
151036
|
151038
|
151039
|
151040
|
151042
|
151044
|
151045
|
152339
|
152341
|
152343
|
152345
|
152347
|
152349
|
152351
|
152353
|
152355
|
152357
|
152359
|
152361
|
152363
|
152365
|
152369
|
152371
|
152979
|
153067
|
154323
|
154325
|
154327
|
154329
|
154331
|
154333
|
154335
|
158563
|
161347
|
163275
|
163841
|
163842
|
164412
|
164611
|
168552
|
168560
|
168624
|
168626
|
168724
|
168726
|
168734
|
168736
|
178432
|
178434
|
178739
|
179160
|
179161
|
179162
|
179237
|
179627
|
179628
|
183321
|
183323
|
183324
|
183325
|
183327
|
183329
|
183347
|
183348
|
189058
|
189059
|
189061
|
200799
|
200800
|
200802
|
200803
|
200805
|
200807
|
200809
|
200811
|
200812
|
200813
|
200815
|
200816
|
200818
|
200820
|
200821
|
200823
|
200825
|
204604
|
204699
|
204980
|
205339
|
223869
| 223871 |
232539
|
234261
|
253803
|
253805
|
254743
|
254751
|
254755
|
257260
|
257261
|
268839
|
268883
|
278009
|
286253
|
286255
|
286257
|
286259
|
286261
|
286263
|
286265
|
286267
|
286269
|
286271
|
286273
|
323878