Join delta from tag V4_1_1 till tag mergeto_V4_1_0_maintainance_07Mar2008.

diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx
index 66ce4c1d5a46878a371035d8f6f47c0c06f5d7da..bd4878e7cae52db283fc1e876048625f89bc4020 100644 (file)
--- a/src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_MedConvertor.cxx
@@ -404,7 +404,9 @@ namespace
          aGauss->myGaussInfo = aGaussInfo;
          aGauss->myName = aGaussInfo->GetName();
          aGauss->myNbPoints = aGaussInfo->GetNbGauss();
-       }
+       } else if ( aTimeStampInfo.GetNbGauss(aMGeom) > 1 )
+         EXCEPTION( runtime_error, "aGaussIter == aGeom2Gauss.end()"
+                    " && aTimeStampInfo.GetNbGauss(aMGeom) > 1 !!!" );
        
        aGaussSubMesh->myNbCells = aNbCells*aGauss->myNbPoints;
        aGaussSubMesh->myCellsSize = aGaussSubMesh->myNbCells*2;
@@ -479,36 +481,6 @@ namespace
     }
   }
 
-
-  //---------------------------------------------------------------
-  void
-  InitGaussProfile(const MED::PWrapper& theMEDWrapper,
-                  const MED::PMeshInfo& theMeshInfo,
-                  MED::PTimeStampValueBase& theTimeStampValue,
-                  VISU::TMEDMeshOnEntity& theMeshOnEntity,
-                  MED::EEntiteMaillage theMEntity,
-                  const MED::TGeom2Size& theGeom2Size,
-                  VISU::TMEDValForTime& theValForTime)
-  {
-    VISU::TTimerLog aTimerLog(MYDEBUG,"InitGaussProfile");
-    INITMSG(MYDEBUG,"InitGaussProfile"<<std::endl);
-
-    // The order of the function calls is important
-    InitProfile(theMEDWrapper,
-               theMeshInfo,
-               theTimeStampValue,
-               theMeshOnEntity,
-               theMEntity,
-               theGeom2Size,
-               theValForTime);
-
-    InitGaussMesh(theTimeStampValue,
-                 theMeshOnEntity,
-                 theGeom2Size,
-                 theValForTime);
-  }
-
-
   //---------------------------------------------------------------
   void
   BuildMeshOnEntityMap(VISU::PMEDMesh theMesh,
@@ -2876,13 +2848,13 @@ LoadValForTime(const MED::PWrapper& theMed,
                               aMKey2Profile,
                               aKey2Gauss);
   
-  InitGaussProfile(theMed,
-                  aMeshInfo,
-                  aTimeStampValue,
-                  theMeshOnEntity,
-                  aMEntity,
-                  aGeom2Size,
-                  theValForTime);
+  InitProfile(theMed,
+             aMeshInfo,
+             aTimeStampValue,
+             theMeshOnEntity,
+             aMEntity,
+             aGeom2Size,
+             theValForTime);
 
   LoadProfile(theMed,
              theMesh,
@@ -2890,12 +2862,18 @@ LoadValForTime(const MED::PWrapper& theMed,
              theValForTime,
              theMeshOnEntity);
   
-  if(theIsGauss)
+  if(theIsGauss) {
+    InitGaussMesh(aTimeStampValue,
+                 theMeshOnEntity,
+                 aGeom2Size,
+                 theValForTime);
+
     LoadGaussMesh(theMed,
                  theMesh,
                  aTimeStampValue,
                  theValForTime,
                  theMeshOnEntity);
+  }
   
   VISU::PMEDProfile aProfile = theValForTime->myProfile;
   VISU::TGeom2SubProfile& aGeom2SubProfile = aProfile->myGeom2SubProfile;