SMH: 3.0.0 preparation - merged and adopted version (POLYWORK+HEAD)

[modules/visu.git] / src / CONVERTOR / VISU_MedConvertor.cxx

diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx
index 16e0ac4b1e88612b2bd7d768d5cf69caa90f9855..bc9e31d189302e56234b5228f9af575c97186180 100644 (file)
--- a/src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_MedConvertor.cxx
@@ -77,7 +77,7 @@ namespace{
     case ePYRA5: return VTK_PYRAMID;
     case ePYRA13: return VTK_PYRAMID;
     case ePOLYGONE: return VTK_POLYGON;
-//     case ePOLYEDRE: return VTK_POLYEDRE;
+    case ePOLYEDRE: return VTK_CONVEX_POINT_SET;
     }
     return -1;
   }
@@ -109,6 +109,7 @@ namespace{
     case VTK_WEDGE: return ePENTA6;
     case VTK_PYRAMID: return ePYRA5;
     case VTK_POLYGON: return ePOLYGONE;
+    case VTK_CONVEX_POINT_SET: return ePOLYEDRE;
     }
     return EGeometrieElement(-1);
   }
@@ -168,14 +169,13 @@ VISU_Convertor* VISU_MedConvertor::Build()  {
 
     TFamilyGroup aFamilyGroup = GetFamilies(aMed,aMeshInfo);
 
-    TFamilyByEntity aFamilyByEntity = GetFamiliesByEntity(aMed,aNodeInfo,aElemGroup,aFamilyGroup);
+    TFamilyByEntity aFamilyByEntity = GetFamiliesByEntity(aMed,aElemGroup,aFamilyGroup);
 
     TGroupInfo aGroupInfo = GetFamiliesByGroup(aFamilyGroup);
 
     // creating TMesh structure and TMeshOnEntityMap
     typedef map<TInt,TInt> TFamilyCounterMap;
     TFamilyCounterMap aFamilyNbCellsCounterMap, aFamilyCellsSizeCounterMap;
-    TFamilyCounterMap aFamilyNbPolygonesCounterMap, aFamilyPolygonesSizeCounterMap;
 
     TInt aDim = aMeshInfo->GetDim();
     const string& aMeshName = aMeshInfo->GetName();
@@ -253,13 +253,44 @@ VISU_Convertor* VISU_MedConvertor::Build()  {
                TInt aFamId = aPolygoneInfo->GetFamNum(iElem);
                if(aFamId != 0){
                  aFamilyNbCellsCounterMap[aFamId] += 1;
-                 ADDMSG(MYDEBUG,"aFamId = "<<aFamId<<" ");
+                 ADDMSG(MYDEBUG,"aFamId="<<aFamId<<" ");
                  aFamilyCellsSizeCounterMap[aFamId] += aPolygoneInfo->GetNbConn(iElem) + 1;
                }
              }
              ADDMSG(MYDEBUG,endl);
              break;
            }
+         case ePOLYEDRE:
+           {
+             PPolyedreInfo aPolyedreInfo = aMed->GetPPolyedreInfo(aMeshInfo,aMEntity,aGeom);
+             TInt aNbElem = aPolyedreInfo->GetNbElem();
+             TElemNum aConn  = aPolyedreInfo->GetConnectivite();
+             TElemNum aIndex = aPolyedreInfo->GetIndex();
+             TInt aNbIndex = aIndex.size();
+             TInt aNbConn  = aConn.size();
+
+             aMeshOnEntity->myNbCells += aNbElem;
+             
+             for (int ii = 0; ii<aNbElem ; ii++){
+               int aNbConnii = aPolyedreInfo->GetNbConn(ii);
+               aMeshOnEntity->myCellsSize += aNbConnii;
+             }
+             INITMSG(MYDEBUG,"aGeom = "<<aGeom<<"; aNbElem = "<<aNbElem<<
+                     "; myNbPolyedres = "<<aNbElem<<
+                     "; nbConn= "<<aNbConn<<"\n");
+             
+             for(TInt iElem = 0; iElem < aNbElem; iElem++){
+               TInt aFamId = aPolyedreInfo->GetFamNum(iElem);
+               std::string aName = aPolyedreInfo->GetElemName(iElem);
+               if(aFamId != 0){
+                 aFamilyNbCellsCounterMap[aFamId] += 1;
+                 ADDMSG(MYDEBUG,"(aFamId="<<aFamId<<";Name='"<<aName<<"') ");
+                 aFamilyCellsSizeCounterMap[aFamId] += aPolyedreInfo->GetNbConn(iElem) + 1;
+               }
+             }
+             ADDMSG(MYDEBUG,endl);
+             break;
+           }
          default:
            {
              int aVNbNodes = VTKGeom2NbNodes(MEDGeomToVTK(aGeom));
@@ -396,6 +427,8 @@ VISU_Convertor* VISU_MedConvertor::Build()  {
       MED::TGeom aTGeom;
       EEntiteMaillage aMEntity;
       TInt aNbTimeStamps = aMed->GetNbTimeStamps(aFieldInfo,aEntityInfo,aMEntity,aTGeom);
+      if (aNbTimeStamps<1)
+       continue;
       TEntity aVEntity = MEDEntityToVTK(aMEntity);
       VISU::PMeshOnEntity aMeshOnEntity = aMesh->myMeshOnEntityMap[aVEntity];
       TFieldMap& aFieldMap = aMeshOnEntity->myFieldMap;
@@ -644,6 +677,51 @@ VISU_MedConvertor::LoadCellsOnEntity(const MED::PWrapper& theMed,
          }
          break;
        }
+      case ePOLYEDRE:
+       {
+         PPolyedreInfo aPolyedreInfo = theMed->GetPPolyedreInfo(aMeshInfo,aMEntity,aGeom);
+         TInt aNbElem = aPolyedreInfo->GetNbElem();
+
+         int aMNbNodes = aPolyedreInfo->GetNbConn();
+         vector<TInt> aConnect(aMNbNodes);
+         aConnect = aPolyedreInfo->GetConnectivite();
+         
+         if(!isCellsLoaded){
+           VISU::TMeshOnEntityImpl::TConnForCellType& aConnForPolyedreType = aCellsConn[aVTKGeomType];
+           aConnForPolyedreType.resize(aNbElem);
+           
+           vector<TInt> aFacesIndex = aPolyedreInfo->GetFacesIndex();
+           vector<TInt> aIndex = aPolyedreInfo->GetIndex();
+
+           for (int iElem = 0; iElem < aNbElem; iElem++) {
+             set<TInt> aArrayNew;
+             VISU::TMeshOnEntityImpl::TConnect& anArray = aConnForPolyedreType[iElem];
+             
+             int aInd1 = aIndex[iElem]-1;  
+             int aInd2 = aIndex[iElem+1]-2;
+             
+             for (int i=aInd1;i<=aInd2;i++){
+               for (int j=aFacesIndex[i]-1;j<aFacesIndex[i+1]-1;j++){
+                 aArrayNew.insert(aConnect[j]);
+               }
+             }
+
+             int aNbConnNew = aArrayNew.size();
+             anArray.resize(aNbConnNew);
+             set<TInt>::iterator aIter = aArrayNew.begin();
+             for (int i=0; aIter!=aArrayNew.end();aIter++, i++)
+               anArray[i] = (*aIter)-1;
+
+           }
+         }
+         if(aFamily){
+           VISU::TFamilyImpl::TSubMeshOnCellType& aSubMeshOnCellType = aFamily->mySubMesh[aVTKGeomType];
+           for(int iElem = 0; iElem < aNbElem; iElem++) 
+             if(aPolyedreInfo->GetFamNum(iElem) == aFamily->myId)
+               aSubMeshOnCellType.insert(iElem);
+         }
+         break;
+       }
       default:
        {
          int aVNbNodes = VTKGeom2NbNodes(aVTKGeomType);
@@ -749,7 +827,7 @@ VISU_MedConvertor::LoadField(const MED::PWrapper& theMed,
   TInt aNbComp = theField->myNbComp;
 
   PTimeStampVal aTimeStampVal = theMed->GetPTimeStampVal(aTimeStampInfo);
-
+  bool anIsTrimmed = theField->myIsTrimmed;
   INITMSG(MYDEBUG,"LoadField - aMeshName = '"<<aMeshName<<
          "'; aFieldName = '"<<aFieldInfo->GetName()<<
          "'; aMEntity = "<<aMEntity<<
@@ -766,8 +844,10 @@ VISU_MedConvertor::LoadField(const MED::PWrapper& theMed,
     INITMSG(MYDEBUG,"LoadField - aGeom = "<<aGeom<<"; aNbElem = '"<<aNbElem<<endl);
 
     if(aTGeom.find(aGeom) == aTGeom.end()){
-      theField->myDataSize -= aNbElem*theField->myNbComp;
-      theField->myIsTrimmed = true;
+      if(!theField->myIsTrimmed){
+       theField->myDataSize -= aNbElem*theField->myNbComp;
+       anIsTrimmed = true;
+      }
     }else{
       int aVTKGeomType = MEDGeomToVTK(aGeom);
       VISU::TValForTimeImpl::TValForCellsWithType& anArray = theValForTime->myValForCells[aVTKGeomType];
@@ -782,5 +862,6 @@ VISU_MedConvertor::LoadField(const MED::PWrapper& theMed,
       }
     }
   }
+  theField->myIsTrimmed = anIsTrimmed;
   return 1; 
 }