From 11310c6a49e7a199058a309e3c849a6ad53ada8f Mon Sep 17 00:00:00 2001 From: ageay Date: Fri, 23 Aug 2013 06:37:44 +0000 Subject: [PATCH] Unwarningization under Win. --- doc/doxygen/Doxyfile_med_user.in | 2 + .../Bases/NormalizedGeometricTypes | 64 +++++++++++++++++++ .../Bases/NormalizedUnstructuredMesh.hxx | 40 +----------- src/INTERP_KERNEL/CMakeLists.txt | 2 +- src/MEDCoupling/CMakeLists.txt | 2 +- src/MEDCoupling/MEDCouplingNatureOfField.hxx | 11 +--- src/MEDCoupling/MEDCouplingNatureOfFieldEnum | 36 +++++++++++ src/MEDCoupling_Swig/MEDCouplingCommon.i | 16 ++++- 8 files changed, 122 insertions(+), 51 deletions(-) create mode 100644 src/INTERP_KERNEL/Bases/NormalizedGeometricTypes create mode 100644 src/MEDCoupling/MEDCouplingNatureOfFieldEnum diff --git a/doc/doxygen/Doxyfile_med_user.in b/doc/doxygen/Doxyfile_med_user.in index ca7b61bbd..d96726d47 100644 --- a/doc/doxygen/Doxyfile_med_user.in +++ b/doc/doxygen/Doxyfile_med_user.in @@ -88,6 +88,7 @@ FILE_PATTERNS = InterpKernelDEC.* \ ExplicitCoincidentDEC.* \ NonCoincidentDEC.* \ CommInterface.* \ + NormalizedGeometricTypes \ NormalizedUnstructuredMesh.* \ Interpolation2D.* \ Interpolation3D.* \ @@ -116,6 +117,7 @@ FILE_PATTERNS = InterpKernelDEC.* \ MEDCouplingExtrudedMesh.* \ MEDCouplingFieldDouble.* \ MEDCouplingField.* \ + MEDCouplingNatureOfFieldEnum MEDCouplingNatureOfField.hxx \ MEDCouplingFieldTemplate.* \ MEDCouplingFieldDiscretization.* \ diff --git a/src/INTERP_KERNEL/Bases/NormalizedGeometricTypes b/src/INTERP_KERNEL/Bases/NormalizedGeometricTypes new file mode 100644 index 000000000..9e2cd6025 --- /dev/null +++ b/src/INTERP_KERNEL/Bases/NormalizedGeometricTypes @@ -0,0 +1,64 @@ +// Copyright (C) 2007-2013 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// Author : Anthony Geay (CEA/DEN) + +#ifndef __NORMALIZEDGEOMETRICTYPES__ +#define __NORMALIZEDGEOMETRICTYPES__ + +namespace INTERP_KERNEL +{ + typedef enum + { + NORM_POINT1 = 0, + NORM_SEG2 = 1, + NORM_SEG3 = 2, + NORM_SEG4 = 10, + NORM_POLYL = 33, + NORM_TRI3 = 3, + NORM_QUAD4 = 4, + NORM_POLYGON = 5, + NORM_TRI6 = 6, + NORM_TRI7 = 7, + NORM_QUAD8 = 8, + NORM_QUAD9 = 9, + NORM_QPOLYG = 32, + // + NORM_TETRA4 = 14, + NORM_PYRA5 = 15, + NORM_PENTA6 = 16, + NORM_HEXA8 = 18, + NORM_TETRA10 = 20, + NORM_HEXGP12 = 22, + NORM_PYRA13 = 23, + NORM_PENTA15 = 25, + NORM_HEXA20 = 30, + NORM_HEXA27 = 27, + NORM_POLYHED = 31, + NORM_ERROR = 40, + NORM_MAXTYPE = 33 + } NormalizedCellType; + + /// Type describing the different ways in which the hexahedron can be split into tetrahedra. + /// The PLANAR_* policies persume that each face is to be considered planar, while the general + /// policies make no such hypothesis. The integer at the end gives the number of tetrahedra + /// that result from the split. + typedef enum { PLANAR_FACE_5 = 5, PLANAR_FACE_6 = 6, GENERAL_24 = 24, GENERAL_48 = 48 } SplittingPolicy; +} + +#endif diff --git a/src/INTERP_KERNEL/Bases/NormalizedUnstructuredMesh.hxx b/src/INTERP_KERNEL/Bases/NormalizedUnstructuredMesh.hxx index b6ba41b7f..8c65333ae 100644 --- a/src/INTERP_KERNEL/Bases/NormalizedUnstructuredMesh.hxx +++ b/src/INTERP_KERNEL/Bases/NormalizedUnstructuredMesh.hxx @@ -21,6 +21,8 @@ #ifndef __NORMALIZEDUNSTRUCTUREDMESH_HXX__ #define __NORMALIZEDUNSTRUCTUREDMESH_HXX__ +#include "NormalizedGeometricTypes" + namespace INTERP_KERNEL { typedef enum @@ -28,44 +30,6 @@ namespace INTERP_KERNEL ALL_C_MODE , ALL_FORTRAN_MODE } NumberingPolicy; - - - typedef enum - { - NORM_POINT1 = 0, - NORM_SEG2 = 1, - NORM_SEG3 = 2, - NORM_SEG4 = 10, - NORM_POLYL = 33, - NORM_TRI3 = 3, - NORM_QUAD4 = 4, - NORM_POLYGON = 5, - NORM_TRI6 = 6, - NORM_TRI7 = 7, - NORM_QUAD8 = 8, - NORM_QUAD9 = 9, - NORM_QPOLYG = 32, - // - NORM_TETRA4 = 14, - NORM_PYRA5 = 15, - NORM_PENTA6 = 16, - NORM_HEXA8 = 18, - NORM_TETRA10 = 20, - NORM_HEXGP12 = 22, - NORM_PYRA13 = 23, - NORM_PENTA15 = 25, - NORM_HEXA20 = 30, - NORM_HEXA27 = 27, - NORM_POLYHED = 31, - NORM_ERROR = 40, - NORM_MAXTYPE = 33 - } NormalizedCellType; - - /// Type describing the different ways in which the hexahedron can be split into tetrahedra. - /// The PLANAR_* policies persume that each face is to be considered planar, while the general - /// policies make no such hypothesis. The integer at the end gives the number of tetrahedra - /// that result from the split. - typedef enum { PLANAR_FACE_5 = 5, PLANAR_FACE_6 = 6, GENERAL_24 = 24, GENERAL_48 = 48 } SplittingPolicy; } #endif diff --git a/src/INTERP_KERNEL/CMakeLists.txt b/src/INTERP_KERNEL/CMakeLists.txt index 7d2e4a422..c7551b93b 100644 --- a/src/INTERP_KERNEL/CMakeLists.txt +++ b/src/INTERP_KERNEL/CMakeLists.txt @@ -79,7 +79,7 @@ INSTALL(TARGETS interpkernel EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SAL FILE(GLOB_RECURSE interpkernel_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") FILE(GLOB_RECURSE interpkernel_HEADERS_TXX "${CMAKE_CURRENT_SOURCE_DIR}/*.txx") -INSTALL(FILES ${interpkernel_HEADERS_HXX} ${interpkernel_HEADERS_TXX} DESTINATION ${SALOME_INSTALL_HEADERS}) +INSTALL(FILES ${interpkernel_HEADERS_HXX} ${interpkernel_HEADERS_TXX} Bases/NormalizedGeometricTypes DESTINATION ${SALOME_INSTALL_HEADERS}) # Will be used for SWIG dependencies: SET (interpkernel_HEADERS_HXX PARENT_SCOPE) diff --git a/src/MEDCoupling/CMakeLists.txt b/src/MEDCoupling/CMakeLists.txt index d89ee9b03..080951505 100644 --- a/src/MEDCoupling/CMakeLists.txt +++ b/src/MEDCoupling/CMakeLists.txt @@ -72,7 +72,7 @@ INSTALL(TARGETS medcouplingremapper EXPORT ${PROJECT_NAME}TargetGroup DESTINATIO FILE(GLOB medcoupling_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") FILE(GLOB medcoupling_HEADERS_TXX "${CMAKE_CURRENT_SOURCE_DIR}/*.txx") -INSTALL(FILES ${medcoupling_HEADERS_HXX} ${medcoupling_HEADERS_TXX} DESTINATION ${SALOME_INSTALL_HEADERS}) +INSTALL(FILES ${medcoupling_HEADERS_HXX} ${medcoupling_HEADERS_TXX} MEDCouplingNatureOfFieldEnum DESTINATION ${SALOME_INSTALL_HEADERS}) # To allow usage as SWIG dependencies: SET(medcoupling_HEADERS_HXX PARENT_SCOPE) diff --git a/src/MEDCoupling/MEDCouplingNatureOfField.hxx b/src/MEDCoupling/MEDCouplingNatureOfField.hxx index bc9e0caf4..b95fbf3f6 100644 --- a/src/MEDCoupling/MEDCouplingNatureOfField.hxx +++ b/src/MEDCoupling/MEDCouplingNatureOfField.hxx @@ -22,19 +22,12 @@ #define __PARAMEDMEM_MEDCOUPLINGNATUREOFFIELD_HXX__ #include "MEDCoupling.hxx" +#include "MEDCouplingNatureOfFieldEnum" + #include "InterpKernelException.hxx" namespace ParaMEDMEM { - typedef enum - { - NoNature = 17, - ConservativeVolumic = 26, - Integral = 32, - IntegralGlobConstraint = 35, - RevIntegral = 37 - } NatureOfField; - class MEDCouplingNatureOfField { public: diff --git a/src/MEDCoupling/MEDCouplingNatureOfFieldEnum b/src/MEDCoupling/MEDCouplingNatureOfFieldEnum new file mode 100644 index 000000000..fedca05e1 --- /dev/null +++ b/src/MEDCoupling/MEDCouplingNatureOfFieldEnum @@ -0,0 +1,36 @@ +// Copyright (C) 2007-2013 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// Author : Anthony Geay (CEA/DEN) + +#ifndef __PARAMEDMEM_MEDCOUPLINGNATUREOFFIELDENUM__ +#define __PARAMEDMEM_MEDCOUPLINGNATUREOFFIELDENUM__ + +namespace ParaMEDMEM +{ + typedef enum + { + NoNature = 17, + ConservativeVolumic = 26, + Integral = 32, + IntegralGlobConstraint = 35, + RevIntegral = 37 + } NatureOfField; +} + +#endif diff --git a/src/MEDCoupling_Swig/MEDCouplingCommon.i b/src/MEDCoupling_Swig/MEDCouplingCommon.i index 4d746d201..7fbe47208 100644 --- a/src/MEDCoupling_Swig/MEDCouplingCommon.i +++ b/src/MEDCoupling_Swig/MEDCouplingCommon.i @@ -1114,8 +1114,20 @@ namespace ParaMEDMEM //== MEDCouplingMesh End -%include "NormalizedUnstructuredMesh.hxx" -%include "MEDCouplingNatureOfField.hxx" +%include "NormalizedGeometricTypes" +%include "MEDCouplingNatureOfFieldEnum" +// +namespace ParaMEDMEM +{ + class MEDCouplingNatureOfField + { + public: + static const char *GetRepr(NatureOfField nat) throw(INTERP_KERNEL::Exception); + static std::string GetReprNoThrow(NatureOfField nat); + static std::string GetAllPossibilitiesStr(); + }; +} +// %include "MEDCouplingTimeDiscretization.hxx" namespace ParaMEDMEM -- 2.30.2