From c4551c56aa89896595842e5b41b048044681b4e8 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Wed, 7 Mar 2018 09:52:29 +0100 Subject: [PATCH] Deal with pipes --- src/MEDLoader/MEDFileBlowStrEltUp.cxx | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/MEDLoader/MEDFileBlowStrEltUp.cxx b/src/MEDLoader/MEDFileBlowStrEltUp.cxx index c2403ff3e..9601a4a5c 100644 --- a/src/MEDLoader/MEDFileBlowStrEltUp.cxx +++ b/src/MEDLoader/MEDFileBlowStrEltUp.cxx @@ -509,6 +509,7 @@ MCAuto LocInfo::BuildMeshFromEpaisseur(INTERP_KERNEL::Normalize MCAuto LocInfo::BuildMeshPipeSEG3(const DataArrayDouble *angle, const DataArrayDouble *scale, const std::string& pfl, const MEDFileFieldLoc& loc, const MEDFileEltStruct4Mesh *zeStr, const MEDFileUMesh *mesh, const MEDFileUMesh *section, const MEDFileFieldGlobsReal *globs) { +#if __cplusplus >= 201103L static const char MSG1[]="BuildMeshPipeSEG3 : not recognized pattern ! Send mail to anthony.geay@edf.fr with corresponding MED file !"; MCAuto ptsForLoc; MCAuto geoMesh(BuildMeshCommon(INTERP_KERNEL::NORM_SEG3,pfl,loc,zeStr,mesh,section,globs,ptsForLoc)); @@ -546,8 +547,20 @@ MCAuto LocInfo::BuildMeshPipeSEG3(const DataArrayDouble *angle, std::vector< MCAuto > arrs(nbCells*nbg); for(int j=0;j p(secPts->deepCopy()); double ang0(rot->getIJ(j,2)); + double rmin(zeScale->getIJ(j,0)),rmax(zeScale->getIJ(j,1)); + { + auto pt(p->rwBegin()); + for(int i=0;ibegin(),p->getPointer()); AX1[0]=-sin(ang0); AX1[1]=cos(ang0);// rot Oy around OZ double ang1(M_PI/2.-rot->getIJ(j,1)); @@ -565,6 +578,9 @@ MCAuto LocInfo::BuildMeshPipeSEG3(const DataArrayDouble *angle, std::vector arrs2(VecAutoToVecOfCstPt(arrs)); MCAuto resu(DataArrayDouble::Aggregate(arrs2)); return resu; +#else + throw INTERP_KERNEL::Exception("Broken news : 10% off for C++11 compiler :)"); +#endif } MCAuto LocInfo::BuildMeshFromStructure(INTERP_KERNEL::NormalizedCellType gt, const std::string& pfl, const MEDFileFieldLoc& loc, const MEDFileEltStruct4Mesh *zeStr, const MEDFileUMesh *mesh, const MEDFileUMesh *section, const MEDFileFieldGlobsReal *globs) -- 2.39.2