Attachment #150326 for bug #155974

View | Details | Raw Unified | Return to bug 155974 | Differences between

and this patch

Lines 1199-1205 Link Here

(-)src3.2.6.orig/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MedFieldDriver22.hxx (-2 / +2 lines)
1199	profilSize[typeNo]=pflSize;	1199	profilSize[typeNo]=pflSize;
1200	profilList[typeNo].resize(pflSize);	1200	profilList[typeNo].resize(pflSize);
1201	profilListFromFile[typeNo].resize(pflSize);	1201	profilListFromFile[typeNo].resize(pflSize);
1202	ret = med_2_2::MEDprofilLire(id,&profilList[typeNo][0],profilName); // cf item 16 Effective STL // IPAL13481	1202	ret = med_2_2::MEDprofilLire(id,(med_2_2::med_int*)&profilList[typeNo][0],profilName); // cf item 16 Effective STL // IPAL13481
1203	profilListFromFile[typeNo] = profilList[typeNo];	1203	profilListFromFile[typeNo] = profilList[typeNo];
1204	profilNameList[typeNo]=string(profilName);	1204	profilNameList[typeNo]=string(profilName);
1205	}	1205	}
Lines 1685-1691 Link Here
1685	);	1685	);
1686		1686
1687	if ( med_2_2::MEDMEMprofilEcr(id,	1687	if ( med_2_2::MEDMEMprofilEcr(id,
1688	&profil[0],	1688	(med_2_2::med_int*)&profil[0],
1689	numberOfElements,	1689	numberOfElements,
1690	const_cast<char *>(profilName.c_str())) < 0)	1690	const_cast<char *>(profilName.c_str())) < 0)
1691		1691




      err = med_2_2::MEDstructureCoordLire(_medIdt,
					  const_cast <char *>
					  (_ptrMesh->_name.c_str()),
					  MeshDimension,(med_2_2::med_int*)structure);

      if (err != MED_VALID)
	throw MEDEXCEPTION(STRING(LOC) <<"Error in reading the structure of grid : |" << _meshName << "|" ) ;


      med_int major, minor, release;

      if ( med_2_2::MEDversionLire(_medIdt, (med_2_2::med_int*)&major, (med_2_2::med_int*)&minor, (med_2_2::med_int*)&release) != 0 )
	    {
	      // error : we suppose we have not a good med file !
	      delete[] tmp_cells_count ;

					 const_cast <char *> (_ptrMesh->_name.c_str()),
					 Entity,
					 med_2_2::MED_NOD,
					 (med_2_2::med_int*)&ConnectivitySize);
	  if (err1 != MED_VALID)
	    {
	      MESSAGE(LOC<<": MEDpolygoneInfo returns "<<err1);

      
	  med_err err2 = MEDpolygoneConnLire(_medIdt,
					     const_cast <char *> (_ptrMesh->_name.c_str()),
					     (med_2_2::med_int*)PolygonsConnectivityIndex,
					     NumberOfPolygons+1,
					     (med_2_2::med_int*)PolygonsConnectivity,
					     Entity,
					     med_2_2::MED_NOD);
	  if (err2 != MED_VALID)

	  med_err err3 = MEDpolyedreInfo(_medIdt,
					 const_cast <char *> (_ptrMesh->_name.c_str()),
					 med_2_2::MED_NOD,
					 (med_2_2::med_int*)&FacesIndexSize,
					 (med_2_2::med_int*)&NumberOfNodes);
	  NumberOfFaces = FacesIndexSize-1;
	  if (err3 != MED_VALID)
	    {

	  
	  med_err err4 = MEDpolyedreConnLire(_medIdt,
					     const_cast <char *> (_ptrMesh->_name.c_str()),
					     (med_2_2::med_int*)PolyhedronIndex,
					     NumberOfPolyhedron+1,
					     (med_2_2::med_int*)FacesIndex,
					     NumberOfFaces+1,
					     (med_2_2::med_int*)Nodes,
					     med_2_2::MED_NOD);
	  if (err4 != MED_VALID)
	    {

	err = med_2_2::MEDfamInfo(_medIdt,const_cast <char *>
				 (_meshName.c_str()),
				 (i+1),const_cast <char *>
				 (FamilyName.c_str()), (med_2_2::med_int*)&tmp_FamilyIdentifier,
				 (med_2_2::med_int*)tmp_AttributesIdentifier, (med_2_2::med_int*)tmp_AttributesValues,
				 const_cast <char *>
				 (AttributesDescription.c_str()),
				 (med_2_2::med_int*)&tmp_NumberOfAttributes, const_cast <char *>
				 (GroupsNames.c_str()),(med_2_2::med_int*)&tmp_NumberOfGroups);
        FamilyIdentifier = tmp_FamilyIdentifier ;
        int ii ;
        for ( ii = 0 ; ii < NumberOfAttributes ; ii++ ) {

#if defined(IRIX64) || defined(OSF1) || defined(VPP5000) || defined(PCLINUX64)
      med_int * tmp_MEDArrayNodeFamily = new med_int[_ptrMesh->getNumberOfNodes()] ;
      err = MEDfamLire(_medIdt, const_cast <char *>
		       (_ptrMesh->_name.c_str()), (med_2_2::med_int*)tmp_MEDArrayNodeFamily,
		       _ptrMesh->getNumberOfNodes(), med_2_2::MED_NOEUD,
		       (med_2_2::med_geometrie_element) MED_NONE);
      int i ;

        
#if defined(IRIX64) || defined(OSF1) || defined(VPP5000) || defined(PCLINUX64)
        const int * NodesNumbers = _ptrMesh->_coordinate->getNodesNumbers() ;
        med_2_2::med_int * tmp_NodesNumbers = (med_2_2::med_int*)(new med_int[_ptrMesh->_numberOfNodes]) ;
        int ii ;
        for ( ii = 0 ; ii < _ptrMesh->_numberOfNodes ; ii++ )
           tmp_NodesNumbers[ii] = NodesNumbers[ii] ;

			       const_cast <char *> (_meshName.c_str()),
			       tmp_PolyhedronIndex,
			       nbPolyhedron + 1,
			       (med_2_2::med_int*)&FacesGeometricTypes[0],
			       NumberOfFaces,
			       tmp_PolyhedronConnectivity,
			       med_2_2::MED_DESC);




      MED::TMeshInfo& aMeshInfo = *theInfo.myMeshInfo;

      char* anElemNames = theInfo.myIsElemNames? &theInfo.myElemNames[0]: NULL;
      med_int* anElemNum = theInfo.myIsElemNum? (med_int*)&theInfo.myElemNum[0]: NULL;

      TErr aRet = MEDnoeudsLire(myFile->Id(),
				&aMeshInfo.myName[0],

      MED::TMeshInfo& aMeshInfo = *anInfo.myMeshInfo;
      
      char* anElemNames = theInfo.myIsElemNames? &anInfo.myElemNames[0]: NULL;
      med_int* anElemNum = theInfo.myIsElemNum? (med_int*)&anInfo.myElemNum[0]: NULL;

      TErr aRet = MEDnoeudsEcr(myFile->Id(),
			       &aMeshInfo.myName[0],

      TInt aNbElem = theInfo.myElemNum.size();

      char* anElemNames = theInfo.myIsElemNames? &theInfo.myElemNames[0]: NULL;
      med_int* anElemNum = theInfo.myIsElemNum? (med_int*)&theInfo.myElemNum[0]: NULL;

      TErr aRet;
      aRet = MEDelementsLire(myFile->Id(),

      MED::TMeshInfo& aMeshInfo = *anInfo.myMeshInfo;

      char* anElemNames = theInfo.myIsElemNames? &anInfo.myElemNames[0]: NULL;
      med_int* anElemNum = theInfo.myIsElemNum? (med_int*)&anInfo.myElemNum[0]: NULL;

      TErr aRet;
      aRet = MEDelementsEcr(myFile->Id(),

      aRet = MEDprofilInfo(myFile->Id(),
			   theId,
			   &aName[0],
			   (med_int*)&aSize);
      if(theErr) 
	*theErr = aRet;
      else if(aRet < 0)

      
      TErr aRet;
      aRet = MEDprofilLire(myFile->Id(),
			   (med_int*)&theInfo.myElemNum[0],
			   &theInfo.myName[0]);
      if(theErr) 
	*theErr = aRet;

	aRet = MEDstructureCoordEcr(myFile->Id(),
				    &aMeshInfo.myName[0],
				    aMeshInfo.myDim,
				    (med_int*)&anInfo.myGrilleStructure[0]);
	if(aRet < 0)
	  EXCEPTION(runtime_error,"SetGrilleInfo - MEDstructureCoordEcr(...)");
	

Return to bug 155974

Lines 345-351 Link Here

(-)src3.2.6.orig/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MedMeshDriver22.cxx (-17 / +17 lines)
345	err = med_2_2::MEDstructureCoordLire(_medIdt,	345	err = med_2_2::MEDstructureCoordLire(_medIdt,
346	const_cast <char *>	346	const_cast <char *>
347	(_ptrMesh->_name.c_str()),	347	(_ptrMesh->_name.c_str()),
348	MeshDimension,structure);	348	MeshDimension,(med_2_2::med_int*)structure);
349		349
350	if (err != MED_VALID)	350	if (err != MED_VALID)
351	throw MEDEXCEPTION(STRING(LOC) <<"Error in reading the structure of grid : \|" << _meshName << "\|" ) ;	351	throw MEDEXCEPTION(STRING(LOC) <<"Error in reading the structure of grid : \|" << _meshName << "\|" ) ;
Lines 867-873 Link Here
867		867
868	med_int major, minor, release;	868	med_int major, minor, release;
869		869
870	if ( med_2_2::MEDversionLire(_medIdt, &major, &minor, &release) != 0 )	870	if ( med_2_2::MEDversionLire(_medIdt, (med_2_2::med_int)&major, (med_2_2::med_int)&minor, (med_2_2::med_int*)&release) != 0 )
871	{	871	{
872	// error : we suppose we have not a good med file !	872	// error : we suppose we have not a good med file !
873	delete[] tmp_cells_count ;	873	delete[] tmp_cells_count ;
Lines 1392-1398 Link Here
1392	const_cast <char *> (_ptrMesh->_name.c_str()),	1392	const_cast <char *> (_ptrMesh->_name.c_str()),
1393	Entity,	1393	Entity,
1394	med_2_2::MED_NOD,	1394	med_2_2::MED_NOD,
1395	&ConnectivitySize);	1395	(med_2_2::med_int*)&ConnectivitySize);
1396	if (err1 != MED_VALID)	1396	if (err1 != MED_VALID)
1397	{	1397	{
1398	MESSAGE(LOC<<": MEDpolygoneInfo returns "<<err1);	1398	MESSAGE(LOC<<": MEDpolygoneInfo returns "<<err1);
Lines 1404-1412 Link Here
1404		1404
1405	med_err err2 = MEDpolygoneConnLire(_medIdt,	1405	med_err err2 = MEDpolygoneConnLire(_medIdt,
1406	const_cast <char *> (_ptrMesh->_name.c_str()),	1406	const_cast <char *> (_ptrMesh->_name.c_str()),
1407	PolygonsConnectivityIndex,	1407	(med_2_2::med_int*)PolygonsConnectivityIndex,
1408	NumberOfPolygons+1,	1408	NumberOfPolygons+1,
1409	PolygonsConnectivity,	1409	(med_2_2::med_int*)PolygonsConnectivity,
1410	Entity,	1410	Entity,
1411	med_2_2::MED_NOD);	1411	med_2_2::MED_NOD);
1412	if (err2 != MED_VALID)	1412	if (err2 != MED_VALID)
Lines 1483-1490 Link Here
1483	med_err err3 = MEDpolyedreInfo(_medIdt,	1483	med_err err3 = MEDpolyedreInfo(_medIdt,
1484	const_cast <char *> (_ptrMesh->_name.c_str()),	1484	const_cast <char *> (_ptrMesh->_name.c_str()),
1485	med_2_2::MED_NOD,	1485	med_2_2::MED_NOD,
1486	&FacesIndexSize,	1486	(med_2_2::med_int*)&FacesIndexSize,
1487	&NumberOfNodes);	1487	(med_2_2::med_int*)&NumberOfNodes);
1488	NumberOfFaces = FacesIndexSize-1;	1488	NumberOfFaces = FacesIndexSize-1;
1489	if (err3 != MED_VALID)	1489	if (err3 != MED_VALID)
1490	{	1490	{
Lines 1498-1508 Link Here
1498		1498
1499	med_err err4 = MEDpolyedreConnLire(_medIdt,	1499	med_err err4 = MEDpolyedreConnLire(_medIdt,
1500	const_cast <char *> (_ptrMesh->_name.c_str()),	1500	const_cast <char *> (_ptrMesh->_name.c_str()),
1501	PolyhedronIndex,	1501	(med_2_2::med_int*)PolyhedronIndex,
1502	NumberOfPolyhedron+1,	1502	NumberOfPolyhedron+1,
1503	FacesIndex,	1503	(med_2_2::med_int*)FacesIndex,
1504	NumberOfFaces+1,	1504	NumberOfFaces+1,
1505	Nodes,	1505	(med_2_2::med_int*)Nodes,
1506	med_2_2::MED_NOD);	1506	med_2_2::MED_NOD);
1507	if (err4 != MED_VALID)	1507	if (err4 != MED_VALID)
1508	{	1508	{
Lines 1705-1716 Link Here
1705	err = med_2_2::MEDfamInfo(_medIdt,const_cast <char *>	1705	err = med_2_2::MEDfamInfo(_medIdt,const_cast <char *>
1706	(_meshName.c_str()),	1706	(_meshName.c_str()),
1707	(i+1),const_cast <char *>	1707	(i+1),const_cast <char *>
1708	(FamilyName.c_str()), &tmp_FamilyIdentifier,	1708	(FamilyName.c_str()), (med_2_2::med_int*)&tmp_FamilyIdentifier,
1709	tmp_AttributesIdentifier,tmp_AttributesValues,	1709	(med_2_2::med_int)tmp_AttributesIdentifier, (med_2_2::med_int)tmp_AttributesValues,
1710	const_cast <char *>	1710	const_cast <char *>
1711	(AttributesDescription.c_str()),	1711	(AttributesDescription.c_str()),
1712	&tmp_NumberOfAttributes, const_cast <char *>	1712	(med_2_2::med_int)&tmp_NumberOfAttributes, const_cast <char >
1713	(GroupsNames.c_str()),&tmp_NumberOfGroups);	1713	(GroupsNames.c_str()),(med_2_2::med_int*)&tmp_NumberOfGroups);
1714	FamilyIdentifier = tmp_FamilyIdentifier ;	1714	FamilyIdentifier = tmp_FamilyIdentifier ;
1715	int ii ;	1715	int ii ;
1716	for ( ii = 0 ; ii < NumberOfAttributes ; ii++ ) {	1716	for ( ii = 0 ; ii < NumberOfAttributes ; ii++ ) {
Lines 1835-1841 Link Here
1835	#if defined(IRIX64) \|\| defined(OSF1) \|\| defined(VPP5000) \|\| defined(PCLINUX64)	1835	#if defined(IRIX64) \|\| defined(OSF1) \|\| defined(VPP5000) \|\| defined(PCLINUX64)
1836	med_int * tmp_MEDArrayNodeFamily = new med_int[_ptrMesh->getNumberOfNodes()] ;	1836	med_int * tmp_MEDArrayNodeFamily = new med_int[_ptrMesh->getNumberOfNodes()] ;
1837	err = MEDfamLire(_medIdt, const_cast <char *>	1837	err = MEDfamLire(_medIdt, const_cast <char *>
1838	(_ptrMesh->_name.c_str()), tmp_MEDArrayNodeFamily,	1838	(_ptrMesh->_name.c_str()), (med_2_2::med_int*)tmp_MEDArrayNodeFamily,
1839	_ptrMesh->getNumberOfNodes(), med_2_2::MED_NOEUD,	1839	_ptrMesh->getNumberOfNodes(), med_2_2::MED_NOEUD,
1840	(med_2_2::med_geometrie_element) MED_NONE);	1840	(med_2_2::med_geometrie_element) MED_NONE);
1841	int i ;	1841	int i ;
Lines 2350-2356 Link Here
2350		2350
2351	#if defined(IRIX64) \|\| defined(OSF1) \|\| defined(VPP5000) \|\| defined(PCLINUX64)	2351	#if defined(IRIX64) \|\| defined(OSF1) \|\| defined(VPP5000) \|\| defined(PCLINUX64)
2352	const int * NodesNumbers = _ptrMesh->_coordinate->getNodesNumbers() ;	2352	const int * NodesNumbers = _ptrMesh->_coordinate->getNodesNumbers() ;
2353	med_2_2::med_int * tmp_NodesNumbers = new med_int[_ptrMesh->_numberOfNodes] ;	2353	med_2_2::med_int * tmp_NodesNumbers = (med_2_2::med_int*)(new med_int[_ptrMesh->_numberOfNodes]) ;
2354	int ii ;	2354	int ii ;
2355	for ( ii = 0 ; ii < _ptrMesh->_numberOfNodes ; ii++ )	2355	for ( ii = 0 ; ii < _ptrMesh->_numberOfNodes ; ii++ )
2356	tmp_NodesNumbers[ii] = NodesNumbers[ii] ;	2356	tmp_NodesNumbers[ii] = NodesNumbers[ii] ;
Lines 2737-2743 Link Here
2737	const_cast <char *> (_meshName.c_str()),	2737	const_cast <char *> (_meshName.c_str()),
2738	tmp_PolyhedronIndex,	2738	tmp_PolyhedronIndex,
2739	nbPolyhedron + 1,	2739	nbPolyhedron + 1,
2740	&FacesGeometricTypes[0],	2740	(med_2_2::med_int*)&FacesGeometricTypes[0],
2741	NumberOfFaces,	2741	NumberOfFaces,
2742	tmp_PolyhedronConnectivity,	2742	tmp_PolyhedronConnectivity,
2743	med_2_2::MED_DESC);	2743	med_2_2::MED_DESC);

Lines 644-650 Link Here

(-)src3.2.6.orig/MED_SRC_3.2.6/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx (-7 / +7 lines)
644	MED::TMeshInfo& aMeshInfo = *theInfo.myMeshInfo;	644	MED::TMeshInfo& aMeshInfo = *theInfo.myMeshInfo;
645		645
646	char* anElemNames = theInfo.myIsElemNames? &theInfo.myElemNames[0]: NULL;	646	char* anElemNames = theInfo.myIsElemNames? &theInfo.myElemNames[0]: NULL;
647	med_int* anElemNum = theInfo.myIsElemNum? &theInfo.myElemNum[0]: NULL;	647	med_int* anElemNum = theInfo.myIsElemNum? (med_int*)&theInfo.myElemNum[0]: NULL;
648		648
649	TErr aRet = MEDnoeudsLire(myFile->Id(),	649	TErr aRet = MEDnoeudsLire(myFile->Id(),
650	&aMeshInfo.myName[0],	650	&aMeshInfo.myName[0],
Lines 682-688 Link Here
682	MED::TMeshInfo& aMeshInfo = *anInfo.myMeshInfo;	682	MED::TMeshInfo& aMeshInfo = *anInfo.myMeshInfo;
683		683
684	char* anElemNames = theInfo.myIsElemNames? &anInfo.myElemNames[0]: NULL;	684	char* anElemNames = theInfo.myIsElemNames? &anInfo.myElemNames[0]: NULL;
685	med_int* anElemNum = theInfo.myIsElemNum? &anInfo.myElemNum[0]: NULL;	685	med_int* anElemNum = theInfo.myIsElemNum? (med_int*)&anInfo.myElemNum[0]: NULL;
686		686
687	TErr aRet = MEDnoeudsEcr(myFile->Id(),	687	TErr aRet = MEDnoeudsEcr(myFile->Id(),
688	&aMeshInfo.myName[0],	688	&aMeshInfo.myName[0],
Lines 1152-1158 Link Here
1152	TInt aNbElem = theInfo.myElemNum.size();	1152	TInt aNbElem = theInfo.myElemNum.size();
1153		1153
1154	char* anElemNames = theInfo.myIsElemNames? &theInfo.myElemNames[0]: NULL;	1154	char* anElemNames = theInfo.myIsElemNames? &theInfo.myElemNames[0]: NULL;
1155	med_int* anElemNum = theInfo.myIsElemNum? &theInfo.myElemNum[0]: NULL;	1155	med_int* anElemNum = theInfo.myIsElemNum? (med_int*)&theInfo.myElemNum[0]: NULL;
1156		1156
1157	TErr aRet;	1157	TErr aRet;
1158	aRet = MEDelementsLire(myFile->Id(),	1158	aRet = MEDelementsLire(myFile->Id(),
Lines 1191-1197 Link Here
1191	MED::TMeshInfo& aMeshInfo = *anInfo.myMeshInfo;	1191	MED::TMeshInfo& aMeshInfo = *anInfo.myMeshInfo;
1192		1192
1193	char* anElemNames = theInfo.myIsElemNames? &anInfo.myElemNames[0]: NULL;	1193	char* anElemNames = theInfo.myIsElemNames? &anInfo.myElemNames[0]: NULL;
1194	med_int* anElemNum = theInfo.myIsElemNum? &anInfo.myElemNum[0]: NULL;	1194	med_int* anElemNum = theInfo.myIsElemNum? (med_int*)&anInfo.myElemNum[0]: NULL;
1195		1195
1196	TErr aRet;	1196	TErr aRet;
1197	aRet = MEDelementsEcr(myFile->Id(),	1197	aRet = MEDelementsEcr(myFile->Id(),
Lines 1426-1432 Link Here
1426	aRet = MEDprofilInfo(myFile->Id(),	1426	aRet = MEDprofilInfo(myFile->Id(),
1427	theId,	1427	theId,
1428	&aName[0],	1428	&aName[0],
1429	&aSize);	1429	(med_int*)&aSize);
1430	if(theErr)	1430	if(theErr)
1431	*theErr = aRet;	1431	*theErr = aRet;
1432	else if(aRet < 0)	1432	else if(aRet < 0)
Lines 1449-1455 Link Here
1449		1449
1450	TErr aRet;	1450	TErr aRet;
1451	aRet = MEDprofilLire(myFile->Id(),	1451	aRet = MEDprofilLire(myFile->Id(),
1452	&theInfo.myElemNum[0],	1452	(med_int*)&theInfo.myElemNum[0],
1453	&theInfo.myName[0]);	1453	&theInfo.myName[0]);
1454	if(theErr)	1454	if(theErr)
1455	*theErr = aRet;	1455	*theErr = aRet;
Lines 2006-2012 Link Here
2006	aRet = MEDstructureCoordEcr(myFile->Id(),	2006	aRet = MEDstructureCoordEcr(myFile->Id(),
2007	&aMeshInfo.myName[0],	2007	&aMeshInfo.myName[0],
2008	aMeshInfo.myDim,	2008	aMeshInfo.myDim,
2009	&anInfo.myGrilleStructure[0]);	2009	(med_int*)&anInfo.myGrilleStructure[0]);
2010	if(aRet < 0)	2010	if(aRet < 0)
2011	EXCEPTION(runtime_error,"SetGrilleInfo - MEDstructureCoordEcr(...)");	2011	EXCEPTION(runtime_error,"SetGrilleInfo - MEDstructureCoordEcr(...)");
2012		2012