From ed04b53e20c0614bdbc8406773dfd3d7ea6938c7 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Wed, 28 Jun 2017 13:36:17 +0200 Subject: [PATCH] Correction bug lie au changement de convention sur le nommage des elements de structure --- src/MEDLoader/MEDFileBlowStrEltUp.cxx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/MEDLoader/MEDFileBlowStrEltUp.cxx b/src/MEDLoader/MEDFileBlowStrEltUp.cxx index adb9ce7ad..415c20bd9 100644 --- a/src/MEDLoader/MEDFileBlowStrEltUp.cxx +++ b/src/MEDLoader/MEDFileBlowStrEltUp.cxx @@ -341,6 +341,8 @@ private: static MCAuto BuildMeshFromStructure(INTERP_KERNEL::NormalizedCellType gt, const std::string& pfl, const MEDFileFieldLoc& loc, const MEDFileEltStruct4Mesh *zeStr, const MEDFileUMesh *mesh, const MEDFileUMesh *section, const MEDFileFieldGlobsReal *globs); public: static const char ANGLE_DE_VRILLE[]; + static const char ANGLE[]; + static const char SCALE[]; static const char EPAISSEUR[]; private: std::vector _locs; @@ -350,6 +352,10 @@ private: const char LocInfo::ANGLE_DE_VRILLE[]="ANGLE DE VRILLE"; +const char LocInfo::ANGLE[]="ANGLE"; + +const char LocInfo::SCALE[]="SCALE"; + const char LocInfo::EPAISSEUR[]="EPAISSEUR"; LocInfo::LocInfo(const std::vector& fw) @@ -506,9 +512,9 @@ MCAuto LocInfo::BuildMeshFromStructure(INTERP_KERNEL::Normalize MCAuto zeArr2(DynamicCast(zeArr)); if(zeArr2.isNull()) throw INTERP_KERNEL::Exception(MSG1); - if(zeArr2->getName()==ANGLE_DE_VRILLE) + if(zeArr2->getName()==ANGLE_DE_VRILLE || zeArr2->getName()==ANGLE) return BuildMeshFromAngleVrille(gt,zeArr2,pfl,loc,zeStr,mesh,section,globs); - if(zeArr2->getName()==EPAISSEUR) + if(zeArr2->getName()==EPAISSEUR || zeArr2->getName()==SCALE) return BuildMeshFromEpaisseur(gt,zeArr2,pfl,loc,zeStr,mesh,section,globs); throw INTERP_KERNEL::Exception(MSG1); } -- 2.39.2