From 473dd8f02aa04f3bf8971d764c595db66405d73c Mon Sep 17 00:00:00 2001
From: apo <apo@opencascade.com>
Date: Tue, 25 Jan 2005 06:35:10 +0000
Subject: [PATCH] [Bug PAL7784] New: REGR: wrong Export-Import Mesh in med

---
 src/MEDWrapper/Base/MED_Algorithm.cxx    |  5 ++---
 src/MEDWrapper/Base/MED_Utilities.hxx    |  2 +-
 src/MEDWrapper/V2_1/MED_V2_1_Wrapper.cxx | 15 +++++++--------
 src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx | 18 +++++++++---------
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/MEDWrapper/Base/MED_Algorithm.cxx b/src/MEDWrapper/Base/MED_Algorithm.cxx
index fb9e24fa3..a1a42ed96 100644
--- a/src/MEDWrapper/Base/MED_Algorithm.cxx
+++ b/src/MEDWrapper/Base/MED_Algorithm.cxx
@@ -159,9 +159,8 @@ namespace MED{
     INITMSG(MYDEBUG,"GetNbFields() = "<<aNbFields<<"\n");
     for(TInt iField = 1; iField <= aNbFields; iField++){
       PFieldInfo aFieldInfo = theWrapper.GetPFieldInfo(theMeshInfo,iField);
-      TInt aNbComp = aFieldInfo->GetNbComp();
-      string aName = aFieldInfo->GetName();
-      INITMSG(MYDEBUG,"aFieldName = '"<<aName<<"'; aNbComp = "<<aNbComp<<"; ");
+      INITMSG(MYDEBUG,"aFieldName = '"<<aFieldInfo->GetName()<<
+	      "'; aNbComp = "<<aFieldInfo->GetNbComp()<<"; ");
       MED::TGeom aGeom;
       EEntiteMaillage anEntity = EEntiteMaillage(-1);
       TInt aNbTimeStamps = theWrapper.GetNbTimeStamps(aFieldInfo,theEntityInfo,anEntity,aGeom);
diff --git a/src/MEDWrapper/Base/MED_Utilities.hxx b/src/MEDWrapper/Base/MED_Utilities.hxx
index 96f1b30fc..3c3882cc7 100644
--- a/src/MEDWrapper/Base/MED_Utilities.hxx
+++ b/src/MEDWrapper/Base/MED_Utilities.hxx
@@ -48,7 +48,7 @@ namespace MED{
   };
 };
 
-
+//#define _DEBUG_
 #ifdef _DEBUG_
   #define MSG(deb,msg) if(deb) std::cout<<MED::PrefixPrinter::GetPrefix()<<msg<<" ("<<__FILE__<<" ["<<__LINE__<<"])\n"
   #define BEGMSG(deb,msg) if(deb) std::cout<<MED::PrefixPrinter::GetPrefix()<<msg
diff --git a/src/MEDWrapper/V2_1/MED_V2_1_Wrapper.cxx b/src/MEDWrapper/V2_1/MED_V2_1_Wrapper.cxx
index 8b71d6071..a406c0d4b 100644
--- a/src/MEDWrapper/V2_1/MED_V2_1_Wrapper.cxx
+++ b/src/MEDWrapper/V2_1/MED_V2_1_Wrapper.cxx
@@ -430,7 +430,7 @@ namespace MED{
 	return anInfo;
       
       TInt aNbElem = GetNbNodes(theMeshInfo);
-      if(aNbElem>0){
+      if(aNbElem > 0){
 	anInfo[eNOEUD][ePOINT1] = aNbElem;
 	const TEntity2GeomSet& anEntity2GeomSet = GetEntity2GeomSet();
 	TEntity2GeomSet::const_iterator anIter = anEntity2GeomSet.begin();
@@ -442,10 +442,9 @@ namespace MED{
 	  TGeomSet::const_iterator anIterEnd2 = aGeomSet.end();
 	  for(; anIter2 != anIterEnd2; anIter2++){
 	    const EGeometrieElement& aGeom = *anIter2;
-	    TInt aNb = GetNbCells(theMeshInfo,anEntity,aGeom,theTConn,theErr);
-	    if(aNb>0){
-	      anInfo[anEntity][aGeom] = aNb;
-	    }
+	    aNbElem = GetNbCells(theMeshInfo,anEntity,aGeom,theTConn,theErr);
+	    if(aNbElem > 0)
+	      anInfo[anEntity][aGeom] = aNbElem;
 	  }
 	}
       }
@@ -466,9 +465,9 @@ namespace MED{
       
       MED::TMeshInfo& aMeshInfo = const_cast<MED::TMeshInfo&>(theMeshInfo);
       
-      med_entite_maillage& anEntity = static_cast<med_entite_maillage>(theTEntity);
-      med_geometrie_element& aGeom = static_cast<med_geometrie_element>(theTGeom);
-      med_connectivite& aConn = static_cast<med_connectivite>(theTConn);
+      med_entite_maillage anEntity = med_entite_maillage(theTEntity);
+      med_geometrie_element aGeom = med_geometrie_element(theTGeom);
+      med_connectivite aConn = med_connectivite(theTConn);
 
       return MEDnEntMaa(myFile->Id(),
 			&aMeshInfo.myName[0],
diff --git a/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx b/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx
index 4585c08d0..60d40d48e 100644
--- a/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx
+++ b/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx
@@ -720,10 +720,11 @@ namespace MED{
       
       TFileWrapper aFileWrapper(myFile,eLECTURE,theErr);
       
-      if(theErr && !*theErr)
+      if(theErr && *theErr < 0)
 	return anInfo;
       
-      if(TInt aNbElem = GetNbNodes(theMeshInfo)){
+      TInt aNbElem = GetNbNodes(theMeshInfo);
+      if(aNbElem > 0){
 	anInfo[eNOEUD][ePOINT1] = aNbElem;
 	const TEntity2GeomSet& anEntity2GeomSet = GetEntity2GeomSet();
 	TEntity2GeomSet::const_iterator anIter = anEntity2GeomSet.begin();
@@ -735,10 +736,9 @@ namespace MED{
 	  TGeomSet::const_iterator anIterEnd2 = aGeomSet.end();
 	  for(; anIter2 != anIterEnd2; anIter2++){
 	    const EGeometrieElement& aGeom = *anIter2;
-	    TInt aNb = GetNbCells(theMeshInfo,anEntity,aGeom,theTConn,theErr);
-	    if(aNb>0){
-	      anInfo[anEntity][aGeom] = aNb;
-	    }
+	    aNbElem = GetNbCells(theMeshInfo,anEntity,aGeom,theTConn,theErr);
+	    if(aNbElem > 0)
+	      anInfo[anEntity][aGeom] = aNbElem;
 	  }
 	}
       }
@@ -759,9 +759,9 @@ namespace MED{
       
       MED::TMeshInfo& aMeshInfo = const_cast<MED::TMeshInfo&>(theMeshInfo);
       
-      med_entite_maillage& anEntity = static_cast<med_entite_maillage>(theTEntity);
-      med_geometrie_element& aGeom = static_cast<med_geometrie_element>(theTGeom);
-      med_connectivite& aConn = static_cast<med_connectivite>(theTConn);
+      med_entite_maillage anEntity = med_entite_maillage(theTEntity);
+      med_geometrie_element aGeom = med_geometrie_element(theTGeom);
+      med_connectivite aConn = med_connectivite(theTConn);
 
       return MEDnEntMaa(myFile->Id(),
 			&aMeshInfo.myName[0],
-- 
2.39.2