]> SALOME platform Git repositories - modules/med.git/commitdiff
Salome HOME
Unwarningization under Win.
authorageay <ageay>
Fri, 23 Aug 2013 06:37:44 +0000 (06:37 +0000)
committerageay <ageay>
Fri, 23 Aug 2013 06:37:44 +0000 (06:37 +0000)
doc/doxygen/Doxyfile_med_user.in
src/INTERP_KERNEL/Bases/NormalizedGeometricTypes [new file with mode: 0644]
src/INTERP_KERNEL/Bases/NormalizedUnstructuredMesh.hxx
src/INTERP_KERNEL/CMakeLists.txt
src/MEDCoupling/CMakeLists.txt
src/MEDCoupling/MEDCouplingNatureOfField.hxx
src/MEDCoupling/MEDCouplingNatureOfFieldEnum [new file with mode: 0644]
src/MEDCoupling_Swig/MEDCouplingCommon.i

index ca7b61bbdf8dfc85bbd1a6b82f87a0115c2bb2d8..d96726d47410f59fa3cabcd5fcebc4064a71be52 100644 (file)
@@ -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 (file)
index 0000000..9e2cd60
--- /dev/null
@@ -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
index b6ba41b7f0afe05ae812753c26d4fd9ae05f5763..8c65333ae4576a1133a30cc287539182e999e855 100644 (file)
@@ -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
index 7d2e4a4223ecd1ce10ce2b32beb618cb0ffd29ba..c7551b93bd2ad7e232b153ce905da0bd7ff6eec9 100644 (file)
@@ -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)
index d89ee9b03409327cf95107642629cffe9a90354f..080951505740758f1a60fb576ea94659fd4bfa4b 100644 (file)
@@ -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)
index bc9e0caf4cb0aeb41ad3d7d4d80fcf6a0cc53e11..b95fbf3f679ab2567022452b827ae5ceadd90068 100644 (file)
 #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 (file)
index 0000000..fedca05
--- /dev/null
@@ -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
index 4d746d201e4eade79e45050541ec03202e2acf6a..7fbe47208a804c5589f1150b4057a84dcf4f4121 100644 (file)
@@ -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