From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Wed, 23 Dec 2020 10:38:40 +0000 (+0100)
Subject: spns #20541 : apply bos #20444 to PARAVIS V9_6_0
X-Git-Tag: V9_7_0~178
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=baf867d0e1fc7ad6fdbeefdb35b91305bc8796ce;p=tools%2Fsat_salome.git

spns #20541 : apply bos #20444 to PARAVIS V9_6_0
---

diff --git a/products/PARAVIS.pyconf b/products/PARAVIS.pyconf
index 307d79f..136aa58 100644
--- a/products/PARAVIS.pyconf
+++ b/products/PARAVIS.pyconf
@@ -44,6 +44,7 @@ default :
         is_SALOME_module : "yes"
         incremental : "yes"
     }
+    patches : []
 }
 
 default_win:
@@ -96,6 +97,11 @@ default_MPI :
     ]
 }
 
+version_V9_6_0 :
+{
+   patches : ['PARAVIS-MEDLoaderForPV-64BITS_IDS.patch'] # port-back post-9.6.0 PARAVIS fix # bos #20444
+}
+
 version_V9_4_0 :
 {
     cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON "
diff --git a/products/patches/PARAVIS-MEDLoaderForPV-64BITS_IDS.patch b/products/patches/PARAVIS-MEDLoaderForPV-64BITS_IDS.patch
new file mode 100644
index 0000000..624e65a
--- /dev/null
+++ b/products/patches/PARAVIS-MEDLoaderForPV-64BITS_IDS.patch
@@ -0,0 +1,22 @@
+diff --git a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDFileFieldRepresentationTree.cxx b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDFileFieldRepresentationTree.cxx
+index 87404a4..a8396b3 100644
+--- a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDFileFieldRepresentationTree.cxx
++++ b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDFileFieldRepresentationTree.cxx
+@@ -270,7 +270,7 @@ void AssignDataPointerToVTK(typename MEDFileVTKTraits<T>::VtkType *vtkTab, typen
+ 
+ // here copy is always assumed.
+ template<class VTKT, class MCT>
+-void AssignDataPointerOther(VTKT *vtkTab, MCT *mcTab, int nbElems)
++void AssignDataPointerOther(VTKT *vtkTab, MCT *mcTab, vtkIdType nbElems)
+ {
+   typedef typename VTKT::ValueType VTKType;
+   if ( sizeof( VTKType ) == sizeof( typename MCT::Type ))
+@@ -732,7 +732,7 @@ vtkUnstructuredGrid *MEDFileFieldRepresentationLeaves::buildVTKInstanceNoTimeInt
+   MCAuto<DataArrayByte> typesSafe(typesMC);
+   MCAuto<DataArrayIdType> cellLocationsSafe(cellLocationsMC),cellsSafe(cellsMC),faceLocationsSafe(faceLocationsMC),facesSafe(facesMC);
+   //
+-  int nbOfCells(typesSafe->getNbOfElems());
++  vtkIdType nbOfCells(typesSafe->getNbOfElems());
+   vtkUnstructuredGrid *ret(vtkUnstructuredGrid::New());
+   vtkUnsignedCharArray *cellTypes(vtkUnsignedCharArray::New());
+   AssignDataPointerOther<vtkUnsignedCharArray,DataArrayByte>(cellTypes,typesSafe,nbOfCells);