To be in accordance with MEDMEM::FIELD template class. FullInterlace interlacing...

diff --git a/src/MEDMEM_I/MEDMEM_Med_i.cxx b/src/MEDMEM_I/MEDMEM_Med_i.cxx
index 336d8a0923b88a9241110fa572898f48b120fdd3..827ba92a2d9961a75ec27b5c799e86491b4bba3a 100644 (file)
--- a/src/MEDMEM_I/MEDMEM_Med_i.cxx
+++ b/src/MEDMEM_I/MEDMEM_Med_i.cxx
@@ -160,7 +160,7 @@ void MED_i::init(SALOMEDS::Study_ptr myStudy,driverTypes driverType, const strin
                         case MED_EN::MED_INT32 : 
                         {
                             ((FIELD<int>*)myField)->read();
-                            FIELDTEMPLATE_I<int,FullInterlace> *myFieldIntI = new FIELDTEMPLATE_I<int,FullInterlace>((FIELD<int>*)myField);
+                            FIELDTEMPLATE_I<int> *myFieldIntI = new FIELDTEMPLATE_I<int>((FIELD<int>*)myField);
                             myFieldIOR = myFieldIntI->_this();
 //                          myFieldIntI->addInStudy(myStudy,myFieldIOR);
                             break;
@@ -169,7 +169,7 @@ void MED_i::init(SALOMEDS::Study_ptr myStudy,driverTypes driverType, const strin
                        case MED_EN::MED_REEL64: 
                         {
                             ((FIELD<double>*)myField)->read();
-                            FIELDTEMPLATE_I<double,FullInterlace> *myFieldDoubleI = new FIELDTEMPLATE_I<double,FullInterlace>((FIELD<double,FullInterlace>*)myField);
+                            FIELDTEMPLATE_I<double> *myFieldDoubleI = new FIELDTEMPLATE_I<double>((FIELD<double>*)myField);
                             myFieldIOR = myFieldDoubleI->_this();
 //                          myFieldDoubleI->addInStudy(myStudy,myFieldIOR);
                             break;
@@ -483,7 +483,7 @@ void MED_i::initWithFieldType(SALOMEDS::Study_ptr myStudy,driverTypes driverType
                     case MED_EN::MED_INT32: 
                     {
                        ((FIELD<int>*)myField)->read();
-                       FIELDTEMPLATE_I<int,FullInterlace> *myFieldIntI = new FIELDTEMPLATE_I<int,FullInterlace>((FIELD<int>*)myField);
+                       FIELDTEMPLATE_I<int> *myFieldIntI = new FIELDTEMPLATE_I<int>((FIELD<int>*)myField);
                        SALOME_MED::FIELDINT_ptr myFieldIntIOR;
                        myFieldIntIOR = myFieldIntI->_this();
 
@@ -497,7 +497,7 @@ void MED_i::initWithFieldType(SALOMEDS::Study_ptr myStudy,driverTypes driverType
                     case MED_EN::MED_REEL64: 
                     {
                        ((FIELD<double>*)myField)->read();
-                       FIELDTEMPLATE_I<double,FullInterlace> *myFieldDoubleI = new FIELDTEMPLATE_I<double,FullInterlace>((FIELD<double>*)myField);
+                       FIELDTEMPLATE_I<double> *myFieldDoubleI = new FIELDTEMPLATE_I<double>((FIELD<double>*)myField);
                        SALOME_MED::FIELDDOUBLE_ptr myFieldDoubleIOR;
                        myFieldDoubleIOR = myFieldDoubleI->_this();
 

diff --git a/src/MEDMEM_I/MEDMEM_Mesh_i.cxx b/src/MEDMEM_I/MEDMEM_Mesh_i.cxx
index 96581ec8917ee24823416ee927000b2cd6c6ff65..0883688a9396073a6e487c359ff4bc3a33e370a2 100644 (file)
--- a/src/MEDMEM_I/MEDMEM_Mesh_i.cxx
+++ b/src/MEDMEM_I/MEDMEM_Mesh_i.cxx
@@ -1289,7 +1289,7 @@ throw (SALOME::SALOME_Exception)
                ASSERT(SUPPORT_i::supportMap.find(sup)!=SUPPORT_i::supportMap.end());
                const SUPPORT * myCppSupport=SUPPORT_i::supportMap[sup];
                 ::FIELD<double>*f=_mesh->getVolume( myCppSupport);
-               FIELDTEMPLATE_I<double,FullInterlace> *medf = new FIELDTEMPLATE_I<double,FullInterlace>(f);
+               FIELDTEMPLATE_I<double> *medf = new FIELDTEMPLATE_I<double>(f);
                return medf->_this();
         }
         catch (MEDEXCEPTION &ex)
@@ -1341,7 +1341,7 @@ throw (SALOME::SALOME_Exception)
                ASSERT(SUPPORT_i::supportMap.find(sup)!=SUPPORT_i::supportMap.end());
                const SUPPORT * myCppSupport=SUPPORT_i::supportMap[sup];
                 ::FIELD<double>*f=_mesh->getArea( myCppSupport);
-               FIELDTEMPLATE_I<double,FullInterlace> *medf = new FIELDTEMPLATE_I<double,FullInterlace>(f);
+               FIELDTEMPLATE_I<double> *medf = new FIELDTEMPLATE_I<double>(f);
                return medf->_this();
         }
         catch (MEDEXCEPTION &ex)
@@ -1367,7 +1367,7 @@ throw (SALOME::SALOME_Exception)
                ASSERT(SUPPORT_i::supportMap.find(sup)!=SUPPORT_i::supportMap.end());
                const SUPPORT * myCppSupport=SUPPORT_i::supportMap[sup];
                 ::FIELD<double>*f=_mesh->getLength( myCppSupport);
-               FIELDTEMPLATE_I<double,FullInterlace>  *medf = new FIELDTEMPLATE_I<double,FullInterlace>(f);
+               FIELDTEMPLATE_I<double>  *medf = new FIELDTEMPLATE_I<double>(f);
                return medf->_this();
         }
         catch (MEDEXCEPTION &ex)
@@ -1393,7 +1393,7 @@ throw (SALOME::SALOME_Exception)
                ASSERT(SUPPORT_i::supportMap.find(sup)!=SUPPORT_i::supportMap.end());
                const SUPPORT * myCppSupport=SUPPORT_i::supportMap[sup];
                 ::FIELD<double>*f=_mesh->getNormal( myCppSupport);
-               FIELDTEMPLATE_I<double,FullInterlace> *medf = new FIELDTEMPLATE_I<double,FullInterlace>(f);
+               FIELDTEMPLATE_I<double> *medf = new FIELDTEMPLATE_I<double>(f);
                return medf->_this();
         }
         catch (MEDEXCEPTION &ex)
@@ -1419,7 +1419,7 @@ throw (SALOME::SALOME_Exception)
                ASSERT(SUPPORT_i::supportMap.find(sup)!=SUPPORT_i::supportMap.end());
                const SUPPORT * myCppSupport=SUPPORT_i::supportMap[sup];
                 ::FIELD<double>*f=_mesh->getBarycenter( myCppSupport);
-               FIELDTEMPLATE_I<double,FullInterlace> *medf = new FIELDTEMPLATE_I<double,FullInterlace>(f);
+               FIELDTEMPLATE_I<double> *medf = new FIELDTEMPLATE_I<double>(f);
                return medf->_this();
         }
         catch (MEDEXCEPTION &ex)