Porting on MEDFile3 A2

diff --git a/src/MEDLoader/MEDLoader.cxx b/src/MEDLoader/MEDLoader.cxx
index d7ecf682ac37ef1bd633f38ca434ac53fa847abc..e56d4e66556f0f6fdee8e04745d57f005edc2c3c 100644 (file)
--- a/src/MEDLoader/MEDLoader.cxx
+++ b/src/MEDLoader/MEDLoader.cxx
@@ -28,37 +28,6 @@
 extern "C"
 {
 #include "med.h"
-  med_err MEDfieldComputingStepInfo(const med_idt fid,
-                                    const char * const fieldname,
-                                    const int csit,
-                                    med_int * const numdt,
-                                    med_int * const numit,
-                                    med_float * const dt);
-  
-  med_err MEDmeshEntityFamilyNumberRd(const med_idt               fid,
-                                      const char*  const          meshname,
-                                      const med_int               numdt,
-                                      const med_int               numit,
-                                      const med_entity_type       entitype,
-                                      const med_geometry_type     geotype,
-                                      med_int * const             number);
-
-  med_err MEDmeshEntityNumberRd(const med_idt               fid,
-                                const char*  const          meshname,
-                                const med_int               numdt,
-                                const med_int               numit,
-                                const med_entity_type       entitype,
-                                const med_geometry_type     geotype,
-                                med_int * const             number);
-
-  med_err MEDfieldCr( const med_idt fid,
-                      const char * const fieldname,
-                      const med_field_type fieldtype,
-                      const med_int nbofcomponent,
-                      const char * const componentname,
-                      const char * const componentunit,
-                      const char * const dtunit,
-                      const char * const meshname);
 }
 
 #include <string>
@@ -84,8 +53,8 @@ med_geometry_type typmai[MED_NOF_CELL_PREDEFINED_TYPES+2] = { MED_POINT1,
                                                               MED_PENTA15,
                                                               MED_PYRA5,
                                                               MED_PYRA13,
-                                                              MED_POLYGONE,
-                                                              MED_POLYEDRE };
+                                                              MED_POLYGON,
+                                                              MED_POLYHEDRON };
 
 med_geometry_type typmainoeud[1] = { MED_NONE };
 
@@ -112,7 +81,7 @@ med_geometry_type typmai3[32] = { MED_POINT1,//0
                                   MED_SEG3,//2
                                   MED_TRIA3,//3
                                   MED_QUAD4,//4
-                                  MED_POLYGONE,//5
+                                  MED_POLYGON,//5
                                   MED_TRIA6,//6
                                   MED_NONE,//7
                                   MED_QUAD8,//8
@@ -138,7 +107,7 @@ med_geometry_type typmai3[32] = { MED_POINT1,//0
                                   MED_NONE,//28
                                   MED_NONE,//29
                                   MED_HEXA20,//30
-                                  MED_POLYEDRE//31
+                                  MED_POLYHEDRON//31
 };
 
 double MEDLoader::_EPS_FOR_NODE_COMP=1.e-12;
@@ -1960,7 +1929,7 @@ void MEDLoaderNS::writeUMeshesDirectly(const char *fileName, const std::vector<c
               std::vector<int> fam;
               std::vector<int> renumber;
               int nbOfElt=MEDLoaderNS::buildMEDSubConnectivityOfOneType(conn,connIndex,families,curType,medConn,medConnIndex,medConnIndex2,fam,renumber);
-              if(curMedType!=MED_POLYGONE && curMedType!=MED_POLYEDRE)
+              if(curMedType!=MED_POLYGON && curMedType!=MED_POLYHEDRON)
                 MEDmeshElementConnectivityWr(fid,maa,-1,-1,0.,MED_CELL,curMedType,MED_NODAL,MED_FULL_INTERLACE,nbOfElt,&medConn[0]);
               else
                 {