From bf0c9f75afee7e393f05364f144622067379872e Mon Sep 17 00:00:00 2001 From: SONOLET Aymeric Date: Wed, 10 Apr 2024 17:47:30 +0200 Subject: [PATCH] format: fixing includes of hxx/txx --- .../Barycentric3DIntersectorP1P1.txx | 2 +- src/INTERP_KERNEL/ConvexIntersector.txx | 10 +++++-- src/INTERP_KERNEL/CurveIntersector.hxx | 4 +-- .../Geometric2D/InterpKernelGeo2DNode.hxx | 4 +-- src/INTERP_KERNEL/Geometric2DIntersector.txx | 16 +++++------ src/INTERP_KERNEL/Interpolation.txx | 2 +- src/INTERP_KERNEL/Interpolation1D.hxx | 2 +- src/INTERP_KERNEL/Interpolation1D0D.txx | 2 +- src/INTERP_KERNEL/Interpolation2D.hxx | 2 +- src/INTERP_KERNEL/Interpolation2D1D.txx | 4 +-- src/INTERP_KERNEL/Interpolation2D3D.txx | 7 +++-- src/INTERP_KERNEL/Interpolation2DCurve.cxx | 2 +- src/INTERP_KERNEL/Interpolation3D.txx | 28 ++++++++++--------- src/INTERP_KERNEL/Interpolation3DSurf.cxx | 2 +- src/INTERP_KERNEL/Interpolation3DSurf.hxx | 2 +- src/INTERP_KERNEL/InterpolationCU.txx | 8 +++--- src/INTERP_KERNEL/InterpolationCurve.txx | 14 +++++----- src/INTERP_KERNEL/InterpolationHelper.txx | 2 +- src/INTERP_KERNEL/InterpolationPlanar.txx | 23 ++++++++------- .../LinearAlgebra/InterpKernelDenseMatrix.cxx | 2 +- .../MappedBarycentric3DIntersectorP1P1.hxx | 2 +- .../MappedBarycentric3DIntersectorP1P1.txx | 2 +- .../Planar2D1DIntersectorP0P0.hxx | 2 +- .../Planar2D1DIntersectorP0P0.txx | 2 +- src/INTERP_KERNEL/PlanarIntersector.hxx | 6 ++-- src/INTERP_KERNEL/PlanarIntersectorP0P1.txx | 2 +- .../PlanarIntersectorP0P1Bary.hxx | 2 +- src/INTERP_KERNEL/PlanarIntersectorP1P0.hxx | 2 +- src/INTERP_KERNEL/PlanarIntersectorP1P0.txx | 2 +- src/INTERP_KERNEL/PlanarIntersectorP1P0PL.txx | 3 +- src/INTERP_KERNEL/PlanarIntersectorP1P1.hxx | 2 +- src/INTERP_KERNEL/PlanarIntersectorP1P1.txx | 2 +- src/INTERP_KERNEL/PlanarIntersectorP1P1PL.hxx | 2 +- src/INTERP_KERNEL/PlanarIntersectorP1P1PL.txx | 2 +- .../PointLocator2DIntersector.hxx | 2 +- .../PointLocator3DIntersectorP0P0.hxx | 2 +- .../PointLocator3DIntersectorP0P0.txx | 3 +- .../PointLocator3DIntersectorP0P1.hxx | 2 +- .../PointLocator3DIntersectorP0P1.txx | 2 +- .../PointLocator3DIntersectorP1P0.txx | 3 +- .../PointLocator3DIntersectorP1P1.txx | 2 +- .../Polyhedron3D2DIntersectorP0P0.txx | 4 +-- .../PolyhedronIntersectorP0P0.txx | 9 +++--- .../PolyhedronIntersectorP0P1.hxx | 2 +- .../PolyhedronIntersectorP0P1.txx | 2 +- .../PolyhedronIntersectorP1P0.txx | 6 ++-- .../PolyhedronIntersectorP1P0Bary.txx | 8 +++--- .../PolyhedronIntersectorP1P1.txx | 11 ++++---- src/INTERP_KERNEL/SplitterTetra.txx | 6 ++-- .../InterpolationOptionsTest.cxx | 2 +- src/INTERP_KERNELTest/MeshTestToolkit.txx | 22 +++++++-------- src/INTERP_KERNELTest/PerfTest.cxx | 2 +- .../SingleElementPlanarTests.cxx | 2 +- .../ThreeDSurfProjectionTest.cxx | 4 +-- .../UnitTetra3D2DIntersectionTest.cxx | 2 +- .../UnitTetraIntersectionBaryTest.cxx | 2 +- src/MEDCoupling/MEDCoupling1GTUMesh.cxx | 4 +-- ...EDCouplingFieldDiscretizationOnNodesFE.cxx | 2 +- src/MEDCoupling/MEDCouplingFieldDouble.cxx | 2 +- src/MEDCoupling/MEDCouplingFieldFloat.cxx | 2 +- src/MEDCoupling/MEDCouplingFieldInt32.cxx | 4 +-- src/MEDCoupling/MEDCouplingFieldInt64.cxx | 2 +- src/MEDCoupling/MEDCouplingIMesh.cxx | 2 +- src/MEDCoupling/MEDCouplingMap.cxx | 2 +- src/MEDCoupling/MEDCouplingMemArray.cxx | 4 +-- src/MEDCoupling/MEDCouplingMemArray.txx | 2 +- src/MEDCoupling/MEDCouplingMemArrayChar.cxx | 2 +- src/MEDCoupling/MEDCouplingMemArrayFloat.cxx | 2 +- .../MEDCouplingNormalizedUnstructuredMesh.txx | 4 +-- src/MEDCoupling/MEDCouplingPointSet.cxx | 2 +- src/MEDCoupling/MEDCouplingRemapper.cxx | 4 +-- src/MEDCoupling/MEDCouplingRemapper.hxx | 4 +-- .../MEDCouplingTimeDiscretization.cxx | 3 +- .../MEDCouplingTimeDiscretization.txx | 2 +- src/MEDCoupling/MEDCouplingUMesh.cxx | 6 ++-- src/MEDCoupling/MEDCouplingUMesh_internal.cxx | 2 +- .../Test/MEDCouplingBasicsTest0.cxx | 7 +++-- .../Test/MEDCouplingBasicsTest1.cxx | 2 +- .../Test/MEDCouplingBasicsTest3.cxx | 2 +- .../Test/MEDCouplingBasicsTestInterp.cxx | 2 +- .../Test/MEDCouplingExamplesTest.cxx | 2 +- src/MEDCoupling/Test/TestMEDCoupling.cxx | 1 + .../Test/TestMEDCouplingRemapper.cxx | 1 + src/MEDCoupling_Swig/MEDCouplingCommon.i | 1 + .../MEDCouplingDataArrayTraits.hxx | 2 +- src/MEDLoader/MEDFileData.hxx | 2 +- src/MEDLoader/MEDFileEquivalence.cxx | 1 - src/MEDLoader/MEDFileField1TS.cxx | 1 + src/MEDLoader/MEDFileField1TS.hxx | 2 +- src/MEDLoader/MEDFileFieldMultiTS.cxx | 1 + src/MEDLoader/MEDFileFieldMultiTS.hxx | 2 +- src/MEDLoader/MEDFileMesh.hxx | 2 +- src/MEDLoader/MEDFileMeshLL.cxx | 4 +-- src/MEDLoader/MEDFileParameter.hxx | 2 +- src/MEDLoader/libmesh5.hxx | 8 +++--- .../MEDPARTITIONER_MeshCollection.cxx | 2 +- .../Test/MEDPARTITIONERTest.cxx | 2 +- src/ParaMEDMEM/InterpolationMatrix.cxx | 2 +- src/ParaMEDMEM/OverlapInterpolationMatrix.cxx | 2 +- src/ParaMEDMEM/ParaDataArray.txx | 2 +- src/ParaMEDMEM/ParaUMesh.cxx | 2 +- 101 files changed, 203 insertions(+), 182 deletions(-) diff --git a/src/INTERP_KERNEL/Barycentric3DIntersectorP1P1.txx b/src/INTERP_KERNEL/Barycentric3DIntersectorP1P1.txx index 7716959dc..ec55febb8 100644 --- a/src/INTERP_KERNEL/Barycentric3DIntersectorP1P1.txx +++ b/src/INTERP_KERNEL/Barycentric3DIntersectorP1P1.txx @@ -22,7 +22,7 @@ #define __BARYCENTRIC3DINTERSECTORP1P1_TXX__ #include "Barycentric3DIntersectorP1P1.hxx" -#include "Intersector3DP1P1.hxx" +#include "Intersector3DP1P1.txx" #include "InterpolationUtils.hxx" #include #include diff --git a/src/INTERP_KERNEL/ConvexIntersector.txx b/src/INTERP_KERNEL/ConvexIntersector.txx index a874e1b7b..fdc98317a 100644 --- a/src/INTERP_KERNEL/ConvexIntersector.txx +++ b/src/INTERP_KERNEL/ConvexIntersector.txx @@ -21,9 +21,15 @@ #define __CONVEXINTERSECTOR_TXX__ #include "ConvexIntersector.hxx" -#include "PlanarIntersector.hxx" +#include "PlanarIntersector.txx" +#include "PlanarIntersectorP0P0.txx" +#include "PlanarIntersectorP0P1.txx" +#include "PlanarIntersectorP1P0.txx" +#include "PlanarIntersectorP1P1.txx" +#include "PlanarIntersectorP1P0Bary.txx" +#include "PlanarIntersectorP0P1Bary.txx" -#include "PolygonAlgorithms.hxx" +#include "PolygonAlgorithms.txx" #include "InterpolationUtils.hxx" #include diff --git a/src/INTERP_KERNEL/CurveIntersector.hxx b/src/INTERP_KERNEL/CurveIntersector.hxx index e4eec5ba6..ff81860d6 100644 --- a/src/INTERP_KERNEL/CurveIntersector.hxx +++ b/src/INTERP_KERNEL/CurveIntersector.hxx @@ -21,7 +21,7 @@ #ifndef __CURVEINTERSECTOR_HXX__ #define __CURVEINTERSECTOR_HXX__ -#include "TargetIntersector.hxx" +#include "TargetIntersector.txx" #include "NormalizedUnstructuredMesh.hxx" #include @@ -33,7 +33,7 @@ namespace INTERP_KERNEL public: static const int SPACEDIM=MyMeshType::MY_SPACEDIM; static const int MESHDIM=MyMeshType::MY_MESHDIM; - using ConnType = typename MyMeshType::MyConnType; + typedef typename MyMeshType::MyConnType ConnType; static const NumberingPolicy numPol=MyMeshType::My_numPol; public: CurveIntersector(const MyMeshType& meshT, const MyMeshType& meshS, diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx index 7c0c2f27d..25c2d6e9f 100644 --- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx +++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx @@ -32,7 +32,7 @@ namespace INTERP_KERNEL { - using TypeOfLocInPolygon = enum + typedef enum { IN_1 = 7, ON_1 = 8, @@ -40,7 +40,7 @@ namespace INTERP_KERNEL ON_TANG_1 = 9, OUT_1 = 10, UNKNOWN = 11 - }; + } TypeOfLocInPolygon; class Bounds; diff --git a/src/INTERP_KERNEL/Geometric2DIntersector.txx b/src/INTERP_KERNEL/Geometric2DIntersector.txx index e1128ec9c..53caa6734 100644 --- a/src/INTERP_KERNEL/Geometric2DIntersector.txx +++ b/src/INTERP_KERNEL/Geometric2DIntersector.txx @@ -21,14 +21,14 @@ #define __GEOMETRIC2DINTERSECTOR_TXX__ #include "Geometric2DIntersector.hxx" -#include "PlanarIntersector.hxx" -// #include "PlanarIntersectorP0P0.txx" -// #include "Planar2D1DIntersectorP0P0.txx" -// #include "PlanarIntersectorP0P1.txx" -// #include "PlanarIntersectorP1P0.txx" -// #include "PlanarIntersectorP1P1.txx" -// #include "PlanarIntersectorP1P0Bary.txx" -// #include "PlanarIntersectorP0P1Bary.txx" +#include "PlanarIntersector.txx" +#include "PlanarIntersectorP0P0.txx" +#include "Planar2D1DIntersectorP0P0.txx" +#include "PlanarIntersectorP0P1.txx" +#include "PlanarIntersectorP1P0.txx" +#include "PlanarIntersectorP1P1.txx" +#include "PlanarIntersectorP1P0Bary.txx" +#include "PlanarIntersectorP0P1Bary.txx" #include "InterpolationUtils.hxx" #include "CellModel.hxx" #include "NormalizedGeometricTypes" diff --git a/src/INTERP_KERNEL/Interpolation.txx b/src/INTERP_KERNEL/Interpolation.txx index faa0a97f9..8533cbe63 100644 --- a/src/INTERP_KERNEL/Interpolation.txx +++ b/src/INTERP_KERNEL/Interpolation.txx @@ -21,7 +21,7 @@ #define __INTERPOLATION_TXX__ #include "Interpolation.hxx" -#include "IntegralUniformIntersector.hxx" +#include "IntegralUniformIntersector.txx" #include "InterpolationOptions.hxx" #include "InterpKernelException.hxx" #include "VectorUtils.hxx" diff --git a/src/INTERP_KERNEL/Interpolation1D.hxx b/src/INTERP_KERNEL/Interpolation1D.hxx index 669fd5167..3a8a3d755 100644 --- a/src/INTERP_KERNEL/Interpolation1D.hxx +++ b/src/INTERP_KERNEL/Interpolation1D.hxx @@ -22,7 +22,7 @@ #define __INTERPOLATION1D_HXX__ #include "InterpolationOptions.hxx" -#include "InterpolationCurve.hxx" +#include "InterpolationCurve.txx" namespace INTERP_KERNEL { diff --git a/src/INTERP_KERNEL/Interpolation1D0D.txx b/src/INTERP_KERNEL/Interpolation1D0D.txx index cab74b5a7..8bae8193b 100644 --- a/src/INTERP_KERNEL/Interpolation1D0D.txx +++ b/src/INTERP_KERNEL/Interpolation1D0D.txx @@ -44,7 +44,7 @@ namespace INTERP_KERNEL typename MyMeshType::MyConnType Interpolation1D0D::interpolateMeshes(const MyMeshType& srcMesh, const MyMeshType& targetMesh, MatrixType& result, const std::string& method) { constexpr int SPACEDIM=MyMeshType::MY_SPACEDIM; - using ConnType=typename MyMeshType::MyConnType; + typedef typename MyMeshType::MyConnType ConnType; IKAssert(SPACEDIM==3); if(InterpolationOptions::getIntersectionType() != PointLocator) diff --git a/src/INTERP_KERNEL/Interpolation2D.hxx b/src/INTERP_KERNEL/Interpolation2D.hxx index b27343f70..632152445 100644 --- a/src/INTERP_KERNEL/Interpolation2D.hxx +++ b/src/INTERP_KERNEL/Interpolation2D.hxx @@ -23,7 +23,7 @@ #include "InterpolationOptions.hxx" #include "PlanarIntersector.hxx" -#include "InterpolationPlanar.hxx" +#include "InterpolationPlanar.txx" #include namespace INTERP_KERNEL diff --git a/src/INTERP_KERNEL/Interpolation2D1D.txx b/src/INTERP_KERNEL/Interpolation2D1D.txx index da4322ff2..d2fd7cfb5 100644 --- a/src/INTERP_KERNEL/Interpolation2D1D.txx +++ b/src/INTERP_KERNEL/Interpolation2D1D.txx @@ -23,10 +23,10 @@ #include "Interpolation2D1D.hxx" #include #include "NormalizedUnstructuredMesh.hxx" -#include "PlanarIntersector.hxx" +#include "PlanarIntersector.txx" #include "Planar2D1DIntersectorP0P0.hxx" #include "InterpolationOptions.hxx" -#include "Geometric2DIntersector.hxx" +#include "Geometric2DIntersector.txx" #include "InterpKernelException.hxx" #include "BBTree.txx" #include "InterpolationUtils.hxx" diff --git a/src/INTERP_KERNEL/Interpolation2D3D.txx b/src/INTERP_KERNEL/Interpolation2D3D.txx index b5e2b1a1c..5dd719852 100644 --- a/src/INTERP_KERNEL/Interpolation2D3D.txx +++ b/src/INTERP_KERNEL/Interpolation2D3D.txx @@ -22,12 +22,13 @@ #include "BBTreeStandAlone.txx" #include "BoundingBox.hxx" #include "Interpolation2D3D.hxx" -#include "Intersector3D.hxx" +// #include "Interpolation.txx" +#include "Intersector3D.txx" #include "Log.hxx" #include "InterpolationOptions.hxx" -#include "MeshElement.hxx" +#include "MeshElement.txx" #include "NormalizedGeometricTypes" -#include "Polyhedron3D2DIntersectorP0P0.hxx" +#include "Polyhedron3D2DIntersectorP0P0.txx" #include "InterpolationHelper.txx" #include "InterpKernelException.hxx" diff --git a/src/INTERP_KERNEL/Interpolation2DCurve.cxx b/src/INTERP_KERNEL/Interpolation2DCurve.cxx index a845f9f06..baabef9c2 100644 --- a/src/INTERP_KERNEL/Interpolation2DCurve.cxx +++ b/src/INTERP_KERNEL/Interpolation2DCurve.cxx @@ -19,7 +19,7 @@ // Author : Anthony Geay (CEA/DEN) #include "Interpolation2DCurve.hxx" -#include "InterpolationCurve.hxx" +#include "InterpolationCurve.txx" #include "InterpolationOptions.hxx" namespace INTERP_KERNEL diff --git a/src/INTERP_KERNEL/Interpolation3D.txx b/src/INTERP_KERNEL/Interpolation3D.txx index 7e04c4a86..ecee51b99 100644 --- a/src/INTERP_KERNEL/Interpolation3D.txx +++ b/src/INTERP_KERNEL/Interpolation3D.txx @@ -21,23 +21,25 @@ #ifndef __INTERPOLATION3D_TXX__ #define __INTERPOLATION3D_TXX__ -#include "Barycentric3DIntersectorP1P1.hxx" +#include "Interpolation3D.hxx" + #include "BBTreeStandAlone.txx" #include "BoundingBox.hxx" -#include "Interpolation3D.hxx" #include "InterpolationOptions.hxx" #include "Intersector3D.hxx" -#include "MappedBarycentric3DIntersectorP1P1.hxx" -#include "MeshElement.hxx" -#include "PolyhedronIntersectorP0P0.hxx" -#include "PointLocator3DIntersectorP0P0.hxx" -#include "PolyhedronIntersectorP0P1.hxx" -#include "PointLocator3DIntersectorP0P1.hxx" -#include "PolyhedronIntersectorP1P0.hxx" -#include "PointLocator3DIntersectorP1P0.hxx" -#include "PolyhedronIntersectorP1P0Bary.hxx" -#include "PolyhedronIntersectorP1P1.hxx" -#include "PointLocator3DIntersectorP1P1.hxx" +#include "MeshElement.txx" + +#include "PolyhedronIntersectorP0P0.txx" +#include "PointLocator3DIntersectorP0P0.txx" +#include "PolyhedronIntersectorP0P1.txx" +#include "PointLocator3DIntersectorP0P1.txx" +#include "PolyhedronIntersectorP1P0.txx" +#include "PolyhedronIntersectorP1P0Bary.txx" +#include "PointLocator3DIntersectorP1P0.txx" +#include "PolyhedronIntersectorP1P1.txx" +#include "PointLocator3DIntersectorP1P1.txx" +#include "Barycentric3DIntersectorP1P1.txx" +#include "MappedBarycentric3DIntersectorP1P1.txx" #include "Log.hxx" #include "InterpKernelException.hxx" #include diff --git a/src/INTERP_KERNEL/Interpolation3DSurf.cxx b/src/INTERP_KERNEL/Interpolation3DSurf.cxx index f9f508360..308a88a79 100644 --- a/src/INTERP_KERNEL/Interpolation3DSurf.cxx +++ b/src/INTERP_KERNEL/Interpolation3DSurf.cxx @@ -20,7 +20,7 @@ #include "Interpolation3DSurf.hxx" #include "InterpolationOptions.hxx" -#include "InterpolationPlanar.hxx" +#include "InterpolationPlanar.txx" namespace INTERP_KERNEL { diff --git a/src/INTERP_KERNEL/Interpolation3DSurf.hxx b/src/INTERP_KERNEL/Interpolation3DSurf.hxx index f6ef50869..8d4836001 100644 --- a/src/INTERP_KERNEL/Interpolation3DSurf.hxx +++ b/src/INTERP_KERNEL/Interpolation3DSurf.hxx @@ -24,7 +24,7 @@ #include "INTERPKERNELDefines.hxx" #include "InterpolationOptions.hxx" #include "PlanarIntersector.hxx" -#include "InterpolationPlanar.hxx" +#include "InterpolationPlanar.txx" #include namespace INTERP_KERNEL diff --git a/src/INTERP_KERNEL/InterpolationCU.txx b/src/INTERP_KERNEL/InterpolationCU.txx index 69152f118..b765ee447 100644 --- a/src/INTERP_KERNEL/InterpolationCU.txx +++ b/src/INTERP_KERNEL/InterpolationCU.txx @@ -27,10 +27,10 @@ #include "InterpolationUtils.hxx" #include "InterpolationOptions.hxx" -#include "IntersectorCU.hxx" -#include "IntersectorCU1D.hxx" -#include "IntersectorCU2D.hxx" -#include "IntersectorCU3D.hxx" +#include "IntersectorCU.txx" +#include "IntersectorCU1D.txx" +#include "IntersectorCU2D.txx" +#include "IntersectorCU3D.txx" #include "NormalizedGeometricTypes" #include "TargetIntersector.hxx" #include diff --git a/src/INTERP_KERNEL/InterpolationCurve.txx b/src/INTERP_KERNEL/InterpolationCurve.txx index 63b6103e8..bb0e5bf02 100644 --- a/src/INTERP_KERNEL/InterpolationCurve.txx +++ b/src/INTERP_KERNEL/InterpolationCurve.txx @@ -20,14 +20,14 @@ #ifndef __INTERPOLATIONCURVE_TXX__ #define __INTERPOLATIONCURVE_TXX__ -#include "Interpolation.hxx" +#include "Interpolation.txx" #include "BBTree.txx" -#include "CurveIntersector.hxx" -#include "CurveIntersectorP0P0.hxx" -#include "CurveIntersectorP0P1.hxx" -#include "CurveIntersectorP1P0.hxx" -#include "CurveIntersectorP1P1.hxx" -#include "CurveIntersectorP1P1PL.hxx" +#include "CurveIntersector.txx" +#include "CurveIntersectorP0P0.txx" +#include "CurveIntersectorP0P1.txx" +#include "CurveIntersectorP1P0.txx" +#include "CurveIntersectorP1P1.txx" +#include "CurveIntersectorP1P1PL.txx" #include "InterpolationCurve.hxx" #include "InterpolationOptions.hxx" #include "NormalizedUnstructuredMesh.hxx" diff --git a/src/INTERP_KERNEL/InterpolationHelper.txx b/src/INTERP_KERNEL/InterpolationHelper.txx index ce0200a56..f0fead1c8 100644 --- a/src/INTERP_KERNEL/InterpolationHelper.txx +++ b/src/INTERP_KERNEL/InterpolationHelper.txx @@ -21,7 +21,7 @@ #pragma once #include "BBTreeStandAlone.txx" -#include "MeshElement.hxx" +#include "MeshElement.txx" #include "BoundingBox.hxx" #include "Log.hxx" diff --git a/src/INTERP_KERNEL/InterpolationPlanar.txx b/src/INTERP_KERNEL/InterpolationPlanar.txx index 824380a33..29fe3fbc8 100644 --- a/src/INTERP_KERNEL/InterpolationPlanar.txx +++ b/src/INTERP_KERNEL/InterpolationPlanar.txx @@ -21,26 +21,29 @@ #ifndef __INTERPOLATIONPLANAR_TXX__ #define __INTERPOLATIONPLANAR_TXX__ -#include "Interpolation.hxx" #include "InterpolationPlanar.hxx" + +#include "Interpolation.txx" #include "InterpolationOptions.hxx" #include "NormalizedUnstructuredMesh.hxx" #include "InterpolationUtils.hxx" -#include "PlanarIntersector.hxx" + #include "PlanarIntersectorP0P0.hxx" #include "PlanarIntersectorP1P0.hxx" #include "PlanarIntersectorP0P1.hxx" -#include "PlanarIntersectorP0P1PL.hxx" -#include "PlanarIntersectorP1P0PL.hxx" #include "PlanarIntersectorP1P1.hxx" -#include "PlanarIntersectorP1P1PL.hxx" #include "PlanarIntersectorP0P1Bary.hxx" #include "PlanarIntersectorP1P0Bary.hxx" -#include "MappedBarycentric2DIntersectorP1P1.hxx" -#include "ConvexIntersector.hxx" -#include "PointLocator2DIntersector.hxx" -#include "Geometric2DIntersector.hxx" -#include "TriangulationIntersector.hxx" + +#include "PlanarIntersector.txx" +#include "TriangulationIntersector.txx" +#include "ConvexIntersector.txx" +#include "Geometric2DIntersector.txx" +#include "PointLocator2DIntersector.txx" +#include "PlanarIntersectorP0P1PL.txx" +#include "PlanarIntersectorP1P0PL.txx" +#include "PlanarIntersectorP1P1PL.txx" +#include "MappedBarycentric2DIntersectorP1P1.txx" #include "VectorUtils.hxx" #include "BBTree.txx" diff --git a/src/INTERP_KERNEL/LinearAlgebra/InterpKernelDenseMatrix.cxx b/src/INTERP_KERNEL/LinearAlgebra/InterpKernelDenseMatrix.cxx index bbb3d0732..e0c8f7414 100644 --- a/src/INTERP_KERNEL/LinearAlgebra/InterpKernelDenseMatrix.cxx +++ b/src/INTERP_KERNEL/LinearAlgebra/InterpKernelDenseMatrix.cxx @@ -18,6 +18,6 @@ // #include "INTERPKERNELDefines.hxx" -#include "InterpKernelDenseMatrix.hxx" +#include "InterpKernelDenseMatrix.txx" template class INTERPKERNEL_EXPORT INTERP_KERNEL::DenseMatrixT; diff --git a/src/INTERP_KERNEL/MappedBarycentric3DIntersectorP1P1.hxx b/src/INTERP_KERNEL/MappedBarycentric3DIntersectorP1P1.hxx index 41f18e55b..9fb9a02ff 100644 --- a/src/INTERP_KERNEL/MappedBarycentric3DIntersectorP1P1.hxx +++ b/src/INTERP_KERNEL/MappedBarycentric3DIntersectorP1P1.hxx @@ -33,7 +33,7 @@ namespace INTERP_KERNEL public: static const int SPACEDIM=MyMeshType::MY_SPACEDIM; static const int MESHDIM=MyMeshType::MY_MESHDIM; - using ConnType = typename MyMeshType::MyConnType; + typedef typename MyMeshType::MyConnType ConnType; static const NumberingPolicy numPol=MyMeshType::My_numPol; public: MappedBarycentric3DIntersectorP1P1(const MyMeshType& targetMesh, const MyMeshType& srcMesh, double precision); diff --git a/src/INTERP_KERNEL/MappedBarycentric3DIntersectorP1P1.txx b/src/INTERP_KERNEL/MappedBarycentric3DIntersectorP1P1.txx index 9ed167352..99a6bef68 100644 --- a/src/INTERP_KERNEL/MappedBarycentric3DIntersectorP1P1.txx +++ b/src/INTERP_KERNEL/MappedBarycentric3DIntersectorP1P1.txx @@ -21,7 +21,7 @@ #ifndef __MAPPEDBARYCENTRIC3DINTERSECTORP1P1_TXX__ #define __MAPPEDBARYCENTRIC3DINTERSECTORP1P1_TXX__ -#include "Intersector3DP1P1.hxx" +#include "Intersector3DP1P1.txx" #include "InterpolationUtils.hxx" #include "InterpKernelUtilities.hxx" #include "MappedBarycentric3DIntersectorP1P1.hxx" diff --git a/src/INTERP_KERNEL/Planar2D1DIntersectorP0P0.hxx b/src/INTERP_KERNEL/Planar2D1DIntersectorP0P0.hxx index d760567e0..5a59eea4e 100644 --- a/src/INTERP_KERNEL/Planar2D1DIntersectorP0P0.hxx +++ b/src/INTERP_KERNEL/Planar2D1DIntersectorP0P0.hxx @@ -33,7 +33,7 @@ namespace INTERP_KERNEL public: static const int SPACEDIM=MyMeshType::MY_SPACEDIM; static const int MESHDIM=MyMeshType::MY_MESHDIM; - using ConnType = typename MyMeshType::MyConnType; + typedef typename MyMeshType::MyConnType ConnType; static const NumberingPolicy numPol=MyMeshType::My_numPol; protected: Planar2D1DIntersectorP0P0(const MyMeshType& meshT, const MyMeshType& meshS, diff --git a/src/INTERP_KERNEL/Planar2D1DIntersectorP0P0.txx b/src/INTERP_KERNEL/Planar2D1DIntersectorP0P0.txx index c4d10c034..df496b097 100644 --- a/src/INTERP_KERNEL/Planar2D1DIntersectorP0P0.txx +++ b/src/INTERP_KERNEL/Planar2D1DIntersectorP0P0.txx @@ -57,7 +57,7 @@ namespace INTERP_KERNEL { ConnType iS=*iter; ConnType nbNodesS=PlanarIntersector::_connIndexS[iS+1]-PlanarIntersector::_connIndexS[iS]; - bool const isColinear = false; + bool isColinear = false; double surf=intersectGeometry1D(OTT::indFC(icellT),OTT::indFC(iS), nbNodesT,nbNodesS, isColinear); surf=PlanarIntersector::getValueRegardingOption(surf); diff --git a/src/INTERP_KERNEL/PlanarIntersector.hxx b/src/INTERP_KERNEL/PlanarIntersector.hxx index c72ed4f6d..6cc8670c3 100644 --- a/src/INTERP_KERNEL/PlanarIntersector.hxx +++ b/src/INTERP_KERNEL/PlanarIntersector.hxx @@ -21,7 +21,7 @@ #ifndef __PLANARINTERSECTOR_HXX__ #define __PLANARINTERSECTOR_HXX__ -#include "TargetIntersector.hxx" +#include "TargetIntersector.txx" #include "NormalizedUnstructuredMesh.hxx" #include @@ -39,9 +39,9 @@ namespace INTERP_KERNEL public: static const int SPACEDIM=MyMeshType::MY_SPACEDIM; static const int MESHDIM=MyMeshType::MY_MESHDIM; - using ConnType = typename MyMeshType::MyConnType; + typedef typename MyMeshType::MyConnType ConnType; static const NumberingPolicy numPol=MyMeshType::My_numPol; - using DuplicateFacesType = typename std::map>; + typedef typename std::map > DuplicateFacesType; public: PlanarIntersector(const MyMeshType& meshT, const MyMeshType& meshS, double dimCaracteristic, double precision, double md3DSurf, double minDot3DSurf, double medianPlane, bool doRotate, int orientation, int printLevel); virtual ~PlanarIntersector(); diff --git a/src/INTERP_KERNEL/PlanarIntersectorP0P1.txx b/src/INTERP_KERNEL/PlanarIntersectorP0P1.txx index 4eaf8eb25..66b6ca228 100644 --- a/src/INTERP_KERNEL/PlanarIntersectorP0P1.txx +++ b/src/INTERP_KERNEL/PlanarIntersectorP0P1.txx @@ -20,7 +20,7 @@ #ifndef __PLANARINTERSECTORP0P1_TXX__ #define __PLANARINTERSECTORP0P1_TXX__ -#include "PlanarIntersector.hxx" +#include "PlanarIntersector.txx" #include "InterpKernelUtilities.hxx" #include "NormalizedGeometricTypes" #include "PlanarIntersectorP0P1.hxx" diff --git a/src/INTERP_KERNEL/PlanarIntersectorP0P1Bary.hxx b/src/INTERP_KERNEL/PlanarIntersectorP0P1Bary.hxx index acbd6d4f6..e79924ef0 100644 --- a/src/INTERP_KERNEL/PlanarIntersectorP0P1Bary.hxx +++ b/src/INTERP_KERNEL/PlanarIntersectorP0P1Bary.hxx @@ -33,7 +33,7 @@ namespace INTERP_KERNEL public: static const int SPACEDIM=MyMeshType::MY_SPACEDIM; static const int MESHDIM=MyMeshType::MY_MESHDIM; - using ConnType = typename MyMeshType::MyConnType; + typedef typename MyMeshType::MyConnType ConnType; static const NumberingPolicy numPol=MyMeshType::My_numPol; protected: PlanarIntersectorP0P1Bary(const MyMeshType& meshT, const MyMeshType& meshS, double dimCaracteristic, double precision, double md3DSurf, double minDot3DSurf, double medianPlane, bool doRotate, int orientation, int printLevel); diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P0.hxx b/src/INTERP_KERNEL/PlanarIntersectorP1P0.hxx index 00e306dea..4b64bee3c 100644 --- a/src/INTERP_KERNEL/PlanarIntersectorP1P0.hxx +++ b/src/INTERP_KERNEL/PlanarIntersectorP1P0.hxx @@ -33,7 +33,7 @@ namespace INTERP_KERNEL public: static const int SPACEDIM=MyMeshType::MY_SPACEDIM; static const int MESHDIM=MyMeshType::MY_MESHDIM; - using ConnType = typename MyMeshType::MyConnType; + typedef typename MyMeshType::MyConnType ConnType; static const NumberingPolicy numPol=MyMeshType::My_numPol; protected: PlanarIntersectorP1P0(const MyMeshType& meshT, const MyMeshType& meshS, double dimCaracteristic, double precision, double md3DSurf, double minDot3DSurf, double medianPlane, bool doRotate, int orientation, int printLevel); diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P0.txx b/src/INTERP_KERNEL/PlanarIntersectorP1P0.txx index f203e0e0c..3bf8cb26d 100644 --- a/src/INTERP_KERNEL/PlanarIntersectorP1P0.txx +++ b/src/INTERP_KERNEL/PlanarIntersectorP1P0.txx @@ -21,7 +21,7 @@ #define __PLANARINTERSECTORP1P0_TXX__ #include "NormalizedGeometricTypes" -#include "PlanarIntersector.hxx" +#include "PlanarIntersector.txx" #include "PlanarIntersectorP1P0.hxx" #include "InterpolationUtils.hxx" #include "CellModel.hxx" diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P0PL.txx b/src/INTERP_KERNEL/PlanarIntersectorP1P0PL.txx index fd2391edf..054949e55 100644 --- a/src/INTERP_KERNEL/PlanarIntersectorP1P0PL.txx +++ b/src/INTERP_KERNEL/PlanarIntersectorP1P0PL.txx @@ -20,10 +20,11 @@ #ifndef __PLANARINTERSECTORP1P0PL_TXX__ #define __PLANARINTERSECTORP1P0PL_TXX__ -#include "PlanarIntersector.hxx" +#include "PlanarIntersector.txx" #include "InterpolationUtils.hxx" #include "NormalizedGeometricTypes" #include "PlanarIntersectorP1P0PL.hxx" +#include "VolSurfFormulae.hxx" #include "PointLocatorAlgos.txx" #include diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P1.hxx b/src/INTERP_KERNEL/PlanarIntersectorP1P1.hxx index 294de6d42..d7b4834fc 100644 --- a/src/INTERP_KERNEL/PlanarIntersectorP1P1.hxx +++ b/src/INTERP_KERNEL/PlanarIntersectorP1P1.hxx @@ -33,7 +33,7 @@ namespace INTERP_KERNEL public: static const int SPACEDIM=MyMeshType::MY_SPACEDIM; static const int MESHDIM=MyMeshType::MY_MESHDIM; - using ConnType = typename MyMeshType::MyConnType; + typedef typename MyMeshType::MyConnType ConnType; static const NumberingPolicy numPol=MyMeshType::My_numPol; protected: PlanarIntersectorP1P1(const MyMeshType& meshT, const MyMeshType& meshS, double dimCaracteristic, double precision, double md3DSurf, double minDot3DSurf, double medianPlane, bool doRotate, int orientation, int printLevel); diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P1.txx b/src/INTERP_KERNEL/PlanarIntersectorP1P1.txx index 6c2866054..a9c11974a 100644 --- a/src/INTERP_KERNEL/PlanarIntersectorP1P1.txx +++ b/src/INTERP_KERNEL/PlanarIntersectorP1P1.txx @@ -20,7 +20,7 @@ #ifndef __PLANARINTERSECTORP1P1_TXX__ #define __PLANARINTERSECTORP1P1_TXX__ -#include "PlanarIntersector.hxx" +#include "PlanarIntersector.txx" #include "PlanarIntersectorP1P1.hxx" #include "InterpolationUtils.hxx" #include diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.hxx b/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.hxx index 394d855b6..1609a1bd5 100644 --- a/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.hxx +++ b/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.hxx @@ -33,7 +33,7 @@ namespace INTERP_KERNEL public: static const int SPACEDIM=MyMeshType::MY_SPACEDIM; static const int MESHDIM=MyMeshType::MY_MESHDIM; - using ConnType = typename MyMeshType::MyConnType; + typedef typename MyMeshType::MyConnType ConnType; static const NumberingPolicy numPol=MyMeshType::My_numPol; public: PlanarIntersectorP1P1PL(const MyMeshType& meshT, const MyMeshType& meshS, double dimCaracteristic, double md3DSurf, double minDot3DSurf, double medianPlane, double precision, int orientation); diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.txx b/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.txx index 161ccbb4a..7cbb512af 100644 --- a/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.txx +++ b/src/INTERP_KERNEL/PlanarIntersectorP1P1PL.txx @@ -20,7 +20,7 @@ #ifndef __PLANARINTERSECTORP1P1PL_TXX__ #define __PLANARINTERSECTORP1P1PL_TXX__ -#include "PlanarIntersector.hxx" +#include "PlanarIntersector.txx" #include "InterpolationUtils.hxx" #include "NormalizedGeometricTypes" #include "PlanarIntersectorP1P1PL.hxx" diff --git a/src/INTERP_KERNEL/PointLocator2DIntersector.hxx b/src/INTERP_KERNEL/PointLocator2DIntersector.hxx index 2bc8bcee6..ba3f44431 100644 --- a/src/INTERP_KERNEL/PointLocator2DIntersector.hxx +++ b/src/INTERP_KERNEL/PointLocator2DIntersector.hxx @@ -35,7 +35,7 @@ namespace INTERP_KERNEL public: static const int SPACEDIM=MyMeshType::MY_SPACEDIM; static const int MESHDIM=MyMeshType::MY_MESHDIM; - using ConnType = typename MyMeshType::MyConnType; + typedef typename MyMeshType::MyConnType ConnType; static const NumberingPolicy numPol=MyMeshType::My_numPol; public: PointLocator2DIntersector(const MyMeshType& meshT, const MyMeshType& meshS, diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.hxx b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.hxx index 2e8a6cdae..e4cd815cd 100644 --- a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.hxx +++ b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.hxx @@ -33,7 +33,7 @@ namespace INTERP_KERNEL public: static const int SPACEDIM=MyMeshType::MY_SPACEDIM; static const int MESHDIM=MyMeshType::MY_MESHDIM; - using ConnType = typename MyMeshType::MyConnType; + typedef typename MyMeshType::MyConnType ConnType; static const NumberingPolicy numPol=MyMeshType::My_numPol; public: PointLocator3DIntersectorP0P0(const MyMeshType& targetMesh, const MyMeshType& srcMesh, double precision); diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.txx b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.txx index 8c3f64cbb..736cd0923 100644 --- a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.txx +++ b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.txx @@ -20,12 +20,13 @@ #ifndef __POINTLOCATOR3DINTERSECTORP0P0_TXX__ #define __POINTLOCATOR3DINTERSECTORP0P0_TXX__ -#include "Intersector3DP0P0.hxx" +#include "Intersector3DP0P0.txx" #include "InterpolationUtils.hxx" #include "InterpKernelUtilities.hxx" #include "NormalizedGeometricTypes" #include "CellModel.hxx" #include "PointLocator3DIntersectorP0P0.hxx" +#include "VolSurfFormulae.hxx" #include "PointLocatorAlgos.txx" #include diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.hxx b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.hxx index c81b6dff4..b98ff5e1a 100644 --- a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.hxx +++ b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.hxx @@ -33,7 +33,7 @@ namespace INTERP_KERNEL public: static const int SPACEDIM=MyMeshType::MY_SPACEDIM; static const int MESHDIM=MyMeshType::MY_MESHDIM; - using ConnType = typename MyMeshType::MyConnType; + typedef typename MyMeshType::MyConnType ConnType; static const NumberingPolicy numPol=MyMeshType::My_numPol; public: PointLocator3DIntersectorP0P1(const MyMeshType& targetMesh, const MyMeshType& srcMesh, double precision); diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.txx b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.txx index e34a1bdec..eeb577186 100644 --- a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.txx +++ b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.txx @@ -20,7 +20,7 @@ #ifndef __POINTLOCATOR3DINTERSECTORP0P1_TXX__ #define __POINTLOCATOR3DINTERSECTORP0P1_TXX__ -#include "Intersector3DP0P1.hxx" +#include "Intersector3DP0P1.txx" #include "InterpolationUtils.hxx" #include "InterpKernelUtilities.hxx" #include "NormalizedGeometricTypes" diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP1P0.txx b/src/INTERP_KERNEL/PointLocator3DIntersectorP1P0.txx index c2946e3e4..58253b1be 100644 --- a/src/INTERP_KERNEL/PointLocator3DIntersectorP1P0.txx +++ b/src/INTERP_KERNEL/PointLocator3DIntersectorP1P0.txx @@ -20,13 +20,14 @@ #ifndef __POINTLOCATOR3DINTERSECTORP1P0_TXX__ #define __POINTLOCATOR3DINTERSECTORP1P0_TXX__ -#include "Intersector3DP1P0.hxx" +#include "Intersector3DP1P0.txx" #include "InterpolationUtils.hxx" #include "InterpKernelUtilities.hxx" #include "NormalizedGeometricTypes" #include "PointLocator3DIntersectorP1P0.hxx" #include "CellModel.hxx" #include "PointLocatorAlgos.txx" +#include "VolSurfFormulae.hxx" #include #include diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.txx b/src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.txx index 3bc6f6234..8f8a8cba1 100644 --- a/src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.txx +++ b/src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.txx @@ -20,7 +20,7 @@ #ifndef __POINTLOCATOR3DINTERSECTORP1P1_TXX__ #define __POINTLOCATOR3DINTERSECTORP1P1_TXX__ -#include "Intersector3DP1P1.hxx" +#include "Intersector3DP1P1.txx" #include "InterpolationUtils.hxx" #include "InterpKernelUtilities.hxx" #include "NormalizedGeometricTypes" diff --git a/src/INTERP_KERNEL/Polyhedron3D2DIntersectorP0P0.txx b/src/INTERP_KERNEL/Polyhedron3D2DIntersectorP0P0.txx index b037923c4..2c4b4b556 100644 --- a/src/INTERP_KERNEL/Polyhedron3D2DIntersectorP0P0.txx +++ b/src/INTERP_KERNEL/Polyhedron3D2DIntersectorP0P0.txx @@ -20,7 +20,7 @@ #define __POLYHEDRON3D2DINTERSECTORP0P0_TXX__ #include "NormalizedGeometricTypes" -#include "Intersector3DP0P0.hxx" +#include "Intersector3DP0P0.txx" #include "Intersector3D.hxx" #include "InterpolationUtils.hxx" #include "CellModel.hxx" @@ -28,7 +28,7 @@ #include "Polyhedron3D2DIntersectorP0P0.hxx" #include "MeshUtils.hxx" #include -#include "SplitterTetra.hxx" +#include "SplitterTetra.txx" #include diff --git a/src/INTERP_KERNEL/PolyhedronIntersectorP0P0.txx b/src/INTERP_KERNEL/PolyhedronIntersectorP0P0.txx index 0baa9ab74..8ab82512a 100644 --- a/src/INTERP_KERNEL/PolyhedronIntersectorP0P0.txx +++ b/src/INTERP_KERNEL/PolyhedronIntersectorP0P0.txx @@ -20,13 +20,14 @@ #ifndef __POLYHEDRONINTERSECTORP0P0_TXX__ #define __POLYHEDRONINTERSECTORP0P0_TXX__ -#include "NormalizedGeometricTypes" -#include "Intersector3DP0P0.hxx" -#include "InterpolationUtils.hxx" #include "PolyhedronIntersectorP0P0.hxx" + #include -#include "SplitterTetra.hxx" +#include "NormalizedGeometricTypes" +#include "Intersector3DP0P0.txx" +#include "InterpolationUtils.hxx" +#include "SplitterTetra.txx" namespace INTERP_KERNEL { diff --git a/src/INTERP_KERNEL/PolyhedronIntersectorP0P1.hxx b/src/INTERP_KERNEL/PolyhedronIntersectorP0P1.hxx index fde4daa85..2734090e7 100644 --- a/src/INTERP_KERNEL/PolyhedronIntersectorP0P1.hxx +++ b/src/INTERP_KERNEL/PolyhedronIntersectorP0P1.hxx @@ -41,7 +41,7 @@ namespace INTERP_KERNEL public: static const int SPACEDIM=MyMeshType::MY_SPACEDIM; static const int MESHDIM=MyMeshType::MY_MESHDIM; - using ConnType = typename MyMeshType::MyConnType; + typedef typename MyMeshType::MyConnType ConnType; static const NumberingPolicy numPol=MyMeshType::My_numPol; public: diff --git a/src/INTERP_KERNEL/PolyhedronIntersectorP0P1.txx b/src/INTERP_KERNEL/PolyhedronIntersectorP0P1.txx index 9b5cc4acd..f0c8106ee 100644 --- a/src/INTERP_KERNEL/PolyhedronIntersectorP0P1.txx +++ b/src/INTERP_KERNEL/PolyhedronIntersectorP0P1.txx @@ -21,7 +21,7 @@ #define __POLYHEDRONINTERSECTORP0P1_TXX__ #include "NormalizedGeometricTypes" -#include "Intersector3DP0P1.hxx" +#include "Intersector3DP0P1.txx" #include "InterpolationUtils.hxx" #include "PolyhedronIntersectorP0P1.hxx" diff --git a/src/INTERP_KERNEL/PolyhedronIntersectorP1P0.txx b/src/INTERP_KERNEL/PolyhedronIntersectorP1P0.txx index 329ad9c98..f51bccf04 100644 --- a/src/INTERP_KERNEL/PolyhedronIntersectorP1P0.txx +++ b/src/INTERP_KERNEL/PolyhedronIntersectorP1P0.txx @@ -21,13 +21,13 @@ #define __POLYHEDRONINTERSECTORP1P0_TXX__ #include "NormalizedGeometricTypes" -#include "Intersector3DP1P0.hxx" +#include "Intersector3DP1P0.txx" #include "InterpKernelException.hxx" #include "InterpolationUtils.hxx" -#include "Intersector3D.hxx" +#include "Intersector3D.txx" #include "PolyhedronIntersectorP1P0.hxx" -#include "SplitterTetra.hxx" +#include "SplitterTetra.txx" #include namespace INTERP_KERNEL diff --git a/src/INTERP_KERNEL/PolyhedronIntersectorP1P0Bary.txx b/src/INTERP_KERNEL/PolyhedronIntersectorP1P0Bary.txx index 556069396..03d55d5d3 100644 --- a/src/INTERP_KERNEL/PolyhedronIntersectorP1P0Bary.txx +++ b/src/INTERP_KERNEL/PolyhedronIntersectorP1P0Bary.txx @@ -21,13 +21,13 @@ #define __PolyhedronIntersectorP1P0Bary_TXX__ #include "NormalizedGeometricTypes" -#include "Intersector3DP1P0Bary.hxx" +#include "Intersector3DP1P0Bary.txx" #include "InterpolationUtils.hxx" -#include "Intersector3D.hxx" +#include "Intersector3D.txx" #include "PolyhedronIntersectorP1P0Bary.hxx" -#include "MeshUtils.hxx" +// #include "MeshUtils.hxx" -#include "SplitterTetra.hxx" +#include "SplitterTetra.txx" #include namespace INTERP_KERNEL diff --git a/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.txx b/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.txx index 31db1371a..b303c65e2 100644 --- a/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.txx +++ b/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.txx @@ -20,14 +20,15 @@ #ifndef __PolyhedronIntersectorP1P1_TXX__ #define __PolyhedronIntersectorP1P1_TXX__ +#include "PolyhedronIntersectorP1P1.hxx" + #include "NormalizedGeometricTypes" -#include "Intersector3DP1P1.hxx" +#include "Intersector3DP1P1.txx" #include "InterpolationUtils.hxx" -#include "Intersector3D.hxx" -#include "PolyhedronIntersectorP1P1.hxx" -#include "MeshUtils.hxx" +#include "Intersector3D.txx" +// #include "MeshUtils.hxx" -#include "SplitterTetra.hxx" +#include "SplitterTetra.txx" #include #include diff --git a/src/INTERP_KERNEL/SplitterTetra.txx b/src/INTERP_KERNEL/SplitterTetra.txx index 26a60bae9..ed9901e3e 100644 --- a/src/INTERP_KERNEL/SplitterTetra.txx +++ b/src/INTERP_KERNEL/SplitterTetra.txx @@ -199,7 +199,7 @@ namespace INTERP_KERNEL const CellModel& cellModelCell=CellModel::GetCellModel(normCellType); ConnType nbOfNodes4Type=cellModelCell.isDynamic() ? _src_mesh.getNumberOfNodesOfElement(OTT::indFC(element)) : cellModelCell.getNumberOfNodes(); // halfspace filtering - bool const isOutside[8] = {true, true, true, true, true, true, true, true}; + bool isOutside[8] = {true, true, true, true, true, true, true, true}; bool isTargetOutside = false; // calculate the coordinates of the nodes @@ -609,8 +609,8 @@ namespace INTERP_KERNEL } // halfspace filtering - bool const isOutside[8] = {true, true, true, true, true, true, true, true}; - bool const isStrictlyOutside[8] = {true, true, true, true, true, true, true, true}; + bool isOutside[8] = {true, true, true, true, true, true, true, true}; + bool isStrictlyOutside[8] = {true, true, true, true, true, true, true, true}; bool isTargetStrictlyOutside = false; bool isTargetOutside = false; diff --git a/src/INTERP_KERNELTest/InterpolationOptionsTest.cxx b/src/INTERP_KERNELTest/InterpolationOptionsTest.cxx index 583b6c776..9bcceed07 100644 --- a/src/INTERP_KERNELTest/InterpolationOptionsTest.cxx +++ b/src/INTERP_KERNELTest/InterpolationOptionsTest.cxx @@ -20,7 +20,7 @@ #include "MEDCouplingUMesh.hxx" #include "MEDCouplingRefCountObject.hxx" #include "MEDCouplingMemArray.hxx" -#include "MEDCouplingNormalizedUnstructuredMesh.hxx" +#include "MEDCouplingNormalizedUnstructuredMesh.txx" #include "Interpolation2D.hxx" #include "MEDFileMesh.hxx" #include "MEDCouplingFieldDouble.hxx" diff --git a/src/INTERP_KERNELTest/MeshTestToolkit.txx b/src/INTERP_KERNELTest/MeshTestToolkit.txx index 87823536c..4ccd830b6 100644 --- a/src/INTERP_KERNELTest/MeshTestToolkit.txx +++ b/src/INTERP_KERNELTest/MeshTestToolkit.txx @@ -16,22 +16,22 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // +#ifndef __MESHTESTTOOLKI_TXX__ +#define __MESHTESTTOOLKI_TXX__ -#ifdef __MESH_TOOLKIT__ -#define __MESH_TOOLKIT__ +#include "MeshTestToolkit.hxx" #include "MCAuto.hxx" #include "MCIdType.hxx" #include "Interpolation2D.hxx" -#include "MeshTestToolkit.hxx" - #include "MEDFileMesh.hxx" -#include "MEDCouplingNormalizedUnstructuredMesh.hxx" +#include "MEDCouplingNormalizedUnstructuredMesh.txx" #include "MEDCouplingFieldDouble.hxx" #include "Interpolation3DSurf.hxx" +#include "Interpolation2D.txx" #include "Interpolation3D.txx" #include "TestInterpKernelUtils.hxx" @@ -74,11 +74,11 @@ namespace INTERP_TEST double MeshTestToolkit::sumRow(const IntersectionMatrix& m, int i) const { double vol = 0.0; - for(IntersectionMatrix::const_iterator iter = m.begin() ; iter != m.end() ; ++iter) + for(const auto & iter : m) { - if(iter->count(i) != 0.0) + if(iter.count(i) != 0.0) { - auto iter2 = iter->find(i); + auto iter2 = iter.find(i); vol += fabs(iter2->second); } } @@ -129,11 +129,11 @@ namespace INTERP_TEST double MeshTestToolkit::sumVolume(const IntersectionMatrix& m) const { std::vector volumes; - for(IntersectionMatrix::const_iterator iter = m.begin() ; iter != m.end() ; ++iter) + for(const auto & iter : m) { - for(auto iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) + for(const auto & iter2 : iter) { - volumes.push_back(fabs(iter2->second)); + volumes.push_back(fabs(iter2.second)); } } diff --git a/src/INTERP_KERNELTest/PerfTest.cxx b/src/INTERP_KERNELTest/PerfTest.cxx index 8bb76bcb6..a6868ec8f 100644 --- a/src/INTERP_KERNELTest/PerfTest.cxx +++ b/src/INTERP_KERNELTest/PerfTest.cxx @@ -27,7 +27,7 @@ #include "Log.hxx" #include "VectorUtils.hxx" -#include "MEDCouplingNormalizedUnstructuredMesh.hxx" +#include "MEDCouplingNormalizedUnstructuredMesh.txx" #include #include diff --git a/src/INTERP_KERNELTest/SingleElementPlanarTests.cxx b/src/INTERP_KERNELTest/SingleElementPlanarTests.cxx index d09388eb5..51b6ea90f 100644 --- a/src/INTERP_KERNELTest/SingleElementPlanarTests.cxx +++ b/src/INTERP_KERNELTest/SingleElementPlanarTests.cxx @@ -19,7 +19,7 @@ #include "SingleElementPlanarTests.hxx" #include "InterpolationUtils.hxx" -#include "PolygonAlgorithms.hxx" +#include "PolygonAlgorithms.txx" #include #include #include diff --git a/src/INTERP_KERNELTest/ThreeDSurfProjectionTest.cxx b/src/INTERP_KERNELTest/ThreeDSurfProjectionTest.cxx index 35f457bb0..c895da529 100644 --- a/src/INTERP_KERNELTest/ThreeDSurfProjectionTest.cxx +++ b/src/INTERP_KERNELTest/ThreeDSurfProjectionTest.cxx @@ -19,7 +19,7 @@ #include "ThreeDSurfProjectionTest.hxx" #include "NormalizedUnstructuredMesh.hxx" -#include "PlanarIntersector.hxx" +#include "PlanarIntersector.txx" #include "MCIdType.hxx" #include #include @@ -30,7 +30,7 @@ public: static const int MY_SPACEDIM=3; static const int MY_MESHDIM=3; static const INTERP_KERNEL::NumberingPolicy My_numPol=INTERP_KERNEL::ALL_C_MODE; - using MyConnType = mcIdType; + typedef mcIdType MyConnType; }; class MyMatrixType diff --git a/src/INTERP_KERNELTest/UnitTetra3D2DIntersectionTest.cxx b/src/INTERP_KERNELTest/UnitTetra3D2DIntersectionTest.cxx index f2f8d2bcd..8f7294914 100644 --- a/src/INTERP_KERNELTest/UnitTetra3D2DIntersectionTest.cxx +++ b/src/INTERP_KERNELTest/UnitTetra3D2DIntersectionTest.cxx @@ -19,7 +19,7 @@ #include "UnitTetra3D2DIntersectionTest.hxx" -#include "SplitterTetra.hxx" +#include "SplitterTetra.txx" #include "NormalizedGeometricTypes" #include "MCIdType.hxx" diff --git a/src/INTERP_KERNELTest/UnitTetraIntersectionBaryTest.cxx b/src/INTERP_KERNELTest/UnitTetraIntersectionBaryTest.cxx index 935e870d2..308c3167e 100644 --- a/src/INTERP_KERNELTest/UnitTetraIntersectionBaryTest.cxx +++ b/src/INTERP_KERNELTest/UnitTetraIntersectionBaryTest.cxx @@ -24,7 +24,7 @@ #include "UnitTetraIntersectionBaryTest.hxx" #include "TransformedTriangle.hxx" -#include "SplitterTetra.hxx" +#include "SplitterTetra.txx" #include "InterpKernelException.hxx" #include "UnitTetraIntersectionBary.hxx" #include "TetraAffineTransform.hxx" diff --git a/src/MEDCoupling/MEDCoupling1GTUMesh.cxx b/src/MEDCoupling/MEDCoupling1GTUMesh.cxx index b9ce0a176..e289edb91 100644 --- a/src/MEDCoupling/MEDCoupling1GTUMesh.cxx +++ b/src/MEDCoupling/MEDCoupling1GTUMesh.cxx @@ -20,7 +20,7 @@ #include "CellModel.hxx" #include "MEDCouplingPointSet.hxx" -#include "MEDCoupling1GTUMesh.hxx" +#include "MEDCoupling1GTUMesh.txx" #include "MCAuto.hxx" #include "MCIdType.hxx" #include "MCType.hxx" @@ -35,7 +35,7 @@ #include "MEDCouplingCMesh.hxx" #include "NormalizedGeometricTypes" -#include "SplitterTetra.hxx" +#include "SplitterTetra.txx" #include "DiameterCalculator.hxx" #include "OrientationInverter.hxx" #include "InterpKernelAutoPtr.hxx" diff --git a/src/MEDCoupling/MEDCouplingFieldDiscretizationOnNodesFE.cxx b/src/MEDCoupling/MEDCouplingFieldDiscretizationOnNodesFE.cxx index b5674b3f7..89fbd91cd 100644 --- a/src/MEDCoupling/MEDCouplingFieldDiscretizationOnNodesFE.cxx +++ b/src/MEDCoupling/MEDCouplingFieldDiscretizationOnNodesFE.cxx @@ -26,7 +26,7 @@ #include "MEDCouplingGaussLocalization.hxx" #include "MEDCouplingMemArray.hxx" #include "MCType.hxx" -#include "MEDCouplingNormalizedUnstructuredMesh.hxx" +#include "MEDCouplingNormalizedUnstructuredMesh.txx" #include "BBTreeStandAlone.txx" #include "InterpKernelException.hxx" #include "InterpKernelDenseMatrix.hxx" diff --git a/src/MEDCoupling/MEDCouplingFieldDouble.cxx b/src/MEDCoupling/MEDCouplingFieldDouble.cxx index 7dd4fd9db..18f246d45 100644 --- a/src/MEDCoupling/MEDCouplingFieldDouble.cxx +++ b/src/MEDCoupling/MEDCouplingFieldDouble.cxx @@ -19,7 +19,7 @@ // Author : Anthony Geay (EDF R&D) #include "MEDCouplingFieldDouble.hxx" -#include "MEDCouplingFieldT.hxx" +#include "MEDCouplingFieldT.txx" #include "MCAuto.hxx" #include "MCType.hxx" #include "MEDCouplingField.hxx" diff --git a/src/MEDCoupling/MEDCouplingFieldFloat.cxx b/src/MEDCoupling/MEDCouplingFieldFloat.cxx index 3b5ea9a7a..0702daff5 100644 --- a/src/MEDCoupling/MEDCouplingFieldFloat.cxx +++ b/src/MEDCoupling/MEDCouplingFieldFloat.cxx @@ -19,7 +19,7 @@ // Author : Anthony GEAY (EDF R&D) #include "MEDCouplingFieldFloat.hxx" -#include "MEDCouplingFieldT.hxx" +#include "MEDCouplingFieldT.txx" #include "MEDCouplingFieldDiscretization.hxx" #include "MCAuto.hxx" #include "MCType.hxx" diff --git a/src/MEDCoupling/MEDCouplingFieldInt32.cxx b/src/MEDCoupling/MEDCouplingFieldInt32.cxx index 0342cceae..363a25636 100644 --- a/src/MEDCoupling/MEDCouplingFieldInt32.cxx +++ b/src/MEDCoupling/MEDCouplingFieldInt32.cxx @@ -23,7 +23,7 @@ #include "MEDCouplingFieldDiscretization.hxx" #include "MCAuto.hxx" #include "MEDCouplingFieldInt64.hxx" -#include "MEDCouplingFieldT.hxx" +#include "MEDCouplingFieldT.txx" #include "MEDCouplingFieldDouble.hxx" #include "MEDCouplingFieldFloat.hxx" #include "MEDCouplingFieldTemplate.hxx" @@ -105,4 +105,4 @@ MEDCouplingFieldInt64 *MEDCouplingFieldInt32::convertToInt64Field() const MEDCouplingFieldFloat *MEDCouplingFieldInt32::convertToFloatField() const { return ConvertToUField(this); -} \ No newline at end of file +} diff --git a/src/MEDCoupling/MEDCouplingFieldInt64.cxx b/src/MEDCoupling/MEDCouplingFieldInt64.cxx index 4c44e0c68..96f086008 100644 --- a/src/MEDCoupling/MEDCouplingFieldInt64.cxx +++ b/src/MEDCoupling/MEDCouplingFieldInt64.cxx @@ -19,7 +19,7 @@ // Author : Anthony Geay (EDF R&D) #include "MEDCouplingFieldInt64.hxx" -#include "MEDCouplingFieldT.hxx" +#include "MEDCouplingFieldT.txx" #include "MCType.hxx" #include "MEDCouplingFieldDiscretization.hxx" #include "MCAuto.hxx" diff --git a/src/MEDCoupling/MEDCouplingIMesh.cxx b/src/MEDCoupling/MEDCouplingIMesh.cxx index cd781a447..7e4462c02 100644 --- a/src/MEDCoupling/MEDCouplingIMesh.cxx +++ b/src/MEDCoupling/MEDCouplingIMesh.cxx @@ -23,7 +23,7 @@ #include "MCAuto.hxx" #include "MCIdType.hxx" #include "MEDCouplingCMesh.hxx" -#include "MEDCouplingMemArray.hxx" +#include "MEDCouplingMemArray.txx" #include "MEDCouplingFieldDouble.hxx" #include "MEDCouplingStructuredMesh.hxx" #include "MEDCouplingMesh.hxx" diff --git a/src/MEDCoupling/MEDCouplingMap.cxx b/src/MEDCoupling/MEDCouplingMap.cxx index 7a9779b17..7ef340dbe 100644 --- a/src/MEDCoupling/MEDCouplingMap.cxx +++ b/src/MEDCoupling/MEDCouplingMap.cxx @@ -18,7 +18,7 @@ // // Author : Anthony Geay (EDF R&D) -#include "MEDCouplingMap.hxx" +#include "MEDCouplingMap.txx" #include "MCIdType.hxx" using namespace MEDCoupling; diff --git a/src/MEDCoupling/MEDCouplingMemArray.cxx b/src/MEDCoupling/MEDCouplingMemArray.cxx index 077cb32e1..c9d533df1 100644 --- a/src/MEDCoupling/MEDCouplingMemArray.cxx +++ b/src/MEDCoupling/MEDCouplingMemArray.cxx @@ -18,6 +18,7 @@ // // Author : Anthony Geay (EDF R&D) +#include "MEDCouplingMemArray.txx" #include "BBTree.txx" #include "BBTreePts.txx" @@ -26,13 +27,10 @@ #include "InterpKernelException.hxx" #include "InterpKernelExprParser.hxx" -#include "InterpKernelAutoPtr.hxx" #include "InterpKernelGeo2DEdgeArcCircle.hxx" -#include "InterpKernelAutoPtr.hxx" #include "InterpKernelGeo2DNode.hxx" #include "InterpKernelGeo2DEdgeLin.hxx" #include "MEDCoupling.hxx" -#include "MEDCouplingMemArray.hxx" #include "MCIdType.hxx" #include "MCType.hxx" #include "MEDCouplingRefCountObject.hxx" diff --git a/src/MEDCoupling/MEDCouplingMemArray.txx b/src/MEDCoupling/MEDCouplingMemArray.txx index 116817dc4..ab19802b7 100644 --- a/src/MEDCoupling/MEDCouplingMemArray.txx +++ b/src/MEDCoupling/MEDCouplingMemArray.txx @@ -22,7 +22,7 @@ #define __PARAMEDMEM_MEDCOUPLINGMEMARRAY_TXX__ #include "MCType.hxx" -#include "MEDCouplingMap.hxx" +#include "MEDCouplingMap.txx" #include "MEDCouplingMemArray.hxx" #include "MEDCouplingRefCountObject.hxx" #include "MEDCouplingTraits.hxx" diff --git a/src/MEDCoupling/MEDCouplingMemArrayChar.cxx b/src/MEDCoupling/MEDCouplingMemArrayChar.cxx index 524b8ef40..7415ff7a8 100644 --- a/src/MEDCoupling/MEDCouplingMemArrayChar.cxx +++ b/src/MEDCoupling/MEDCouplingMemArrayChar.cxx @@ -18,7 +18,7 @@ // // Author : Anthony Geay (CEA/DEN) -#include "MEDCouplingMemArray.hxx" +#include "MEDCouplingMemArray.txx" #include "MCIdType.hxx" #include "MCType.hxx" #include "MCAuto.hxx" diff --git a/src/MEDCoupling/MEDCouplingMemArrayFloat.cxx b/src/MEDCoupling/MEDCouplingMemArrayFloat.cxx index 505f5e070..6aa588162 100644 --- a/src/MEDCoupling/MEDCouplingMemArrayFloat.cxx +++ b/src/MEDCoupling/MEDCouplingMemArrayFloat.cxx @@ -18,7 +18,7 @@ // // Author : Anthony Geay (EDF R&D) -#include "MEDCouplingMemArray.hxx" +#include "MEDCouplingMemArray.txx" #include "MCType.hxx" #include #include diff --git a/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.txx b/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.txx index 62cbfc322..145406625 100644 --- a/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.txx +++ b/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.txx @@ -21,10 +21,10 @@ #ifndef __MEDCOUPLINGNORMALIZEDUNSTRUCTUREDMESH_TXX__ #define __MEDCOUPLINGNORMALIZEDUNSTRUCTUREDMESH_TXX__ -#include "MCIdType.hxx" #include "MEDCouplingNormalizedUnstructuredMesh.hxx" -#include "InterpKernelAssert.hxx" +#include "MCIdType.hxx" +#include "InterpKernelAssert.hxx" #include "MEDCouplingUMesh.hxx" #include "MEDCoupling1GTUMesh.hxx" #include "MEDCouplingMemArray.hxx" diff --git a/src/MEDCoupling/MEDCouplingPointSet.cxx b/src/MEDCoupling/MEDCouplingPointSet.cxx index da805d120..745be33d4 100644 --- a/src/MEDCoupling/MEDCouplingPointSet.cxx +++ b/src/MEDCoupling/MEDCouplingPointSet.cxx @@ -29,7 +29,7 @@ #include "MEDCouplingUMesh.hxx" #include "MEDCouplingMemArray.hxx" #include "NormalizedUnstructuredMesh.hxx" -#include "PlanarIntersector.hxx" +#include "PlanarIntersector.txx" #include "InterpKernelGeo2DQuadraticPolygon.hxx" #include "InterpKernelGeo2DNode.hxx" #include "DirectedBoundingBox.hxx" diff --git a/src/MEDCoupling/MEDCouplingRemapper.cxx b/src/MEDCoupling/MEDCouplingRemapper.cxx index 0191c231e..e9b24e662 100644 --- a/src/MEDCoupling/MEDCouplingRemapper.cxx +++ b/src/MEDCoupling/MEDCouplingRemapper.cxx @@ -19,7 +19,7 @@ // Author : Anthony Geay (CEA/DEN) #include "MEDCouplingRemapper.hxx" -#include "Interpolation.hxx" +#include "Interpolation.txx" #include "MCAuto.hxx" #include "InterpolationOptions.hxx" #include "MCType.hxx" @@ -42,7 +42,7 @@ #include "MEDCouplingMappedExtrudedMesh.hxx" #include "MEDCouplingCMesh.hxx" #include "MEDCouplingNatureOfFieldEnum" -#include "MEDCouplingNormalizedUnstructuredMesh.hxx" +#include "MEDCouplingNormalizedUnstructuredMesh.txx" #include "MEDCouplingNormalizedCartesianMesh.hxx" #include "MEDCouplingNormalizedCartesianMesh.txx" #include "MEDCouplingFieldDiscretizationOnNodesFE.hxx" diff --git a/src/MEDCoupling/MEDCouplingRemapper.hxx b/src/MEDCoupling/MEDCouplingRemapper.hxx index c53688e6e..564c387a9 100644 --- a/src/MEDCoupling/MEDCouplingRemapper.hxx +++ b/src/MEDCoupling/MEDCouplingRemapper.hxx @@ -42,13 +42,13 @@ namespace MEDCoupling namespace MEDCoupling { - using InterpolationMatrixPolicy = enum + typedef enum { IK_ONLY_PREFERED = 0, NOT_IK_ONLY_PREFERED = 1, IK_ONLY_FORCED = 2, NOT_IK_ONLY_FORCED =3 - }; + } InterpolationMatrixPolicy; class MEDCouplingRemapper : public TimeLabel, public INTERP_KERNEL::InterpolationOptions { diff --git a/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx b/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx index 49913aa60..ebeefe662 100644 --- a/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx +++ b/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx @@ -18,12 +18,13 @@ // // Author : Anthony Geay (CEA/DEN) +#include "MEDCouplingTimeDiscretization.txx" + #include "MCAuto.hxx" #include "MCIdType.hxx" #include "MCType.hxx" #include "MEDCouplingMemArray.hxx" #include "MEDCouplingMesh.hxx" -#include "MEDCouplingTimeDiscretization.hxx" #include "MEDCouplingRefCountObject.hxx" #include "MEDCouplingTimeLabel.hxx" diff --git a/src/MEDCoupling/MEDCouplingTimeDiscretization.txx b/src/MEDCoupling/MEDCouplingTimeDiscretization.txx index c0307fd5a..f48d9b772 100644 --- a/src/MEDCoupling/MEDCouplingTimeDiscretization.txx +++ b/src/MEDCoupling/MEDCouplingTimeDiscretization.txx @@ -26,7 +26,7 @@ #include "MEDCouplingTimeDiscretization.hxx" #include "MEDCouplingTraits.hxx" #include "InterpKernelException.hxx" -#include "MEDCouplingMemArray.hxx" +#include "MEDCouplingMemArray.txx" #include #include diff --git a/src/MEDCoupling/MEDCouplingUMesh.cxx b/src/MEDCoupling/MEDCouplingUMesh.cxx index 753a2f353..853a68b5c 100644 --- a/src/MEDCoupling/MEDCouplingUMesh.cxx +++ b/src/MEDCoupling/MEDCouplingUMesh.cxx @@ -30,10 +30,10 @@ #include "MEDCouplingPointSet.hxx" #include "MEDCouplingRefCountObject.hxx" #include "MEDCouplingMesh.hxx" -#include "MEDCouplingMemArray.hxx" +#include "MEDCouplingMemArray.txx" #include "MEDCouplingSkyLineArray.hxx" #include "CellModel.hxx" -#include "MEDCouplingUMesh.hxx" +#include "MEDCouplingUMesh.txx" #include "NormalizedGeometricTypes" #include "NormalizedUnstructuredMesh.hxx" #include "VolSurfFormulae.hxx" @@ -41,7 +41,7 @@ #include "VolSurfUser.txx" #include "InterpolationUtils.hxx" #include "BBTreeDst.txx" -#include "SplitterTetra.hxx" +#include "SplitterTetra.txx" #include "DirectedBoundingBox.hxx" #include "InterpKernelMatrixTools.hxx" #include "InterpKernelMeshQuality.hxx" diff --git a/src/MEDCoupling/MEDCouplingUMesh_internal.cxx b/src/MEDCoupling/MEDCouplingUMesh_internal.cxx index d7a800f30..d5a2096cc 100644 --- a/src/MEDCoupling/MEDCouplingUMesh_internal.cxx +++ b/src/MEDCoupling/MEDCouplingUMesh_internal.cxx @@ -30,7 +30,7 @@ #include "CellModel.hxx" #include "NormalizedGeometricTypes" #include "VolSurfUser.hxx" -#include "SplitterTetra.hxx" +#include "SplitterTetra.txx" #include "InterpKernelGeo2DEdgeArcCircle.hxx" #include "InterpKernelAutoPtr.hxx" #include "InterpKernelGeo2DNode.hxx" diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest0.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest0.cxx index 253ff88db..e20fd2fd6 100644 --- a/src/MEDCoupling/Test/MEDCouplingBasicsTest0.cxx +++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest0.cxx @@ -19,13 +19,14 @@ // Author : Anthony Geay (CEA/DEN) #include "MCType.hxx" -#include "Interpolation2D1D.hxx" +#include "Interpolation.txx" +#include "Interpolation2D1D.txx" #include "InterpolationOptions.hxx" #include "Log.hxx" -#include "Interpolation2D3D.hxx" +#include "Interpolation2D3D.txx" #include "MEDCouplingBasicsTest.hxx" #include "MEDCouplingRefCountObject.hxx" -#include "MEDCouplingNormalizedUnstructuredMesh.hxx" +#include "MEDCouplingNormalizedUnstructuredMesh.txx" #include "MEDCouplingUMesh.hxx" #include "MEDCouplingMappedExtrudedMesh.hxx" #include "MEDCouplingFieldDouble.hxx" diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx index 395bc3f91..14b4eea82 100644 --- a/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx +++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx @@ -19,7 +19,7 @@ // Author : Anthony Geay (CEA/DEN) #include "MEDCouplingBasicsTest1.hxx" -#include "MEDCouplingMemArray.hxx" +#include "MEDCouplingMemArray.txx" #include "MEDCouplingRefCountObject.hxx" #include "InterpKernelException.hxx" #include "MCAuto.hxx" diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest3.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest3.cxx index 9d9051cdf..1bb5c4a9d 100644 --- a/src/MEDCoupling/Test/MEDCouplingBasicsTest3.cxx +++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest3.cxx @@ -29,7 +29,7 @@ #include "MEDCouplingCMesh.hxx" #include "MEDCouplingMappedExtrudedMesh.hxx" #include "MEDCouplingFieldDouble.hxx" -#include "MEDCouplingMemArray.hxx" +#include "MEDCouplingMemArray.txx" #include "MEDCouplingGaussLocalization.hxx" #include "NormalizedGeometricTypes" diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx index fb42ab5fa..1d771b8cc 100644 --- a/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx +++ b/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx @@ -19,7 +19,7 @@ // Author : Anthony Geay (CEA/DEN) #include "MEDCouplingBasicsTestInterp.hxx" -#include "MEDCouplingNormalizedUnstructuredMesh.hxx" +#include "MEDCouplingNormalizedUnstructuredMesh.txx" #include "Interpolation2D.hxx" #include "InterpolationOptions.hxx" #include "MCType.hxx" diff --git a/src/MEDCoupling/Test/MEDCouplingExamplesTest.cxx b/src/MEDCoupling/Test/MEDCouplingExamplesTest.cxx index c539548fb..84930c509 100644 --- a/src/MEDCoupling/Test/MEDCouplingExamplesTest.cxx +++ b/src/MEDCoupling/Test/MEDCouplingExamplesTest.cxx @@ -29,7 +29,7 @@ #include "MEDCouplingCMesh.hxx" #include "MEDCouplingMappedExtrudedMesh.hxx" #include "MEDCouplingFieldDouble.hxx" -#include "MEDCouplingMemArray.hxx" +#include "MEDCouplingMemArray.txx" #include "MEDCouplingMultiFields.hxx" #include #include diff --git a/src/MEDCoupling/Test/TestMEDCoupling.cxx b/src/MEDCoupling/Test/TestMEDCoupling.cxx index 6584358e5..9a72bbbf4 100644 --- a/src/MEDCoupling/Test/TestMEDCoupling.cxx +++ b/src/MEDCoupling/Test/TestMEDCoupling.cxx @@ -33,3 +33,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION( MEDCoupling::MEDCouplingBasicsTest4 ); CPPUNIT_TEST_SUITE_REGISTRATION( MEDCoupling::MEDCouplingBasicsTest5 ); CPPUNIT_TEST_SUITE_REGISTRATION( MEDCoupling::MEDCouplingBasicsTestInterp ); +#include "BasicMainTest.hxx" diff --git a/src/MEDCoupling/Test/TestMEDCouplingRemapper.cxx b/src/MEDCoupling/Test/TestMEDCouplingRemapper.cxx index eaf56a899..c8154bca8 100644 --- a/src/MEDCoupling/Test/TestMEDCouplingRemapper.cxx +++ b/src/MEDCoupling/Test/TestMEDCouplingRemapper.cxx @@ -23,3 +23,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION( MEDCoupling::MEDCouplingRemapperTest ); +#include "BasicMainTest.hxx" diff --git a/src/MEDCoupling_Swig/MEDCouplingCommon.i b/src/MEDCoupling_Swig/MEDCouplingCommon.i index 7343254f6..1a9534a58 100644 --- a/src/MEDCoupling_Swig/MEDCouplingCommon.i +++ b/src/MEDCoupling_Swig/MEDCouplingCommon.i @@ -57,6 +57,7 @@ #include "InterpKernelAutoPtr.hxx" #include "BoxSplittingOptions.hxx" +#include "MEDCouplingNatureOfField.hxx" using namespace MEDCoupling; using namespace INTERP_KERNEL; diff --git a/src/MEDCoupling_Swig/MEDCouplingDataArrayTraits.hxx b/src/MEDCoupling_Swig/MEDCouplingDataArrayTraits.hxx index 5db25568d..2a9179639 100644 --- a/src/MEDCoupling_Swig/MEDCouplingDataArrayTraits.hxx +++ b/src/MEDCoupling_Swig/MEDCouplingDataArrayTraits.hxx @@ -22,7 +22,7 @@ #define __MEDCOUPLINGDATAARRAYTRAITS_HXX__ #include "MCType.hxx" -#include "MEDCouplingMemArray.hxx" +#include "MEDCouplingMemArray.txx" #include diff --git a/src/MEDLoader/MEDFileData.hxx b/src/MEDLoader/MEDFileData.hxx index b8a8d30ab..08f180fed 100644 --- a/src/MEDLoader/MEDFileData.hxx +++ b/src/MEDLoader/MEDFileData.hxx @@ -29,7 +29,7 @@ #include "MEDFileMesh.hxx" #include "MEDFileMeshSupport.hxx" #include "MEDFileStructureElement.hxx" -#include "MEDFileUtilities.hxx" +#include "MEDFileUtilities.txx" #include "MEDLoaderDefines.hxx" #include #include "med.h" diff --git a/src/MEDLoader/MEDFileEquivalence.cxx b/src/MEDLoader/MEDFileEquivalence.cxx index 65103001b..2a07c1d55 100644 --- a/src/MEDLoader/MEDFileEquivalence.cxx +++ b/src/MEDLoader/MEDFileEquivalence.cxx @@ -25,7 +25,6 @@ #include "CellModel.hxx" #include "MCType.hxx" #include "MEDFileSafeCaller.txx" -#include "MEDCouplingMemArray.hxx" #include "MEDLoaderBase.hxx" #include "MEDFileMesh.hxx" #include "InterpKernelAutoPtr.hxx" diff --git a/src/MEDLoader/MEDFileField1TS.cxx b/src/MEDLoader/MEDFileField1TS.cxx index 5c2b05186..1927a5f91 100644 --- a/src/MEDLoader/MEDFileField1TS.cxx +++ b/src/MEDLoader/MEDFileField1TS.cxx @@ -38,6 +38,7 @@ #include "MEDFileSafeCaller.txx" #include "MEDFileUtilities.hxx" #include "MEDLoaderBase.hxx" +#include "MEDFileField.txx" #include "MEDCouplingFieldTemplate.hxx" #include "MEDCouplingFieldDouble.hxx" diff --git a/src/MEDLoader/MEDFileField1TS.hxx b/src/MEDLoader/MEDFileField1TS.hxx index ac1a3abc9..394ab88d0 100644 --- a/src/MEDLoader/MEDFileField1TS.hxx +++ b/src/MEDLoader/MEDFileField1TS.hxx @@ -26,7 +26,7 @@ #include "MEDCouplingMemArray.hxx" #include "MCAuto.hxx" #include "MEDCouplingTraits.hxx" -#include "MEDFileUtilities.hxx" +#include "MEDFileUtilities.txx" #include "MEDLoaderDefines.hxx" #include "MEDFileFieldGlobs.hxx" #include "MEDFileFieldInternal.hxx" diff --git a/src/MEDLoader/MEDFileFieldMultiTS.cxx b/src/MEDLoader/MEDFileFieldMultiTS.cxx index 057681792..46dd6b150 100644 --- a/src/MEDLoader/MEDFileFieldMultiTS.cxx +++ b/src/MEDLoader/MEDFileFieldMultiTS.cxx @@ -19,6 +19,7 @@ // Author : Anthony Geay (EDF R&D) #include "MEDFileFieldMultiTS.hxx" +#include "MEDFileField.txx" #include "MCType.hxx" #include "MEDFileFieldGlobs.hxx" #include "MEDFileEntities.hxx" diff --git a/src/MEDLoader/MEDFileFieldMultiTS.hxx b/src/MEDLoader/MEDFileFieldMultiTS.hxx index 16e32d669..a954e9696 100644 --- a/src/MEDLoader/MEDFileFieldMultiTS.hxx +++ b/src/MEDLoader/MEDFileFieldMultiTS.hxx @@ -29,7 +29,7 @@ #include "MEDFileField1TS.hxx" #include "MEDFileFieldGlobs.hxx" #include "MEDLoaderTraits.hxx" -#include "MEDFileUtilities.hxx" +#include "MEDFileUtilities.txx" #include #include "med.h" #include diff --git a/src/MEDLoader/MEDFileMesh.hxx b/src/MEDLoader/MEDFileMesh.hxx index 0d898fee4..0cd2f191d 100644 --- a/src/MEDLoader/MEDFileMesh.hxx +++ b/src/MEDLoader/MEDFileMesh.hxx @@ -22,7 +22,7 @@ #define __MEDFILEMESH_HXX__ #include "MEDCouplingRefCountObject.hxx" -#include "MEDFileUtilities.hxx" +#include "MEDFileUtilities.txx" #include "MEDCouplingMemArray.hxx" #include "MCType.hxx" #include "MEDCouplingMesh.hxx" diff --git a/src/MEDLoader/MEDFileMeshLL.cxx b/src/MEDLoader/MEDFileMeshLL.cxx index cce318be9..f2341131f 100644 --- a/src/MEDLoader/MEDFileMeshLL.cxx +++ b/src/MEDLoader/MEDFileMeshLL.cxx @@ -21,11 +21,11 @@ #include "MEDFileMeshLL.hxx" #include "MEDCouplingCurveLinearMesh.hxx" #include "MEDCouplingMesh.hxx" -#include "MEDCouplingMemArray.hxx" +#include "MEDCouplingMemArray.txx" #include "MEDFileBasis.hxx" #include "MCType.hxx" #include "MCAuto.hxx" -#include "MEDCouplingMap.hxx" +#include "MEDCouplingMap.txx" #include "MEDCouplingPartDefinition.hxx" #include "MEDCouplingRefCountObject.hxx" #include "MCIdType.hxx" diff --git a/src/MEDLoader/MEDFileParameter.hxx b/src/MEDLoader/MEDFileParameter.hxx index df971f163..ff8844fa4 100644 --- a/src/MEDLoader/MEDFileParameter.hxx +++ b/src/MEDLoader/MEDFileParameter.hxx @@ -22,7 +22,7 @@ #define __MEDFILEPARAMETER_HXX__ #include "MEDCouplingRefCountObject.hxx" -#include "MEDFileUtilities.hxx" +#include "MEDFileUtilities.txx" #include "MEDLoaderDefines.hxx" #include "MEDCouplingMemArray.hxx" #include "MCAuto.hxx" diff --git a/src/MEDLoader/libmesh5.hxx b/src/MEDLoader/libmesh5.hxx index ba433cf9f..f1e6da8b3 100644 --- a/src/MEDLoader/libmesh5.hxx +++ b/src/MEDLoader/libmesh5.hxx @@ -58,14 +58,14 @@ extern const char* GmfKwdFmt[ GmfMaxKwd + 1 ][4]; /* Structures */ /*----------------------------------------------------------*/ namespace MeshFormat { -using KwdSct = struct +typedef struct { int typ, SolSiz, NmbWrd, NmbLin, NmbTyp, TypTab[ GmfMaxTyp ]; long pos; char fmt[ GmfMaxTyp*9 ]; -}; +} KwdSct; -using GmfMshSct = struct +typedef struct { int dim, ver, mod, typ, cod, pos; long NexKwdPos, siz; @@ -77,7 +77,7 @@ using GmfMshSct = struct char FilNam[ GmfStrSiz ]; double DblBuf[1000/8]; unsigned char blk[ BufSiz + 1000 ]; -}; +} GmfMshSct; diff --git a/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.cxx b/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.cxx index 3e6c74d7f..908f7bfea 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.cxx @@ -2262,7 +2262,7 @@ void MEDPARTITIONER::MeshCollection::setDomainNames(const std::string& name) { for (int i=0; i<_topology->nbDomain(); i++) { - std::ostringstream const oss; + std::ostringstream oss; oss<isMyDomain(i)) _mesh[i]->setName(oss.str()); diff --git a/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx b/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx index 72d9345f6..18f35be7d 100644 --- a/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx +++ b/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx @@ -34,7 +34,7 @@ #include "MEDCouplingUMesh.hxx" #include "MEDCouplingMappedExtrudedMesh.hxx" #include "MEDCouplingFieldDouble.hxx" -#include "MEDCouplingMemArray.hxx" +#include "MEDCouplingMemArray.txx" #include "MEDCouplingMultiFields.hxx" #include "NormalizedGeometricTypes" diff --git a/src/ParaMEDMEM/InterpolationMatrix.cxx b/src/ParaMEDMEM/InterpolationMatrix.cxx index fe60b350d..2fbffef53 100644 --- a/src/ParaMEDMEM/InterpolationMatrix.cxx +++ b/src/ParaMEDMEM/InterpolationMatrix.cxx @@ -19,7 +19,7 @@ #include "DECOptions.hxx" #include "MCType.hxx" -#include "MEDCouplingNormalizedUnstructuredMesh.hxx" +#include "MEDCouplingNormalizedUnstructuredMesh.txx" #include "Interpolation2D.hxx" #include "Interpolation3D.hxx" #include "Interpolation2D3D.hxx" diff --git a/src/ParaMEDMEM/OverlapInterpolationMatrix.cxx b/src/ParaMEDMEM/OverlapInterpolationMatrix.cxx index 4dcc59fb2..d81d0c25a 100644 --- a/src/ParaMEDMEM/OverlapInterpolationMatrix.cxx +++ b/src/ParaMEDMEM/OverlapInterpolationMatrix.cxx @@ -22,7 +22,7 @@ #include "DECOptions.hxx" #include "OverlapElementLocator.hxx" #include "MCType.hxx" -#include "MEDCouplingNormalizedUnstructuredMesh.hxx" +#include "MEDCouplingNormalizedUnstructuredMesh.txx" #include "Interpolation2D.hxx" #include "Interpolation3D.hxx" #include "Interpolation2D3D.hxx" diff --git a/src/ParaMEDMEM/ParaDataArray.txx b/src/ParaMEDMEM/ParaDataArray.txx index 7e358d6cf..232c7c8ac 100644 --- a/src/ParaMEDMEM/ParaDataArray.txx +++ b/src/ParaMEDMEM/ParaDataArray.txx @@ -22,7 +22,7 @@ #include "MEDCouplingTraits.hxx" #include "MCType.hxx" -#include "MEDCouplingMemArray.hxx" +#include "MEDCouplingMemArray.txx" #include "MCAuto.hxx" #include "ParaDataArray.hxx" #include "CommInterface.hxx" diff --git a/src/ParaMEDMEM/ParaUMesh.cxx b/src/ParaMEDMEM/ParaUMesh.cxx index f72e96b35..315d345b2 100644 --- a/src/ParaMEDMEM/ParaUMesh.cxx +++ b/src/ParaMEDMEM/ParaUMesh.cxx @@ -27,7 +27,7 @@ #include "MEDCouplingRefCountObject.hxx" #include "MPIProcessorGroup.hxx" #include "CommInterface.hxx" -#include "MEDCouplingMemArray.hxx" +#include "MEDCouplingMemArray.txx" #include "mpi.h" -- 2.39.2