1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
|
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);
}
}
}
--- src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx 2010-03-21 20:24:36.370545867 +0100
+++ src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx 2010-03-21 20:30:11.329293723 +0100
@@ -300,8 +300,8 @@
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::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1);
- med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2);
+ med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1,(med_int*)&dom1, maa_dist1);
+ med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2,(med_int*)&dom2, maa_dist2);
CPPUNIT_ASSERT(strcmp(jn1,"joint_2")==0);
CPPUNIT_ASSERT(strcmp(jn2,"joint_1")==0);
CPPUNIT_ASSERT_EQUAL(dom1,1);
@@ -467,8 +467,8 @@
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::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1);
- med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2);
+ med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, (med_int*)&dom1, maa_dist1);
+ med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, (med_int*)&dom2, maa_dist2);
CPPUNIT_ASSERT_EQUAL(dom1,1);
CPPUNIT_ASSERT_EQUAL(dom2,0);
@@ -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_int[2];
globcellref[0]=1;
globcellref[1]=3;
@@ -773,10 +773,10 @@
char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM];
char desc2[MED_TAILLE_DESC];
char 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);
+ int dom1, dom2;
+// med_2_3::med_int dom1, dom2;
+ med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, (med_int*)&dom1, maa_dist1);
+ med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, (med_int*)&dom2, maa_dist2);
CPPUNIT_ASSERT_EQUAL(dom1,1);
CPPUNIT_ASSERT_EQUAL(dom2,0);
@@ -1143,8 +1143,8 @@
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::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1);
- med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2);
+ med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, (med_int*)&dom1, maa_dist1);
+ med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, (med_int*)&dom2, maa_dist2);
CPPUNIT_ASSERT_EQUAL(dom1,1);
CPPUNIT_ASSERT_EQUAL(dom2,0);
|
GitWeb