Porting on Mandriva 64 (to use vtkFloatingPointType instead of "float")

diff --git a/src/CONVERTOR/VISU_Convertor.hxx b/src/CONVERTOR/VISU_Convertor.hxx
index 304f7de3ce4f988295df765e3e3b88d998dd02b5..4dc7b49c0b20014239de8d3d5e23bba34b612579 100644 (file)
--- a/src/CONVERTOR/VISU_Convertor.hxx
+++ b/src/CONVERTOR/VISU_Convertor.hxx
@@ -181,7 +181,7 @@ namespace VISU
 
   //---------------------------------------------------------------
   typedef std::map<vtkIdType,PValForTime> TValField;
-  typedef std::pair<float,float> TMinMax;
+  typedef std::pair<vtkFloatingPointType,vtkFloatingPointType> TMinMax;
 
   //! Define a basic class for MED FIELD entity
   struct TField: virtual TIntId
@@ -308,7 +308,7 @@ public:
 
   //! Get amount of memory to build VTK representations for all existing MED entities
   virtual
-  float
+  vtkFloatingPointType
   GetSize() = 0;
 
   //! Get mesh for corresponding MED ENTITY
@@ -319,7 +319,7 @@ public:
   
   //! Get amount of memory to build mesh for corresponding MED ENTITY
   virtual
-  float
+  vtkFloatingPointType
   GetMeshOnEntitySize(const std::string& theMeshName, 
                      const VISU::TEntity& theEntity) = 0;
   
@@ -332,7 +332,7 @@ public:
 
   //! Get amount of memory to build mesh for corresponding MED FAMILY
   virtual 
-  float 
+  vtkFloatingPointType 
   GetFamilyOnEntitySize(const std::string& theMeshName, 
                        const VISU::TEntity& theEntity,
                        const std::string& theFamilyName) = 0;
@@ -345,7 +345,7 @@ public:
   
   //! Get amount of memory to build mesh for corresponding MED GROUP
   virtual
-  float
+  vtkFloatingPointType
   GetMeshOnGroupSize(const std::string& theMeshName, 
                     const std::string& theGroupName) = 0;
   
@@ -367,7 +367,7 @@ public:
    
   //! Get amount of memory to build mesh for corresponding MED TIMESTAMP
   virtual 
-  float
+  vtkFloatingPointType
   GetTimeStampSize(const std::string& theMeshName, 
                   const VISU::TEntity& theEntity,
                   const std::string& theFieldName,
@@ -375,7 +375,7 @@ public:
     
   //! Get amount of memory to build all MED TIMESTAMPS for corresponding MED FIELD
   virtual 
-  float
+  vtkFloatingPointType
   GetFieldOnMeshSize(const std::string& theMeshName, 
                     const VISU::TEntity& theEntity,
                     const std::string& theFieldName) = 0;

diff --git a/src/CONVERTOR/VISU_Convertor_impl.cxx b/src/CONVERTOR/VISU_Convertor_impl.cxx
index 8d1fe336eba9086ae6cb4f4679757a6beab0a9f3..edbec305dbe9b40cdf7f6c8b9b67d0196e6154bd 100644 (file)
--- a/src/CONVERTOR/VISU_Convertor_impl.cxx
+++ b/src/CONVERTOR/VISU_Convertor_impl.cxx
@@ -34,7 +34,7 @@
 
 #include <vtkIdList.h>
 #include <vtkCellType.h>
-#include <vtkIntArray.h>
+#include <vtkIdTypeArray.h>
 #include <vtkCellArray.h>
 #include <vtkFloatArray.h>
 #include <vtkUnsignedCharArray.h>
@@ -52,7 +52,7 @@
 using namespace std;
 using namespace VISU;
 
-static float ERR_SIZE_CALC = 1.00;
+static vtkFloatingPointType ERR_SIZE_CALC = 1.00;
 
 static int MYVTKDEBUG = 0;
 
@@ -308,7 +308,7 @@ namespace VISU
     return myNamedPointCoords->GetVTKID(theID);
   }
 
-  float*  
+  vtkFloatingPointType*  
   TProfileImpl
   ::GetNodeCoord(vtkIdType theObjID)
   {
@@ -429,7 +429,7 @@ namespace VISU
     return myIDMapper.GetNodeVTKID(theID);
   }
 
-  float*  
+  vtkFloatingPointType*  
   TIDMapperFilter
   ::GetNodeCoord(vtkIdType theObjID)
   {
@@ -1208,7 +1208,7 @@ namespace
     }
 
     vtkIdType *pts = 0, npts = 0;
-    vtkIntArray* aCellLocationsArray = vtkIntArray::New();
+    vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New();
     aCellLocationsArray->SetNumberOfComponents(1);
     aCellLocationsArray->SetNumberOfTuples(aNbCells);
     aConnectivity->InitTraversal();
@@ -1282,7 +1282,7 @@ namespace
       }
     }
     vtkIdType *pts = 0, npts = 0;
-    vtkIntArray* aCellLocationsArray = vtkIntArray::New();
+    vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New();
     aCellLocationsArray->SetNumberOfComponents(1);
     aCellLocationsArray->SetNumberOfTuples(aNbCells);
     aConnectivity->InitTraversal();
@@ -1445,7 +1445,7 @@ namespace
     }
     
     vtkIdType *pts = 0, npts = 0;
-    vtkIntArray* aCellLocationsArray = vtkIntArray::New();
+    vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New();
     
     aCellLocationsArray->SetNumberOfComponents(1);
     aCellLocationsArray->SetNumberOfTuples(aNbCells);
@@ -1581,7 +1581,7 @@ namespace
            endl);
     
     int aSize = max(3,aNbComp);
-    TVector<float> aDataValues(aSize,0.0);
+    TVector<vtkFloatingPointType> aDataValues(aSize,0.0);
 
     const TGeom2Value& aGeom2Value = theValForTime->myGeom2Value;
 
@@ -1674,7 +1674,7 @@ namespace
     for(vtkIdType aPointId = 0; aPointId < aNbPoints; aPointId++){
       TCCoordSlice aSlice = aCoords.GetCoordSlice(aPointId);
       
-      float aCoords[3] = {0.0, 0.0, 0.0};
+      vtkFloatingPointType aCoords[3] = {0.0, 0.0, 0.0};
       for(vtkIdType aDimId = 0; aDimId < aDim; aDimId++)
        aCoords[aDimId] = aSlice[aDimId];
       
@@ -1686,7 +1686,7 @@ namespace
     }
     anIdList->Delete();
     
-    vtkIntArray* aCellLocationsArray = vtkIntArray::New();
+    vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New();
     aCellLocationsArray->SetNumberOfComponents(1);
     aCellLocationsArray->SetNumberOfTuples(aNbCells);
     
@@ -1774,15 +1774,15 @@ namespace
   PrintMemorySize(vtkUnstructuredGrid* theDataSet)
   {
     theDataSet->Update();
-    BEGMSG(1,"GetPoints() = "<<float(theDataSet->GetPoints()->GetActualMemorySize()*1000)<<endl);
-    BEGMSG(1,"GetCells() = "<<float(theDataSet->GetCells()->GetActualMemorySize()*1000)<<endl);
-    BEGMSG(1,"GetCellTypesArray() = "<<float(theDataSet->GetCellTypesArray()->GetActualMemorySize()*1000)<<endl);
-    BEGMSG(1,"GetCellLocationsArray() = "<<float(theDataSet->GetCellLocationsArray()->GetActualMemorySize()*1000)<<endl);
+    BEGMSG(1,"GetPoints() = "<<vtkFloatingPointType(theDataSet->GetPoints()->GetActualMemorySize()*1000)<<endl);
+    BEGMSG(1,"GetCells() = "<<vtkFloatingPointType(theDataSet->GetCells()->GetActualMemorySize()*1000)<<endl);
+    BEGMSG(1,"GetCellTypesArray() = "<<vtkFloatingPointType(theDataSet->GetCellTypesArray()->GetActualMemorySize()*1000)<<endl);
+    BEGMSG(1,"GetCellLocationsArray() = "<<vtkFloatingPointType(theDataSet->GetCellLocationsArray()->GetActualMemorySize()*1000)<<endl);
     theDataSet->BuildLinks();
-    BEGMSG(1,"GetCellLinks() = "<<float(theDataSet->GetCellLinks()->GetActualMemorySize()*1000)<<endl);
-    BEGMSG(1,"GetPointData() = "<<float(theDataSet->GetPointData()->GetActualMemorySize()*1000)<<endl);
-    BEGMSG(1,"GetCellData() = "<<float(theDataSet->GetCellData()->GetActualMemorySize()*1000)<<endl);
-    BEGMSG(1,"GetActualMemorySize() = "<<float(theDataSet->GetActualMemorySize()*1000)<<endl);
+    BEGMSG(1,"GetCellLinks() = "<<vtkFloatingPointType(theDataSet->GetCellLinks()->GetActualMemorySize()*1000)<<endl);
+    BEGMSG(1,"GetPointData() = "<<vtkFloatingPointType(theDataSet->GetPointData()->GetActualMemorySize()*1000)<<endl);
+    BEGMSG(1,"GetCellData() = "<<vtkFloatingPointType(theDataSet->GetCellData()->GetActualMemorySize()*1000)<<endl);
+    BEGMSG(1,"GetActualMemorySize() = "<<vtkFloatingPointType(theDataSet->GetActualMemorySize()*1000)<<endl);
   }
 }
 
@@ -2152,10 +2152,10 @@ VISU_Convertor_impl
        GetTimeStampSize(theMeshName,theEntity,theFieldName,theStampsNum);
        anOutput->Update();
        if(theEntity == VISU::NODE_ENTITY)
-         BEGMSG(MYVTKDEBUG,"GetPointData() = "<<float(anOutput->GetPointData()->GetActualMemorySize()*1000)<<endl);
+         BEGMSG(MYVTKDEBUG,"GetPointData() = "<<vtkFloatingPointType(anOutput->GetPointData()->GetActualMemorySize()*1000)<<endl);
        else
-         BEGMSG(MYVTKDEBUG,"GetCellData() = "<<float(anOutput->GetCellData()->GetActualMemorySize()*1000)<<endl);
-       BEGMSG(MYVTKDEBUG,"GetActualMemorySize() = "<<float(anOutput->GetActualMemorySize()*1000)<<endl);
+         BEGMSG(MYVTKDEBUG,"GetCellData() = "<<vtkFloatingPointType(anOutput->GetCellData()->GetActualMemorySize()*1000)<<endl);
+       BEGMSG(MYVTKDEBUG,"GetActualMemorySize() = "<<vtkFloatingPointType(anOutput->GetActualMemorySize()*1000)<<endl);
       }
     }
 #ifndef _DEXCEPT_
@@ -2238,10 +2238,10 @@ VISU_Convertor_impl
        GetTimeStampSize(theMeshName,theEntity,theFieldName,theStampsNum);
        anOutput->Update();
        if(theEntity == VISU::NODE_ENTITY)
-         BEGMSG(MYVTKDEBUG,"GetPointData() = "<<float(anOutput->GetPointData()->GetActualMemorySize()*1000)<<endl);
+         BEGMSG(MYVTKDEBUG,"GetPointData() = "<<vtkFloatingPointType(anOutput->GetPointData()->GetActualMemorySize()*1000)<<endl);
        else
-         BEGMSG(MYVTKDEBUG,"GetCellData() = "<<float(anOutput->GetCellData()->GetActualMemorySize()*1000)<<endl);
-       BEGMSG(MYVTKDEBUG,"GetActualMemorySize() = "<<float(anOutput->GetActualMemorySize()*1000)<<endl);
+         BEGMSG(MYVTKDEBUG,"GetCellData() = "<<vtkFloatingPointType(anOutput->GetCellData()->GetActualMemorySize()*1000)<<endl);
+       BEGMSG(MYVTKDEBUG,"GetActualMemorySize() = "<<vtkFloatingPointType(anOutput->GetActualMemorySize()*1000)<<endl);
       }
     }
 #ifndef _DEXCEPT_
@@ -2319,11 +2319,11 @@ VISU_Convertor_impl
 
 
 //---------------------------------------------------------------
-float
+vtkFloatingPointType
 VISU_Convertor_impl
 ::GetSize() 
 {
-  float aResult = 0.0;
+  vtkFloatingPointType aResult = 0.0;
   const VISU::TMeshMap& aMeshMap = GetMeshMap();
   VISU::TMeshMap::const_iterator aMeshMapIter = aMeshMap.begin();
   for(; aMeshMapIter != aMeshMap.end(); aMeshMapIter++){
@@ -2366,13 +2366,13 @@ VISU_Convertor_impl
       aResult += GetMeshOnEntitySize(aMeshName,anEntity);
     }
   }
-  MSG(MYDEBUG,"GetSize - aResult = "<<float(aResult));
+  MSG(MYDEBUG,"GetSize - aResult = "<<vtkFloatingPointType(aResult));
   return aResult;
 }
 
 
 //---------------------------------------------------------------
-float
+vtkFloatingPointType
 VISU_Convertor_impl
 ::GetMeshOnEntitySize(const std::string& theMeshName, 
                      const VISU::TEntity& theEntity)
@@ -2390,22 +2390,22 @@ VISU_Convertor_impl
   vtkIdType aConnectivitySize = aCellsSize*sizeof(vtkIdType);
   vtkIdType aTypesSize = aNbCells*sizeof(char);
   vtkIdType aLocationsSize = aNbCells*sizeof(int);
-  float aNbCellsPerPoint = aCellsSize / aNbCells - 1;
+  vtkFloatingPointType aNbCellsPerPoint = aCellsSize / aNbCells - 1;
   vtkIdType aLinksSize = aMesh->myNbPoints * 
     (vtkIdType(sizeof(vtkIdType)*aNbCellsPerPoint) + sizeof(vtkCellLinks::Link));
   aLinksSize = 0;
   vtkIdType aResult = aPointsSize + aConnectivitySize + aTypesSize + aLocationsSize + aLinksSize;
 
   MSG(MYDEBUG,"GetMeshOnEntitySize "<<
-      "- aResult = "<<float(aResult)<<
+      "- aResult = "<<vtkFloatingPointType(aResult)<<
       "; theMeshName = '"<<theMeshName<<"'"<<
       "; theEntity = "<<theEntity);
   if(MYDEBUG){
-    INITMSG(MYVTKDEBUG,"- aPointsSize = "<<float(aPointsSize)<<"\n");
-    BEGMSG(MYVTKDEBUG,"- aConnectivitySize = "<<float(aConnectivitySize)<<"\n");
-    BEGMSG(MYVTKDEBUG,"- aTypesSize = "<<float(aTypesSize)<<"\n");
-    BEGMSG(MYVTKDEBUG,"- aLocationsSize = "<<float(aLocationsSize)<<"\n");
-    BEGMSG(MYVTKDEBUG,"- aLinksSize = "<<float(aLinksSize)<<"\n");
+    INITMSG(MYVTKDEBUG,"- aPointsSize = "<<vtkFloatingPointType(aPointsSize)<<"\n");
+    BEGMSG(MYVTKDEBUG,"- aConnectivitySize = "<<vtkFloatingPointType(aConnectivitySize)<<"\n");
+    BEGMSG(MYVTKDEBUG,"- aTypesSize = "<<vtkFloatingPointType(aTypesSize)<<"\n");
+    BEGMSG(MYVTKDEBUG,"- aLocationsSize = "<<vtkFloatingPointType(aLocationsSize)<<"\n");
+    BEGMSG(MYVTKDEBUG,"- aLinksSize = "<<vtkFloatingPointType(aLinksSize)<<"\n");
   }
 
   aResult = vtkIdType(aResult*ERR_SIZE_CALC);
@@ -2414,7 +2414,7 @@ VISU_Convertor_impl
 
 
 //---------------------------------------------------------------
-float
+vtkFloatingPointType
 VISU_Convertor_impl
 ::GetFamilyOnEntitySize(const std::string& theMeshName, 
                        const VISU::TEntity& theEntity,
@@ -2433,23 +2433,23 @@ VISU_Convertor_impl
   vtkIdType aConnectivitySize = aCellsSize*sizeof(vtkIdType);
   vtkIdType aTypesSize = aNbCells*sizeof(char);
   vtkIdType aLocationsSize = aNbCells*sizeof(int);
-  float aNbCellsPerPoint = aCellsSize / aNbCells - 1;
+  vtkFloatingPointType aNbCellsPerPoint = aCellsSize / aNbCells - 1;
   vtkIdType aLinksSize = aMesh->myNbPoints * 
     (vtkIdType(sizeof(vtkIdType)*aNbCellsPerPoint) + sizeof(vtkCellLinks::Link));
   aLinksSize = 0;
   vtkIdType aResult = aPointsSize + aConnectivitySize + aTypesSize + aLocationsSize + aLinksSize;
 
   MSG(MYDEBUG,"GetFamilyOnEntitySize "<<
-      "- aResult = "<<float(aResult)<<
+      "- aResult = "<<vtkFloatingPointType(aResult)<<
       "; theMeshName = '"<<theMeshName<<"'"<<
       "; theEntity = "<<theEntity<<
       "; theFamilyName = '"<<theFamilyName<<"'");
   if(MYDEBUG){
-    INITMSG(MYVTKDEBUG,"- aPointsSize = "<<float(aPointsSize)<<"\n");
-    BEGMSG(MYVTKDEBUG,"- aConnectivitySize = "<<float(aConnectivitySize)<<"\n");
-    BEGMSG(MYVTKDEBUG,"- aTypesSize = "<<float(aTypesSize)<<"\n");
-    BEGMSG(MYVTKDEBUG,"- aLocationsSize = "<<float(aLocationsSize)<<"\n");
-    BEGMSG(MYVTKDEBUG,"- aLinksSize = "<<float(aLinksSize)<<"\n");
+    INITMSG(MYVTKDEBUG,"- aPointsSize = "<<vtkFloatingPointType(aPointsSize)<<"\n");
+    BEGMSG(MYVTKDEBUG,"- aConnectivitySize = "<<vtkFloatingPointType(aConnectivitySize)<<"\n");
+    BEGMSG(MYVTKDEBUG,"- aTypesSize = "<<vtkFloatingPointType(aTypesSize)<<"\n");
+    BEGMSG(MYVTKDEBUG,"- aLocationsSize = "<<vtkFloatingPointType(aLocationsSize)<<"\n");
+    BEGMSG(MYVTKDEBUG,"- aLinksSize = "<<vtkFloatingPointType(aLinksSize)<<"\n");
   }
 
   aResult = vtkIdType(aResult*ERR_SIZE_CALC);
@@ -2474,7 +2474,7 @@ VISU_Convertor_impl
 }
 
 
-float
+vtkFloatingPointType
 VISU_Convertor_impl
 ::GetMeshOnGroupSize(const std::string& theMeshName, 
                     const std::string& theGroupName)
@@ -2489,18 +2489,18 @@ VISU_Convertor_impl
   vtkIdType aCellsSize = aNbASizeCells.second;
   vtkIdType aConnectivityAndTypesSize = aCellsSize*sizeof(vtkIdType);
   vtkIdType aLocationsSize = aNbCells*sizeof(int);
-  float aNbCellsPerPoint = aCellsSize / aNbCells - 1;
+  vtkFloatingPointType aNbCellsPerPoint = aCellsSize / aNbCells - 1;
   vtkIdType aLinksSize = aMesh->myNbPoints * 
     (vtkIdType(sizeof(vtkIdType)*aNbCellsPerPoint) + sizeof(short));
   aLinksSize = 0;
   vtkIdType aResult = aPointsSize + aConnectivityAndTypesSize + aLocationsSize + aLinksSize;
   if(MYDEBUG){
-    MSG(MYVTKDEBUG,"GetMeshOnGroupSize - aPointsSize = "<<float(aPointsSize));
-    MSG(MYVTKDEBUG,"GetMeshOnGroupSize - aConnectivityAndTypesSize = "<<float(aConnectivityAndTypesSize));
-    MSG(MYVTKDEBUG,"GetMeshOnGroupSize - aLocationsSize = "<<float(aLocationsSize));
-    MSG(MYVTKDEBUG,"GetMeshOnGroupSize - aLinksSize = "<<float(aLinksSize));
+    MSG(MYVTKDEBUG,"GetMeshOnGroupSize - aPointsSize = "<<vtkFloatingPointType(aPointsSize));
+    MSG(MYVTKDEBUG,"GetMeshOnGroupSize - aConnectivityAndTypesSize = "<<vtkFloatingPointType(aConnectivityAndTypesSize));
+    MSG(MYVTKDEBUG,"GetMeshOnGroupSize - aLocationsSize = "<<vtkFloatingPointType(aLocationsSize));
+    MSG(MYVTKDEBUG,"GetMeshOnGroupSize - aLinksSize = "<<vtkFloatingPointType(aLinksSize));
   }
-  MSG(MYDEBUG,"GetMeshOnGroupSize - aResult = "<<float(aResult)<<"; theMeshName = '"
+  MSG(MYDEBUG,"GetMeshOnGroupSize - aResult = "<<vtkFloatingPointType(aResult)<<"; theMeshName = '"
       <<theMeshName<<"'; theGroupName = '"<<theGroupName<<"'");
 
   aResult = vtkIdType(aResult*ERR_SIZE_CALC);
@@ -2546,7 +2546,7 @@ VISU_Convertor_impl
 }
 
 
-float
+vtkFloatingPointType
 VISU_Convertor_impl
 ::GetFieldOnMeshSize(const std::string& theMeshName, 
                     const VISU::TEntity& theEntity,
@@ -2556,12 +2556,12 @@ VISU_Convertor_impl
   PMeshOnEntityImpl aVTKMeshOnEntity = boost::get<2>(aFindField);
   PFieldImpl aField = boost::get<3>(aFindField);
 
-  float aMeshSize = GetMeshOnEntitySize(theMeshName,aVTKMeshOnEntity->myEntity);
-  float aFieldOnMeshSize = float(aField->myDataSize*sizeof(float)*aField->myValField.size()*ERR_SIZE_CALC);
-  float aResult = aMeshSize + aFieldOnMeshSize;
+  vtkFloatingPointType aMeshSize = GetMeshOnEntitySize(theMeshName,aVTKMeshOnEntity->myEntity);
+  vtkFloatingPointType aFieldOnMeshSize = vtkFloatingPointType(aField->myDataSize*sizeof(vtkFloatingPointType)*aField->myValField.size()*ERR_SIZE_CALC);
+  vtkFloatingPointType aResult = aMeshSize + aFieldOnMeshSize;
   if(MYDEBUG)
-    MSG(MYVTKDEBUG,"GetFieldOnMeshSize - aFieldOnMeshSize = "<<float(aFieldOnMeshSize));
-  MSG(MYDEBUG,"GetFieldOnMeshSize - aResult = "<<float(aResult)<<"; theMeshName = '"<<theMeshName<<
+    MSG(MYVTKDEBUG,"GetFieldOnMeshSize - aFieldOnMeshSize = "<<vtkFloatingPointType(aFieldOnMeshSize));
+  MSG(MYDEBUG,"GetFieldOnMeshSize - aResult = "<<vtkFloatingPointType(aResult)<<"; theMeshName = '"<<theMeshName<<
       "'; theEntity = "<<theEntity<<"; theFieldName = '"<<theFieldName<<"'");
 
   return aResult;
@@ -2596,7 +2596,7 @@ VISU_Convertor_impl
 }
 
 
-float
+vtkFloatingPointType
 VISU_Convertor_impl
 ::GetTimeStampSize(const std::string& theMeshName, 
                   const VISU::TEntity& theEntity,
@@ -2608,12 +2608,12 @@ VISU_Convertor_impl
   PMeshOnEntityImpl aVTKMeshOnEntity = boost::get<2>(aFindTimeStamp);
   PFieldImpl aField = boost::get<3>(aFindTimeStamp);
   
-  float aMeshSize = GetMeshOnEntitySize(theMeshName,aVTKMeshOnEntity->myEntity);
-  float aTimeStampSize = float(aField->myDataSize*sizeof(float) * ERR_SIZE_CALC);
-  float aResult = aMeshSize + aTimeStampSize;
+  vtkFloatingPointType aMeshSize = GetMeshOnEntitySize(theMeshName,aVTKMeshOnEntity->myEntity);
+  vtkFloatingPointType aTimeStampSize = vtkFloatingPointType(aField->myDataSize*sizeof(vtkFloatingPointType) * ERR_SIZE_CALC);
+  vtkFloatingPointType aResult = aMeshSize + aTimeStampSize;
 
-  MSG(MYDEBUG && MYVTKDEBUG,"GetTimeStampSize - aTimeStampSize = "<<float(aTimeStampSize));
-  MSG(MYDEBUG,"GetTimeStampSize - aResult = "<<float(aResult)<<
+  MSG(MYDEBUG && MYVTKDEBUG,"GetTimeStampSize - aTimeStampSize = "<<vtkFloatingPointType(aTimeStampSize));
+  MSG(MYDEBUG,"GetTimeStampSize - aResult = "<<vtkFloatingPointType(aResult)<<
       "; theMeshName = '"<<theMeshName<<"'; theEntity = "<<theEntity<<
       "; theFieldName = '"<<theFieldName<<"'; theStampsNum = "<<theStampsNum);
 

diff --git a/src/CONVERTOR/VISU_Convertor_impl.hxx b/src/CONVERTOR/VISU_Convertor_impl.hxx
index 20889db78fd36c8067144dc002bdd53b636bda29..413613633198170dd1dfd6a9806ba4ddacef8043 100644 (file)
--- a/src/CONVERTOR/VISU_Convertor_impl.hxx
+++ b/src/CONVERTOR/VISU_Convertor_impl.hxx
@@ -76,7 +76,7 @@ namespace VISU
 
   typedef vtkSmartPointer<VTKViewer_AppendFilter> TVTKAppendFilter;
 
-  typedef float TCoord;
+  typedef vtkFloatingPointType TCoord;
 
   //---------------------------------------------------------------
   //! Define an utility base class which is repsonsible for preventing repetion
@@ -338,7 +338,7 @@ namespace VISU
 
     //! Reimplement the TIDMapper::GetNodeCoord
     virtual 
-    float*  
+    vtkFloatingPointType*  
     GetNodeCoord(vtkIdType theObjID);
 
     //! Reimplement the TIDMapper::GetElemObjID
@@ -401,7 +401,7 @@ namespace VISU
 
     //! Reimplement the TIDMapper::GetNodeCoord
     virtual 
-    float*  
+    vtkFloatingPointType*  
     GetNodeCoord(vtkIdType theObjID);
 
     //! Reimplement the TIDMapper::GetElemObjID
@@ -702,7 +702,7 @@ namespace VISU
 
 
   //---------------------------------------------------------------
-  typedef TVector<float> TValue;
+  typedef TVector<vtkFloatingPointType> TValue;
   typedef TSlice<TValue> TValueSlice;
   typedef TCSlice<TValue> TCValueSlice;
 
@@ -814,7 +814,7 @@ public:
 
   //! Implemention of the VISU_Convertor::GetSize
   virtual 
-  float
+  vtkFloatingPointType
   GetSize();
 
   //! Implemention of the VISU_Convertor::GetMeshOnEntity
@@ -825,7 +825,7 @@ public:
 
   //! Implemention of the VISU_Convertor::GetMeshOnEntitySize
   virtual 
-  float 
+  vtkFloatingPointType 
   GetMeshOnEntitySize(const std::string& theMeshName, 
                       const VISU::TEntity& theEntity);
 
@@ -838,7 +838,7 @@ public:
 
   //! Implemention of the VISU_Convertor::GetFamilyOnEntitySize
   virtual 
-  float 
+  vtkFloatingPointType 
   GetFamilyOnEntitySize(const std::string& theMeshName, 
                        const VISU::TEntity& theEntity,
                        const std::string& theFamilyName);
@@ -851,7 +851,7 @@ public:
   
   //! Implemention of the VISU_Convertor::GetMeshOnGroupSize
   virtual 
-  float 
+  vtkFloatingPointType 
   GetMeshOnGroupSize(const std::string& theMeshName, 
                     const std::string& theGroupName);
 
@@ -865,7 +865,7 @@ public:
 
   //! Implemention of the VISU_Convertor::GetTimeStampSize
   virtual 
-  float 
+  vtkFloatingPointType 
   GetTimeStampSize(const std::string& theMeshName, 
                   const VISU::TEntity& theEntity,
                   const std::string& theFieldName,
@@ -881,7 +881,7 @@ public:
   
   //! Implemention of the VISU_Convertor::GetFieldOnMeshSize
   virtual 
-  float 
+  vtkFloatingPointType 
   GetFieldOnMeshSize(const std::string& theMeshName, 
                     const VISU::TEntity& theEntity,
                     const std::string& theFieldName);

diff --git a/src/CONVERTOR/VISU_IDMapper.cxx b/src/CONVERTOR/VISU_IDMapper.cxx
index c1f07b5b5584f35bf02e3a2f82714f4c4f1d185a..a8cd2a5adba277f5965ceb677e72ccc60e5b34e8 100644 (file)
--- a/src/CONVERTOR/VISU_IDMapper.cxx
+++ b/src/CONVERTOR/VISU_IDMapper.cxx
@@ -31,7 +31,7 @@
 namespace VISU
 {
   //---------------------------------------------------------------
-  float*  
+  vtkFloatingPointType*  
   TIDMapper
   ::GetNodeCoord(vtkIdType theObjID)
   {

diff --git a/src/CONVERTOR/VISU_IDMapper.hxx b/src/CONVERTOR/VISU_IDMapper.hxx
index 57cf9ee79ae815204bb7e1f0ae186a827e472803..94e78c0ba2b273ff83e6a76ad4c53c0ecc658277 100644 (file)
--- a/src/CONVERTOR/VISU_IDMapper.hxx
+++ b/src/CONVERTOR/VISU_IDMapper.hxx
@@ -78,7 +78,7 @@ namespace VISU
 
     //! Get coordinates of node for corresponding object ID
     virtual
-    float* 
+    vtkFloatingPointType* 
     GetNodeCoord(vtkIdType theObjID);
 
     //! Get cell object ID for corresponding VTK ID

diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx
index c905b9eeac20e25dd3127e261feb2f0848c89cab..3697d9db2bf83bf90136433b0fe5fbefdd2e7949 100644 (file)
--- a/src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_MedConvertor.cxx
@@ -1235,10 +1235,10 @@ VISU_MedConvertor
                    for(TInt iComp = 0; iComp < aNbComp; iComp++){
                      const MED::TCValueSlice& aMValueSlice = aMValueSliceArr[iComp];
                      TMinMax& aMinMax = aMinMaxArr[iComp+1];
-                     float& aMin = aMinMax.first;
-                     float& aMax = aMinMax.second;
+                     vtkFloatingPointType& aMin = aMinMax.first;
+                     vtkFloatingPointType& aMax = aMinMax.second;
                      for(TInt iGauss = 0; iGauss < aNbGauss; iGauss++){
-                       const float& aVal = aMValueSlice[iGauss];
+                       const vtkFloatingPointType& aVal = aMValueSlice[iGauss];
                        aMin = min(aMin,aVal);
                        aMax = max(aMax,aVal);
                      }
@@ -1247,15 +1247,15 @@ VISU_MedConvertor
                  
                  // To calculate min/max per vector modulus
                  TMinMax& aMinMax = aMinMaxArr[0];
-                 float& aMin = aMinMax.first;
-                 float& aMax = aMinMax.second;
+                 vtkFloatingPointType& aMin = aMinMax.first;
+                 vtkFloatingPointType& aMax = aMinMax.second;
                  for(TInt iElem = 0; iElem < aNbElem; iElem++){
                    MED::TCValueSliceArr aMValueSliceArr = aMMeshValue.GetGaussValueSliceArr(iElem);
                    for(TInt iGauss = 0; iGauss < aNbGauss; iGauss++){
                      const MED::TCValueSlice& aMValueSlice = aMValueSliceArr[iGauss];
-                     float aValue = 0.0;
+                     vtkFloatingPointType aValue = 0.0;
                      for(TInt iComp = 0; iComp < aNbComp2; iComp++){
-                       float aVal = aMValueSlice[iComp];
+                       vtkFloatingPointType aVal = aMValueSlice[iComp];
                        aValue += aVal*aVal;
                      }
                      aValue = sqrt(aValue);