X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers_I%2FStdMeshers_i.cxx;h=f0c973cdf46d8ab0690549b84117d170dd0a545f;hb=HEAD;hp=9038d2f58ce77ada94a66f53608e47a1803345b0;hpb=c2599642597ef3c56d947184ca00b0e2ed2da806;p=modules%2Fsmesh.git diff --git a/src/StdMeshers_I/StdMeshers_i.cxx b/src/StdMeshers_I/StdMeshers_i.cxx index 9038d2f58..f0c973cdf 100644 --- a/src/StdMeshers_I/StdMeshers_i.cxx +++ b/src/StdMeshers_I/StdMeshers_i.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2024 CEA, EDF, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -77,20 +77,18 @@ #include "StdMeshers_UseExisting_1D2D_i.hxx" #include "StdMeshers_ViscousLayers2D_i.hxx" #include "StdMeshers_ViscousLayers_i.hxx" -#ifdef ENABLE_MEFISTO - #include "StdMeshers_MEFISTO_2D_i.hxx" -#endif +#include "StdMeshers_ViscousLayerBuilder_i.hxx" namespace SMESH { class ApplicableToAny { public: - static bool IsApplicable( const TopoDS_Shape &S, bool toCheckAll, int algoDim ) + static bool IsApplicable( const TopoDS_Shape &S, bool /*toCheckAll*/, int algoDim ) { return GenericHypothesisCreator_i::IsShapeOfDim( S, algoDim ); } }; -}; +} template class StdHypothesisCreator_i : public HypothesisCreator_i< T > @@ -209,15 +207,11 @@ STDMESHERS_I_EXPORT else if (strcmp(aHypName, "CartesianParameters3D") == 0) aCreator = new StdHypothesisCreator_i; else if (strcmp(aHypName, "BlockRenumber") == 0) - aCreator = new StdHypothesisCreator_i; + aCreator = new StdHypothesisCreator_i; // Algorithms else if (strcmp(aHypName, "Regular_1D") == 0) aCreator = new StdHypothesisCreator_i; -#ifdef ENABLE_MEFISTO - else if (strcmp(aHypName, "MEFISTO_2D") == 0) - aCreator = new StdHypothesisCreator_i; -#endif else if (strcmp(aHypName, "Quadrangle_2D") == 0) aCreator = new StdHypothesisCreator_i; else if (strcmp(aHypName, "QuadFromMedialAxis_1D2D") == 0) @@ -255,8 +249,9 @@ STDMESHERS_I_EXPORT else if (strcmp(aHypName, "PolygonPerFace_2D") == 0) aCreator = new StdHypothesisCreator_i; else if (strcmp(aHypName, "PolyhedronPerSolid_3D") == 0) - aCreator = new StdHypothesisCreator_i; - else ; + aCreator = new StdHypothesisCreator_i; + else if (strcmp(aHypName, "ViscousLayerBuilder") == 0) + aCreator = new StdHypothesisCreator_i; return aCreator; }