From: Anthony Geay <anthony.geay@edf.fr>
Date: Sat, 6 Feb 2021 05:47:35 +0000 (+0100)
Subject: Synchronize VTKToMEDMem.cxx and VTKToMEDMem.h file
X-Git-Tag: V9_7_0a1~9
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7e33b9e46f5c8ef65dd95cfe9d09b2c5799094f6;p=modules%2Fparavis.git

Synchronize VTKToMEDMem.cxx and VTKToMEDMem.h file
---

diff --git a/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/VTKToMEDMem.cxx b/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/VTKToMEDMem.cxx
index 847b3436..57922212 100644
--- a/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/VTKToMEDMem.cxx
+++ b/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/VTKToMEDMem.cxx
@@ -89,6 +89,7 @@ using MEDCoupling::MEDCouplingCMesh;
 using MEDCoupling::MEDCouplingFieldDouble;
 using MEDCoupling::MEDCouplingFieldFloat;
 using MEDCoupling::MEDCouplingFieldInt;
+using MEDCoupling::MEDCouplingFieldInt64;
 using MEDCoupling::MCAuto;
 using MEDCoupling::Traits;
 using MEDCoupling::MLFieldTraits;
@@ -409,8 +410,9 @@ void AppendMCFieldFrom(MEDCoupling::TypeOfField tf, MEDCouplingMesh *mesh, MEDFi
       if((fieldName!=FAMFIELD_FOR_CELLS || tf!=MEDCoupling::ON_CELLS) && (fieldName!=FAMFIELD_FOR_NODES || tf!=MEDCoupling::ON_NODES))
         {
           if(!dai)
-            throw MZCException("AppendMCFieldFrom : internal error 3 (not int32) !");
-          AppendToFields<int>(tf,mesh,n2oPtr,dai,fs,timeStep,tsId);
+            AppendToFields<mcIdType>(tf,mesh,n2oPtr,daId,fs,timeStep,tsId);
+          else
+            AppendToFields<int>(tf,mesh,n2oPtr,dai,fs,timeStep,tsId);
           return ;
         }
       else if(fieldName==FAMFIELD_FOR_CELLS && tf==MEDCoupling::ON_CELLS)
@@ -570,7 +572,7 @@ std::vector<MCAuto<DataArray> > AddPartFields(const DataArrayIdType *part, vtkDa
       if(!arr)
         continue;
       const char *name(arr->GetName());
-      //int nbCompo(arr->GetNumberOfComponents());
+      //int nbCompo(arr->GetNumberOfComponents()); // todo: unused
       //vtkIdType nbTuples(arr->GetNumberOfTuples()); // todo: unused
       MCAuto<DataArray> mcarr(ConvertVTKArrayToMCArray(arr));
       if(part)
diff --git a/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/VTKToMEDMem.h b/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/VTKToMEDMem.h
index 19937280..7cf15442 100644
--- a/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/VTKToMEDMem.h
+++ b/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/VTKToMEDMem.h
@@ -28,6 +28,7 @@
 #include "MEDCouplingFieldDouble.hxx"
 #include "MEDCouplingFieldFloat.hxx"
 #include "MEDCouplingFieldInt.hxx"
+#include "MEDCouplingFieldInt64.hxx"
 #include "MEDFileData.hxx"
 #include "MEDFileField.hxx"
 #include "MEDFileMesh.hxx"