From 9230b68a8f2f48eca385990dcc4be8c8701302bd Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 29 Aug 2012 16:45:51 +0000 Subject: [PATCH] -#include "SMESH_*D_Algo.hxx" +#include "SMESH_Algo.hxx" --- src/StdMeshers/StdMeshers_Cartesian_3D.hxx | 2 +- src/StdMeshers/StdMeshers_CompositeHexa_3D.hxx | 2 +- src/StdMeshers/StdMeshers_HexaFromSkin_3D.hxx | 2 +- src/StdMeshers/StdMeshers_Hexa_3D.hxx | 2 +- src/StdMeshers/StdMeshers_Import_1D.hxx | 2 +- src/StdMeshers/StdMeshers_Import_1D2D.hxx | 2 +- src/StdMeshers/StdMeshers_MEFISTO_2D.cxx | 3 ++- src/StdMeshers/StdMeshers_MEFISTO_2D.hxx | 3 +-- src/StdMeshers/StdMeshers_Penta_3D.hxx | 10 +++++----- src/StdMeshers/StdMeshers_Prism_3D.hxx | 15 +++++++-------- src/StdMeshers/StdMeshers_Projection_1D.hxx | 2 +- src/StdMeshers/StdMeshers_Projection_1D2D.cxx | 1 + src/StdMeshers/StdMeshers_Projection_2D.hxx | 2 +- src/StdMeshers/StdMeshers_Projection_3D.hxx | 2 +- src/StdMeshers/StdMeshers_Quadrangle_2D.hxx | 2 +- src/StdMeshers/StdMeshers_RadialPrism_3D.hxx | 2 +- .../StdMeshers_RadialQuadrangle_1D2D.hxx | 2 +- src/StdMeshers/StdMeshers_Regular_1D.hxx | 2 +- .../StdMeshers_SegmentAroundVertex_0D.hxx | 2 +- src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx | 3 +-- 20 files changed, 31 insertions(+), 32 deletions(-) diff --git a/src/StdMeshers/StdMeshers_Cartesian_3D.hxx b/src/StdMeshers/StdMeshers_Cartesian_3D.hxx index 4aefa321f..df2228e3d 100644 --- a/src/StdMeshers/StdMeshers_Cartesian_3D.hxx +++ b/src/StdMeshers/StdMeshers_Cartesian_3D.hxx @@ -28,7 +28,7 @@ #include "SMESH_StdMeshers.hxx" -#include "SMESH_3D_Algo.hxx" +#include "SMESH_Algo.hxx" /*! * \brief A 3D algorithm generating 3D structured Cartesian mesh in the diff --git a/src/StdMeshers/StdMeshers_CompositeHexa_3D.hxx b/src/StdMeshers/StdMeshers_CompositeHexa_3D.hxx index d5b9f8b4e..a39791e96 100644 --- a/src/StdMeshers/StdMeshers_CompositeHexa_3D.hxx +++ b/src/StdMeshers/StdMeshers_CompositeHexa_3D.hxx @@ -25,7 +25,7 @@ #define _SMESH_CompositeSegment_1D_HXX_ #include "SMESH_StdMeshers.hxx" -#include "SMESH_3D_Algo.hxx" +#include "SMESH_Algo.hxx" class SMESH_Mesh; class StdMeshers_FaceSide; diff --git a/src/StdMeshers/StdMeshers_HexaFromSkin_3D.hxx b/src/StdMeshers/StdMeshers_HexaFromSkin_3D.hxx index 0912a4d03..16e70fc20 100644 --- a/src/StdMeshers/StdMeshers_HexaFromSkin_3D.hxx +++ b/src/StdMeshers/StdMeshers_HexaFromSkin_3D.hxx @@ -25,7 +25,7 @@ #define __StdMeshers_HexaFromSkin_3D_HXX__ #include "SMESH_StdMeshers.hxx" -#include "SMESH_3D_Algo.hxx" +#include "SMESH_Algo.hxx" /*! * \brief Alorithm generating hexahedral mesh from 2D skin of block diff --git a/src/StdMeshers/StdMeshers_Hexa_3D.hxx b/src/StdMeshers/StdMeshers_Hexa_3D.hxx index 48f1eebbe..50b476c7d 100644 --- a/src/StdMeshers/StdMeshers_Hexa_3D.hxx +++ b/src/StdMeshers/StdMeshers_Hexa_3D.hxx @@ -31,7 +31,7 @@ #include "SMESH_StdMeshers.hxx" -#include "SMESH_3D_Algo.hxx" +#include "SMESH_Algo.hxx" class StdMeshers_ViscousLayers; diff --git a/src/StdMeshers/StdMeshers_Import_1D.hxx b/src/StdMeshers/StdMeshers_Import_1D.hxx index b71b90564..03b8cbcf0 100644 --- a/src/StdMeshers/StdMeshers_Import_1D.hxx +++ b/src/StdMeshers/StdMeshers_Import_1D.hxx @@ -28,7 +28,7 @@ #include "SMESH_StdMeshers.hxx" -#include "SMESH_1D_Algo.hxx" +#include "SMESH_Algo.hxx" #include "SMDS_MeshElement.hxx" class StdMeshers_ImportSource1D; diff --git a/src/StdMeshers/StdMeshers_Import_1D2D.hxx b/src/StdMeshers/StdMeshers_Import_1D2D.hxx index fc3a89d85..22dbed743 100644 --- a/src/StdMeshers/StdMeshers_Import_1D2D.hxx +++ b/src/StdMeshers/StdMeshers_Import_1D2D.hxx @@ -28,7 +28,7 @@ #include "SMESH_StdMeshers.hxx" -#include "SMESH_2D_Algo.hxx" +#include "SMESH_Algo.hxx" #include "SMDS_MeshElement.hxx" class StdMeshers_ImportSource1D; diff --git a/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx b/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx index fe637c65a..f7a91a6b1 100644 --- a/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx +++ b/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx @@ -51,8 +51,8 @@ #include #include -#include #include +#include #include #include #include @@ -64,6 +64,7 @@ #include #include #include +#include #include #include diff --git a/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx b/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx index 0dce86135..219df4089 100644 --- a/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx +++ b/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx @@ -25,14 +25,13 @@ // Moved here from SMESH_MEFISTO_2D.hxx // Author : Paul RASCLE, EDF // Module : SMESH -// $Header$ // #ifndef _StdMeshers_MEFISTO_2D_HXX_ #define _StdMeshers_MEFISTO_2D_HXX_ #include "SMESH_StdMeshers.hxx" -#include "SMESH_2D_Algo.hxx" +#include "SMESH_Algo.hxx" class TopoDS_Face; class StdMeshers_MaxElementArea; diff --git a/src/StdMeshers/StdMeshers_Penta_3D.hxx b/src/StdMeshers/StdMeshers_Penta_3D.hxx index 5d23368cc..680389051 100644 --- a/src/StdMeshers/StdMeshers_Penta_3D.hxx +++ b/src/StdMeshers/StdMeshers_Penta_3D.hxx @@ -36,17 +36,17 @@ // class StdMeshers_SMESHBlock // //////////////////////////////////////////////////////////////////////// +#include +#include +#include +#include #include #include -#include -#include -#include -#include +#include "SMESH_Algo.hxx" #include "SMESH_Block.hxx" #include "SMESH_ComputeError.hxx" #include "SMESH_MesherHelper.hxx" -#include "SMESH_3D_Algo.hxx" typedef std::map< double, std::vector > StdMeshers_IJNodeMap; diff --git a/src/StdMeshers/StdMeshers_Prism_3D.hxx b/src/StdMeshers/StdMeshers_Prism_3D.hxx index 8c1e6fa78..42d56fe16 100644 --- a/src/StdMeshers/StdMeshers_Prism_3D.hxx +++ b/src/StdMeshers/StdMeshers_Prism_3D.hxx @@ -29,25 +29,25 @@ #include "SMESH_StdMeshers.hxx" -#include "SMESH_3D_Algo.hxx" -#include "SMDS_TypeOfPosition.hxx" #include "SMDS_MeshNode.hxx" +#include "SMDS_TypeOfPosition.hxx" +#include "SMESHDS_Mesh.hxx" +#include "SMESH_Algo.hxx" #include "SMESH_Block.hxx" +#include "SMESH_Comment.hxx" #include "SMESH_Mesh.hxx" -#include "SMESHDS_Mesh.hxx" -#include "SMESH_subMesh.hxx" #include "SMESH_MesherHelper.hxx" -#include "SMESH_Comment.hxx" +#include "SMESH_subMesh.hxx" #include +#include #include #include -#include #include #include -#include #include +#include class SMESHDS_SubMesh; @@ -55,7 +55,6 @@ class TopoDS_Edge; class TopoDS_Faces; struct TNode; -//typedef std::map TNodeNodeMap; typedef std::vector TNodeColumn; // map of bottom nodes to the column of nodes above them diff --git a/src/StdMeshers/StdMeshers_Projection_1D.hxx b/src/StdMeshers/StdMeshers_Projection_1D.hxx index 5ef640170..acef6c83b 100644 --- a/src/StdMeshers/StdMeshers_Projection_1D.hxx +++ b/src/StdMeshers/StdMeshers_Projection_1D.hxx @@ -30,7 +30,7 @@ #include "SMESH_StdMeshers.hxx" -#include "SMESH_1D_Algo.hxx" +#include "SMESH_Algo.hxx" class StdMeshers_ProjectionSource1D; diff --git a/src/StdMeshers/StdMeshers_Projection_1D2D.cxx b/src/StdMeshers/StdMeshers_Projection_1D2D.cxx index efe6bf034..7e5cfe821 100644 --- a/src/StdMeshers/StdMeshers_Projection_1D2D.cxx +++ b/src/StdMeshers/StdMeshers_Projection_1D2D.cxx @@ -27,6 +27,7 @@ #include "SMESH_Gen.hxx" #include "SMESH_MesherHelper.hxx" +#include "SMESH_subMesh.hxx" #include "SMESH_subMeshEventListener.hxx" #include "StdMeshers_FaceSide.hxx" #include "StdMeshers_ProjectionSource2D.hxx" diff --git a/src/StdMeshers/StdMeshers_Projection_2D.hxx b/src/StdMeshers/StdMeshers_Projection_2D.hxx index 3d1bd1808..38bcb113a 100644 --- a/src/StdMeshers/StdMeshers_Projection_2D.hxx +++ b/src/StdMeshers/StdMeshers_Projection_2D.hxx @@ -29,7 +29,7 @@ #include "SMESH_StdMeshers.hxx" -#include "SMESH_2D_Algo.hxx" +#include "SMESH_Algo.hxx" class StdMeshers_ProjectionSource2D; diff --git a/src/StdMeshers/StdMeshers_Projection_3D.hxx b/src/StdMeshers/StdMeshers_Projection_3D.hxx index 03e8c4838..fdfe5b817 100644 --- a/src/StdMeshers/StdMeshers_Projection_3D.hxx +++ b/src/StdMeshers/StdMeshers_Projection_3D.hxx @@ -29,7 +29,7 @@ #include "SMESH_StdMeshers.hxx" -#include "SMESH_3D_Algo.hxx" +#include "SMESH_Algo.hxx" class StdMeshers_ProjectionSource3D; diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx index 3f9202e86..e200bc5af 100644 --- a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx +++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx @@ -31,7 +31,7 @@ #include "StdMeshers_QuadrangleParams.hxx" -#include "SMESH_2D_Algo.hxx" +#include "SMESH_Algo.hxx" #include "Utils_SALOME_Exception.hxx" #include diff --git a/src/StdMeshers/StdMeshers_RadialPrism_3D.hxx b/src/StdMeshers/StdMeshers_RadialPrism_3D.hxx index 11959d46f..7a6eaf9bd 100644 --- a/src/StdMeshers/StdMeshers_RadialPrism_3D.hxx +++ b/src/StdMeshers/StdMeshers_RadialPrism_3D.hxx @@ -29,7 +29,7 @@ #include "SMESH_StdMeshers.hxx" -#include "SMESH_3D_Algo.hxx" +#include "SMESH_Algo.hxx" #include "SMDS_MeshNode.hxx" #include diff --git a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.hxx b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.hxx index b68ebe930..6a4def9e5 100644 --- a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.hxx +++ b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.hxx @@ -26,7 +26,7 @@ #include "SMESH_StdMeshers.hxx" -#include "SMESH_2D_Algo.hxx" +#include "SMESH_Algo.hxx" #include diff --git a/src/StdMeshers/StdMeshers_Regular_1D.hxx b/src/StdMeshers/StdMeshers_Regular_1D.hxx index aed1064ab..8dceddb55 100644 --- a/src/StdMeshers/StdMeshers_Regular_1D.hxx +++ b/src/StdMeshers/StdMeshers_Regular_1D.hxx @@ -31,7 +31,7 @@ #include "SMESH_StdMeshers.hxx" -#include "SMESH_1D_Algo.hxx" +#include "SMESH_Algo.hxx" #include "StdMeshers_FixedPoints1D.hxx" diff --git a/src/StdMeshers/StdMeshers_SegmentAroundVertex_0D.hxx b/src/StdMeshers/StdMeshers_SegmentAroundVertex_0D.hxx index abb8ce2c6..97d83042e 100644 --- a/src/StdMeshers/StdMeshers_SegmentAroundVertex_0D.hxx +++ b/src/StdMeshers/StdMeshers_SegmentAroundVertex_0D.hxx @@ -29,7 +29,7 @@ #include "SMESH_StdMeshers.hxx" -#include "SMESH_0D_Algo.hxx" +#include "SMESH_Algo.hxx" /*! * \brief Algorithm existing in order just to enable assignation of diff --git a/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx b/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx index 23c64b5b9..561036a44 100644 --- a/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx +++ b/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx @@ -26,8 +26,7 @@ #include "SMESH_StdMeshers.hxx" -#include "SMESH_1D_Algo.hxx" -#include "SMESH_2D_Algo.hxx" +#include "SMESH_Algo.hxx" /*! * \brief 1D and 2D algorithms doing nothing to allow mesh generation -- 2.39.2