Join modifications from branch V3_1_0_For_CCRT

[modules/med.git] / src / MEDMEM / MEDMEM_MedMedDriver22.cxx

diff --git a/src/MEDMEM/MEDMEM_MedMedDriver22.cxx b/src/MEDMEM/MEDMEM_MedMedDriver22.cxx
index 23c60b8fbe2ad243b831166309a97898b7a386ae..aec34b04433e85caeedd80670549b837899ab549 100644 (file)
--- a/src/MEDMEM/MEDMEM_MedMedDriver22.cxx
+++ b/src/MEDMEM/MEDMEM_MedMedDriver22.cxx
@@ -223,7 +223,8 @@ void MED_MED_RDONLY_DRIVER22::readFileStruct( void )
     int          numberOfMeshes;
     char         meshName[MED_TAILLE_NOM+1]="";
     char         meshDescription[MED_TAILLE_DESC+1]="";
-    int          meshDim;
+//CCRT    int          meshDim;
+    med_2_2::med_int          meshDim;
     med_2_2::med_maillage meshType;
 
     MESH *       ptrMesh;
@@ -393,8 +394,10 @@ void MED_MED_RDONLY_DRIVER22::readFileStruct( void )
     //    char                          timeStepUnit[MED_TAILLE_PNOM]= "";
     char                          timeStepUnit[MED_TAILLE_PNOM22+1] ;
     double                        timeStep                     = 0.0;
-    int                           orderNumber                  =  -1;                           //???init?????
-    int                           numberOfRefMesh = 0;
+//CCRT    int                           orderNumber                  =  -1;                           //???init?????
+    med_2_2::med_int                           orderNumber                  =  -1;                           //???init?????
+//CCRT    int                           numberOfRefMesh = 0;
+    med_2_2::med_int                           numberOfRefMesh = 0;
     med_2_2::med_booleen           meshLink;
     map<MESH_NAME_,MESH*>      & _meshes   =  _ptrMed->_meshes; 
     map<FIELD_NAME_,MAP_DT_IT_> & _fields   =  _ptrMed->_fields; 
@@ -451,7 +454,7 @@ void MED_MED_RDONLY_DRIVER22::readFileStruct( void )
 
                MESSAGE("Field information 2 : NumberOfTimeStep :"<<
                        numberOfTimeSteps);
-
+/*
          if ( numberOfTimeSteps > MED_VALID ) 
                  break ;
                // There are value for some med_geometrie_element of this
@@ -462,10 +465,10 @@ void MED_MED_RDONLY_DRIVER22::readFileStruct( void )
              for (currentGeometry = (*currentEntity).second.begin();
                   currentGeometry != (*currentEntity).second.end();
                   currentGeometry++)
-               {
-           MESSAGE("Field information 3 : Geom : "<<(*currentGeometry));
+               {*/
+                MESSAGE("Field information 3 : Geom : "<<(*currentGeometry));
              
-                 for (j=1;j <= numberOfTimeSteps; j++)
+                for (j=1;j <= numberOfTimeSteps; j++)
                    {
                      MESSAGE("Field information 4 : time step j = "<<j);