From 7e33b9e46f5c8ef65dd95cfe9d09b2c5799094f6 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Sat, 6 Feb 2021 06:47:35 +0100 Subject: [PATCH] Synchronize VTKToMEDMem.cxx and VTKToMEDMem.h file --- .../plugin/DevelopedSurfaceModule/VTKToMEDMem.cxx | 8 +++++--- .../plugin/DevelopedSurfaceModule/VTKToMEDMem.h | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) 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(tf,mesh,n2oPtr,dai,fs,timeStep,tsId); + AppendToFields(tf,mesh,n2oPtr,daId,fs,timeStep,tsId); + else + AppendToFields(tf,mesh,n2oPtr,dai,fs,timeStep,tsId); return ; } else if(fieldName==FAMFIELD_FOR_CELLS && tf==MEDCoupling::ON_CELLS) @@ -570,7 +572,7 @@ std::vector > 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 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" -- 2.39.2