]> SALOME platform Git repositories - modules/paravis.git/commitdiff
Salome HOME
Synchronize VTKToMEDMem.cxx and VTKToMEDMem.h file
authorAnthony Geay <anthony.geay@edf.fr>
Sat, 6 Feb 2021 05:47:35 +0000 (06:47 +0100)
committerAnthony Geay <anthony.geay@edf.fr>
Sat, 6 Feb 2021 05:47:35 +0000 (06:47 +0100)
src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/VTKToMEDMem.cxx
src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/VTKToMEDMem.h

index 847b3436e24feb9aa0fb27e715f0568b9f25c7ba..57922212fd51567fe84e0dfd84c4d019f63a9928 100644 (file)
@@ -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)
index 199372809f2cd44641a4d84d0de5ae5190d94d12..7cf154420045b0fbaed3b3d3693641427da2784c 100644 (file)
@@ -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"