Index: /XIOS/trunk/src/fortran/context_interface.f90
===================================================================
--- /XIOS/trunk/src/fortran/context_interface.f90	(revision 311)
+++ /XIOS/trunk/src/fortran/context_interface.f90	(revision 312)
@@ -38,13 +38,4 @@
       END SUBROUTINE cxios_context_set_current
 
-      SUBROUTINE cxios_context_create(context, context_id, context_id_size, calendar_type, &
-                                     year, month, day, hour, minute, second) BIND(C)
-         USE ISO_C_BINDING
-         INTEGER  (kind = C_INTPTR_T)               :: context
-         CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: context_id
-         INTEGER  (kind = C_INT)     , VALUE        :: context_id_size
-         INTEGER  (kind = C_INT)     , VALUE        :: calendar_type, year, month, day, hour, minute, second
-      END SUBROUTINE cxios_context_create
-
       SUBROUTINE cxios_context_valid_id(ret, idt, idt_size) BIND(C)
          USE ISO_C_BINDING
Index: /XIOS/trunk/src/fortran/domain_interface.f90
===================================================================
--- /XIOS/trunk/src/fortran/domain_interface.f90	(revision 311)
+++ /XIOS/trunk/src/fortran/domain_interface.f90	(revision 312)
@@ -142,28 +142,4 @@
       END SUBROUTINE cxios_set_domain_zoom_jbegin
 
-      SUBROUTINE cxios_set_domain_zoom_ni_loc(domain_hdl, zoom_ni_loc) BIND(C)
-         USE ISO_C_BINDING
-         INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl
-         INTEGER (kind = C_INT)     , VALUE :: zoom_ni_loc
-      END SUBROUTINE cxios_set_domain_zoom_ni_loc
-
-      SUBROUTINE cxios_set_domain_zoom_nj_loc(domain_hdl, zoom_nj_loc) BIND(C)
-         USE ISO_C_BINDING
-         INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl
-         INTEGER (kind = C_INT)     , VALUE :: zoom_nj_loc
-      END SUBROUTINE cxios_set_domain_zoom_nj_loc
-
-      SUBROUTINE cxios_set_domain_zoom_ibegin_loc(domain_hdl, zoom_ibegin_loc) BIND(C)
-         USE ISO_C_BINDING
-         INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl
-         INTEGER (kind = C_INT)     , VALUE :: zoom_ibegin_loc
-      END SUBROUTINE cxios_set_domain_zoom_ibegin_loc
-
-      SUBROUTINE cxios_set_domain_zoom_jbegin_loc(domain_hdl, zoom_jbegin_loc) BIND(C)
-         USE ISO_C_BINDING
-         INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl
-         INTEGER (kind = C_INT)     , VALUE :: zoom_jbegin_loc
-      END SUBROUTINE cxios_set_domain_zoom_jbegin_loc
-
       SUBROUTINE cxios_set_domain_data_n_index(domain_hdl, data_n_index) BIND(C)
          USE ISO_C_BINDING
Index: /XIOS/trunk/src/fortran/domaingroup_interface.f90
===================================================================
--- /XIOS/trunk/src/fortran/domaingroup_interface.f90	(revision 311)
+++ /XIOS/trunk/src/fortran/domaingroup_interface.f90	(revision 312)
@@ -142,28 +142,4 @@
       END SUBROUTINE cxios_set_domaingroup_zoom_jbegin
 
-      SUBROUTINE cxios_set_domaingroup_zoom_ni_loc(domaingroup_hdl, zoom_ni_loc) BIND(C)
-         USE ISO_C_BINDING
-         INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl
-         INTEGER (kind = C_INT)     , VALUE :: zoom_ni_loc
-      END SUBROUTINE cxios_set_domaingroup_zoom_ni_loc
-
-      SUBROUTINE cxios_set_domaingroup_zoom_nj_loc(domaingroup_hdl, zoom_nj_loc) BIND(C)
-         USE ISO_C_BINDING
-         INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl
-         INTEGER (kind = C_INT)     , VALUE :: zoom_nj_loc
-      END SUBROUTINE cxios_set_domaingroup_zoom_nj_loc
-
-      SUBROUTINE cxios_set_domaingroup_zoom_ibegin_loc(domaingroup_hdl, zoom_ibegin_loc) BIND(C)
-         USE ISO_C_BINDING
-         INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl
-         INTEGER (kind = C_INT)     , VALUE :: zoom_ibegin_loc
-      END SUBROUTINE cxios_set_domaingroup_zoom_ibegin_loc
-
-      SUBROUTINE cxios_set_domaingroup_zoom_jbegin_loc(domaingroup_hdl, zoom_jbegin_loc) BIND(C)
-         USE ISO_C_BINDING
-         INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl
-         INTEGER (kind = C_INT)     , VALUE :: zoom_jbegin_loc
-      END SUBROUTINE cxios_set_domaingroup_zoom_jbegin_loc
-
       SUBROUTINE cxios_set_domaingroup_data_n_index(domaingroup_hdl, data_n_index) BIND(C)
          USE ISO_C_BINDING
Index: /XIOS/trunk/src/fortran/iaxis.F90
===================================================================
--- /XIOS/trunk/src/fortran/iaxis.F90	(revision 311)
+++ /XIOS/trunk/src/fortran/iaxis.F90	(revision 312)
@@ -5,12 +5,4 @@
    USE AXIS_INTERFACE
    USE AXISGROUP_INTERFACE
-   
-   TYPE XAxisHandle
-      INTEGER(kind = C_INTPTR_T) :: daddr
-   END TYPE XAxisHandle
-   
-   TYPE XAxisGroupHandle
-      INTEGER(kind = C_INTPTR_T) :: daddr
-   END TYPE XAxisGroupHandle
 
    TYPE txios(axis)
@@ -22,13 +14,4 @@
    END TYPE txios(axisgroup)
    
-   !----------------------------------------------------------------------------
-   INTERFACE set_axis_attributes
-      MODULE PROCEDURE set_axis_attributes_id,set_axis_attributes_hdl
-   END INTERFACE  
-   
-   INTERFACE set_axis_group_attributes
-      MODULE PROCEDURE set_axisgroup_attributes_id,set_axisgroup_attributes_hdl
-   END INTERFACE  
-   !----------------------------------------------------------------------------
 
          
@@ -199,132 +182,4 @@
 
    END FUNCTION  xios(is_valid_axisgroup)
-   
-
-
-
-!!!!!!!!!!!!! anciennes interfaces  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-   SUBROUTINE set_axis_attributes_id(axis_id, name_, standard_name_, long_name_, unit_, size_, zvalue_)
-      IMPLICIT NONE
-      TYPE(XAxisHandle)                                      :: axis_hdl
-      CHARACTER(len = *)                        , INTENT(IN) :: axis_id
-      CHARACTER(len = *)              , OPTIONAL, INTENT(IN) :: name_
-      CHARACTER(len = *)              , OPTIONAL, INTENT(IN) :: standard_name_
-      CHARACTER(len = *)              , OPTIONAL, INTENT(IN) :: long_name_
-      CHARACTER(len = *)              , OPTIONAL, INTENT(IN) :: unit_
-      INTEGER                         , OPTIONAL, INTENT(IN) :: size_
-      REAL    (kind = 8), dimension(*), OPTIONAL, INTENT(IN) :: zvalue_(:)
-      
-      CALL axis_handle_create(axis_hdl, axis_id)
-      CALL set_axis_attributes_hdl(axis_hdl, name_, standard_name_, long_name_, unit_, size_, zvalue_)
-
-   END SUBROUTINE set_axis_attributes_id
-
-   SUBROUTINE set_axis_attributes_hdl(axis_hdl, name_, standard_name_, long_name_, unit_, size_, zvalue_)
-      IMPLICIT NONE
-      TYPE(XAxisHandle)                         , INTENT(IN) :: axis_hdl
-      CHARACTER(len = *)              , OPTIONAL, INTENT(IN) :: name_
-      CHARACTER(len = *)              , OPTIONAL, INTENT(IN) :: standard_name_
-      CHARACTER(len = *)              , OPTIONAL, INTENT(IN) :: long_name_
-      CHARACTER(len = *)              , OPTIONAL, INTENT(IN) :: unit_
-      INTEGER                         , OPTIONAL, INTENT(IN) :: size_
-      REAL    (kind = 8), dimension(*), OPTIONAL, INTENT(IN) :: zvalue_(:)
-      
-      IF (PRESENT(name_))           THEN
-         CALL cxios_set_axis_name(axis_hdl%daddr, name_, len(name_))
-      END IF
-      IF (PRESENT(standard_name_))  THEN
-         CALL cxios_set_axis_standard_name(axis_hdl%daddr, standard_name_, len(standard_name_))
-      END IF
-      IF (PRESENT(long_name_))      THEN
-         CALL cxios_set_axis_long_name(axis_hdl%daddr, long_name_, len(long_name_))
-      END IF
-      IF (PRESENT(unit_))           THEN
-         CALL cxios_set_axis_unit(axis_hdl%daddr, unit_, len(unit_))
-      END IF
-      IF (PRESENT(size_))           THEN
-         CALL cxios_set_axis_size(axis_hdl%daddr, size_)
-      END IF
-      IF (PRESENT(zvalue_))         THEN
-         CALL cxios_set_axis_zvalue(axis_hdl%daddr, zvalue_, size(zvalue_, 1))
-      END IF
-   END SUBROUTINE set_axis_attributes_hdl
-   
-   SUBROUTINE set_axisgroup_attributes_id(axisgroup_id, name_, standard_name_, long_name_, unit_, size_, zvalue_)
-      IMPLICIT NONE
-      TYPE(XAxisGroupHandle)                                 :: axisgroup_hdl
-      CHARACTER(len = *)                        , INTENT(IN) :: axisgroup_id
-      CHARACTER(len = *)              , OPTIONAL, INTENT(IN) :: name_
-      CHARACTER(len = *)              , OPTIONAL, INTENT(IN) :: standard_name_
-      CHARACTER(len = *)              , OPTIONAL, INTENT(IN) :: long_name_
-      CHARACTER(len = *)              , OPTIONAL, INTENT(IN) :: unit_
-      INTEGER                         , OPTIONAL, INTENT(IN) :: size_
-      REAL    (kind = 8), dimension(*), OPTIONAL, INTENT(IN) :: zvalue_(:)
-      
-      CALL axisgroup_handle_create(axisgroup_hdl, axisgroup_id)
-      CALL set_axisgroup_attributes_hdl(axisgroup_hdl, name_, standard_name_, long_name_, unit_, size_, zvalue_)
-
-   END SUBROUTINE set_axisgroup_attributes_id
-   
-   SUBROUTINE set_axisgroup_attributes_hdl(axisgroup_hdl, name_, standard_name_, long_name_, unit_, size_, zvalue_)
-      IMPLICIT NONE
-      TYPE(XAxisGroupHandle)                    , INTENT(IN) :: axisgroup_hdl
-      CHARACTER(len = *)              , OPTIONAL, INTENT(IN) :: name_
-      CHARACTER(len = *)              , OPTIONAL, INTENT(IN) :: standard_name_
-      CHARACTER(len = *)              , OPTIONAL, INTENT(IN) :: long_name_
-      CHARACTER(len = *)              , OPTIONAL, INTENT(IN) :: unit_
-      INTEGER                         , OPTIONAL, INTENT(IN) :: size_
-      REAL    (kind = 8), dimension(*), OPTIONAL, INTENT(IN) :: zvalue_(:)
-      
-      IF (PRESENT(name_))           THEN
-         CALL cxios_set_axisgroup_name(axisgroup_hdl%daddr, name_, len(name_))
-      END IF
-      IF (PRESENT(standard_name_))  THEN
-         CALL cxios_set_axisgroup_standard_name(axisgroup_hdl%daddr, standard_name_, len(standard_name_))
-      END IF
-      IF (PRESENT(long_name_))      THEN
-         CALL cxios_set_axisgroup_long_name(axisgroup_hdl%daddr, long_name_, len(long_name_))
-      END IF
-      IF (PRESENT(unit_))           THEN
-         CALL cxios_set_axisgroup_unit(axisgroup_hdl%daddr, unit_, len(unit_))
-      END IF
-      IF (PRESENT(size_))           THEN
-         CALL cxios_set_axisgroup_size(axisgroup_hdl%daddr, size_)
-      END IF
-      IF (PRESENT(zvalue_))         THEN
-         CALL cxios_set_axisgroup_zvalue(axisgroup_hdl%daddr, zvalue_, size(zvalue_, 1))
-      END IF
-   END SUBROUTINE set_axisgroup_attributes_hdl
-
-   SUBROUTINE axis_handle_create(ret, idt)
-      IMPLICIT NONE
-      TYPE(XAxisHandle) , INTENT(OUT):: ret
-      CHARACTER(len = *), INTENT(IN) :: idt      
-      CALL cxios_axis_handle_create(ret%daddr, idt, len(idt))            
-   END SUBROUTINE axis_handle_create
-   
-   SUBROUTINE axisgroup_handle_create(ret, idt)
-      IMPLICIT NONE
-      TYPE(XAxisGroupHandle), INTENT(OUT):: ret
-      CHARACTER(len = *)    , INTENT(IN) :: idt      
-      CALL cxios_axisgroup_handle_create(ret%daddr, idt, len(idt))            
-   END SUBROUTINE axisgroup_handle_create
-
-   LOGICAL FUNCTION axis_valid_id(idt)
-      IMPLICIT NONE
-      CHARACTER(len  = *)    , INTENT(IN) :: idt
-      LOGICAL  (kind = 1)                 :: val
-      CALL cxios_axis_valid_id(val, idt, len(idt));
-      axis_valid_id = val
-   END FUNCTION  axis_valid_id
-
-   LOGICAL FUNCTION axisgroup_valid_id(idt)
-      IMPLICIT NONE
-      CHARACTER(len  = *)    , INTENT(IN) :: idt
-      LOGICAL  (kind = 1)                 :: val
-      CALL cxios_axisgroup_valid_id(val, idt, len(idt));
-      axisgroup_valid_id = val
-   END FUNCTION  axisgroup_valid_id
 
 END MODULE IAXIS
Index: /XIOS/trunk/src/fortran/iccontext.cpp
===================================================================
--- /XIOS/trunk/src/fortran/iccontext.cpp	(revision 311)
+++ /XIOS/trunk/src/fortran/iccontext.cpp	(revision 312)
@@ -81,63 +81,5 @@
    }
    
-   // ------------------------ CrÃ©ation de contexte ----------------------------
-   
-   void cxios_context_create(XContextPtr * context,
-                            const char  * context_id,
-                            int           context_id_size,
-                            XCalendarType calendar_type,
-                            int           year,
-                            int           month,
-                            int           day,
-                            int           hour,
-                            int           minute,
-                            int           second)
-   {
-      std::string context_id_str; 
-      if (!cstr2string(context_id, context_id_size, context_id_str)) return;
-      try
-      {
-         boost::shared_ptr<xmlioserver::tree::CContext> _context =
-            CTreeManager::CreateContext(context_id_str);
-         *context = _context.get();
-         switch(calendar_type)
-         {
-            case (D360)     :
-               _context->setCalendar(boost::shared_ptr<xmlioserver::date::CCalendar>
-                  (new xmlioserver::date::CD360Calendar
-                     (year, month, day, hour, minute, second)));
-               break;
-            case (ALLLEAP)  :
-               _context->setCalendar(boost::shared_ptr<xmlioserver::date::CCalendar>
-                  (new xmlioserver::date::CAllLeapCalendar
-                     (year, month, day, hour, minute, second)));
-               break;
-            case (NOLEAP)   :
-               _context->setCalendar(boost::shared_ptr<xmlioserver::date::CCalendar>
-                  (new xmlioserver::date::CNoLeapCalendar
-                     (year, month, day, hour, minute, second)));
-               break;
-            case (JULIAN)   :
-               _context->setCalendar(boost::shared_ptr<xmlioserver::date::CCalendar>
-                  (new xmlioserver::date::CJulianCalendar
-                     (year, month, day, hour, minute, second)));
-               break;
-            case (GREGORIAN):
-               _context->setCalendar(boost::shared_ptr<xmlioserver::date::CCalendar>
-                  (new xmlioserver::date::CGregorianCalendar
-                     (year, month, day, hour, minute, second)));
-                break;
-            default:
-               std::cerr << "Le calendrier n'est pas identifiÃ©" << std::endl;
-               exit (EXIT_FAILURE);
-         }
-      }
-      catch (xmlioserver::CException & exc)
-      {
-         std::cerr << exc.getMessage() << std::endl;
-         exit (EXIT_FAILURE);
-      }
-   }
-
+ 
    // -------------------- VÃ©rification des identifiants -----------------------
 
Index: /XIOS/trunk/src/fortran/icdata.cpp
===================================================================
--- /XIOS/trunk/src/fortran/icdata.cpp	(revision 311)
+++ /XIOS/trunk/src/fortran/icdata.cpp	(revision 312)
@@ -84,110 +84,5 @@
    }
 
-   
-   void cxios_dtreatment_start()
-   {
-      using namespace xmlioserver::tree;
-      using namespace xmlioserver;
-      try
-      {
-        MPI_Comm comm_client_server=comm::CMPIManager::GetCommClientServer() ;
-        MPI_Comm comm_server=comm::CMPIManager::GetCommServer() ;
-        
-         boost::shared_ptr<CContext> context =
-            CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId());
-                
-         StdOStringStream oss;
-         oss << StdString("def_client_next.")
-             << CMPIManager::GetCommRank(CMPIManager::GetCommClient());
-         CTreeManager::PrintTreeToFile(oss.str());
-         oss.str("");
-         boost::shared_ptr<CDataTreatment> dt(new CDataTreatment (context));
-         context->setDataTreatment(dt);
-
-         oss << StdString("def_client_end.")
-             << CMPIManager::GetCommRank(CMPIManager::GetCommClient());
-         CTreeManager::PrintTreeToFile(oss.str());
-
-         if ( !comm::CMPIManager::IsConnected() )
-         {
-            MPI_Request request = 0;
-            StdOStringStream ostrs;
-
-            CTreeManager::ToBinary(ostrs);
-            CLinearBuffer lbuffer(ostrs.str().size()+CBuffer::getDataHeaderSize());
-            lbuffer.appendString(ostrs.str());
-            CMPIManager::SendLinearBuffer(comm_client_server, 0, lbuffer, request);
-            CMPIManager::Wait(request);  // Pas encore en mode RPC
-               
-               
-            CXIOSManager::RunClient(false, CMPIManager::GetCommClient());
-            CClient::CreateClient(CMPIManager::GetCommClientServer());
-         }
-         else
-         {
-            dt->createDataOutput<CNc4DataOutput>(CMPIManager::GetCommClient());
-         }
-      }
-      catch (CException & exc)
-      {
-         std::cerr << exc.getMessage() << std::endl;
-         exit (EXIT_FAILURE);
-      }
-   }
-   
-   void cxios_dtreatment_end(void)
-   {
-      try
-      {
-         boost::shared_ptr<xmlioserver::tree::CContext> context =
-         xmlioserver::CObjectFactory::GetObject<xmlioserver::tree::CContext>
-            (CObjectFactory::GetCurrentContextId());
-         boost::shared_ptr<xmlioserver::data::CDataTreatment> dtreat = context->getDataTreatment();
-         dtreat->finalize();
-         
-//         CMPIManager::Finalize();
-      }
-      catch (CException & exc)
-      {
-         std::cerr << exc.getMessage() << std::endl;
-         exit (EXIT_FAILURE);
-      }
-   }
-
-   // ---------------------- Finalize du serveur -------------------------
-
-   void cxios_finalize_ioserver(void)
-   {
-      try
-      {
-         CMPIManager::Finalize();
-      }
-      catch (CException & exc)
-      {
-         std::cerr << exc.getMessage() << std::endl;
-         exit (EXIT_FAILURE);
-      }
-    }
-
-   // ---------------------- Initialisation du serveur -------------------------
-
-   void cxios_init_ioserver(MPIComm * f_comm_client, MPIComm * f_comm_parent)
-   {
-      try
-      {
-         MPI_Comm comm_client_server, comm_server,comm_client,comm_parent;
-         xmlioserver::CTreeManager::ParseFile("iodef.xml");
-         CTreeManager::SetCurrentContextId(StdString("xios"));
-         CMPIManager::InitialiseClient(NULL, NULL);
-         comm_parent=MPI_Comm_f2c(*f_comm_parent) ;
-         CMPIManager::DispatchClient(false, comm_client, comm_client_server, comm_server,comm_parent);
-         *f_comm_client=MPI_Comm_c2f(comm_client) ;
-      }
-      catch (CException & exc)
-      {
-         std::cerr << exc.getMessage() << std::endl;
-         exit (EXIT_FAILURE);
-      }
-   }
+ 
    
    // ---------------------- Ecriture des donnÃ©es ------------------------------
Index: /XIOS/trunk/src/fortran/icdomain.cpp
===================================================================
--- /XIOS/trunk/src/fortran/icdomain.cpp	(revision 311)
+++ /XIOS/trunk/src/fortran/icdomain.cpp	(revision 312)
@@ -172,28 +172,4 @@
    }
    
-   void cxios_set_domain_zoom_ni_loc(XDomainPtr domain_hdl, int zoom_ni_loc)
-   {
-      domain_hdl->zoom_ni_loc.setValue(zoom_ni_loc);
-      domain_hdl->sendAttributToServer(domain_hdl->zoom_ni_loc) ; 
-   }
-   
-   void cxios_set_domain_zoom_nj_loc(XDomainPtr domain_hdl, int zoom_nj_loc)
-   {
-      domain_hdl->zoom_nj_loc.setValue(zoom_nj_loc);
-      domain_hdl->sendAttributToServer(domain_hdl->zoom_nj_loc) ; 
-   }
-   
-   void cxios_set_domain_zoom_ibegin_loc(XDomainPtr domain_hdl, int zoom_ibegin_loc)
-   {
-      domain_hdl->zoom_ibegin_loc.setValue(zoom_ibegin_loc);
-      domain_hdl->sendAttributToServer(domain_hdl->zoom_ibegin_loc) ; 
-   }
-   
-   void cxios_set_domain_zoom_jbegin_loc(XDomainPtr domain_hdl, int zoom_jbegin_loc)
-   {
-      domain_hdl->zoom_jbegin_loc.setValue(zoom_jbegin_loc);
-      domain_hdl->sendAttributToServer(domain_hdl->zoom_jbegin_loc) ; 
-   }
-   
    void cxios_set_domain_data_n_index(XDomainPtr domain_hdl, int data_n_index)
    {
@@ -389,28 +365,4 @@
    }
    
-   void cxios_set_domaingroup_zoom_ni_loc(XDomainGroupPtr domaingroup_hdl, int zoom_ni_loc)
-   {
-      domaingroup_hdl->zoom_ni_loc.setValue(zoom_ni_loc);
-      domaingroup_hdl->sendAttributToServer(domaingroup_hdl->zoom_ni_loc) ;
-   }
-   
-   void cxios_set_domaingroup_zoom_nj_loc(XDomainGroupPtr domaingroup_hdl, int zoom_nj_loc)
-   {
-      domaingroup_hdl->zoom_nj_loc.setValue(zoom_nj_loc);
-      domaingroup_hdl->sendAttributToServer(domaingroup_hdl->zoom_nj_loc) ;
-   }
-   
-   void cxios_set_domaingroup_zoom_ibegin_loc(XDomainGroupPtr domaingroup_hdl, int zoom_ibegin_loc)
-   {
-      domaingroup_hdl->zoom_ibegin_loc.setValue(zoom_ibegin_loc);
-      domaingroup_hdl->sendAttributToServer(domaingroup_hdl->zoom_ibegin_loc) ;
-   }
-   
-   void cxios_set_domaingroup_zoom_jbegin_loc(XDomainGroupPtr domaingroup_hdl, int zoom_jbegin_loc)
-   {
-      domaingroup_hdl->zoom_jbegin_loc.setValue(zoom_jbegin_loc);
-      domaingroup_hdl->sendAttributToServer(domaingroup_hdl->zoom_jbegin_loc) ;
-   }
-   
    void cxios_set_domaingroup_data_n_index(XDomainGroupPtr domaingroup_hdl, int data_n_index)
    {
Index: /XIOS/trunk/src/fortran/icontext.F90
===================================================================
--- /XIOS/trunk/src/fortran/icontext.F90	(revision 311)
+++ /XIOS/trunk/src/fortran/icontext.F90	(revision 312)
@@ -6,7 +6,4 @@
    USE IDATE
 
-   TYPE XContextHandle
-      INTEGER(kind = C_INTPTR_T) :: daddr
-   END TYPE XContextHandle
     
    TYPE txios(context)
@@ -14,9 +11,4 @@
    END TYPE txios(context)
       
-   !----------------------------------------------------------------------------
-   INTERFACE set_context_attributes
-      MODULE PROCEDURE set_context_attributes_id,set_context_attributes_hdl
-   END INTERFACE  
-   !----------------------------------------------------------------------------
    
    CONTAINS ! Fonctions disponibles pour les utilisateurs.
@@ -100,21 +92,5 @@
 
    END SUBROUTINE xios(set_current_context)
-   
-   
-!   SUBROUTINE context_create(context_hdl, context_id, calendar_type, init_date)
-!      TYPE(XContextHandle)          , INTENT(OUT) :: context_hdl
-!      CHARACTER(len = *)            , INTENT(IN)  :: context_id
-!      INTEGER                       , INTENT(IN)  :: calendar_type
-!      TYPE(XDate)         , OPTIONAL, INTENT(IN)  :: init_date
-!     IF (PRESENT(init_date)) THEN
-!         CALL cxios_context_create(context_hdl%daddr, context_id, len(context_id), calendar_type, &
-!                                  init_date%year, init_date%month, init_date%day, &
-!                                  init_date%hour, init_date%minute, init_date%second)
-!      ELSE
-!         CALL cxios_context_create(context_hdl%daddr, context_id, len(context_id), calendar_type, &
-!                                 0, 1, 1, 0, 0, 0)
-!      END IF
-!   END SUBROUTINE context_create
-
+ 
    LOGICAL FUNCTION xios(is_valid_context)(idt)
       IMPLICIT NONE
@@ -127,98 +103,4 @@
    END FUNCTION  xios(is_valid_context)
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-!!!!!!!! ancienne interface
-
-   SUBROUTINE set_context_attributes_id( context_id, calendar_type_, start_date_, output_dir_)
-      IMPLICIT NONE
-      TYPE(XContextHandle)                       :: context_hdl
-      CHARACTER(len = *)            , INTENT(IN) :: context_id
-      CHARACTER(len = *)  , OPTIONAL, INTENT(IN) :: calendar_type_
-      CHARACTER(len = *)  , OPTIONAL, INTENT(IN) :: start_date_
-      CHARACTER(len = *)  , OPTIONAL, INTENT(IN) :: output_dir_
-         
-      CALL context_handle_create(context_hdl, context_id)
-      CALL set_context_attributes_hdl( context_hdl, calendar_type_, start_date_, output_dir_)
-   END SUBROUTINE set_context_attributes_id
-
-   SUBROUTINE set_context_attributes_hdl( context_hdl, calendar_type_, start_date_, output_dir_)
-      IMPLICIT NONE
-      TYPE(XContextHandle)          , INTENT(IN) :: context_hdl
-      CHARACTER(len = *)  , OPTIONAL, INTENT(IN) :: calendar_type_
-      CHARACTER(len = *)  , OPTIONAL, INTENT(IN) :: start_date_
-      CHARACTER(len = *)  , OPTIONAL, INTENT(IN) :: output_dir_   
-         
-      IF (PRESENT(calendar_type_)) THEN
-         CALL cxios_set_context_calendar_type(context_hdl%daddr, calendar_type_, len(calendar_type_))
-      END IF
-      IF (PRESENT(start_date_))    THEN
-         CALL cxios_set_context_start_date(context_hdl%daddr, start_date_, len(start_date_))
-      END IF
-      IF (PRESENT(output_dir_))    THEN
-         CALL cxios_set_context_output_dir(context_hdl%daddr, output_dir_, len(output_dir_))
-      END IF
-   END SUBROUTINE set_context_attributes_hdl
-
-   SUBROUTINE context_handle_create(ret, idt)
-      IMPLICIT NONE
-      TYPE(XContextHandle), INTENT(OUT):: ret
-      CHARACTER(len = *)  , INTENT(IN) :: idt      
-      CALL cxios_context_handle_create(ret%daddr, idt, len(idt))            
-   END SUBROUTINE context_handle_create
-   
-   SUBROUTINE context_set_current(context, withswap)
-      TYPE(XContextHandle)          , INTENT(IN) :: context
-      LOGICAL             , OPTIONAL, INTENT(IN) :: withswap
-      LOGICAL (kind = 1)                       :: wswap
-      IF (PRESENT(withswap)) THEN
-         wswap = withswap
-      ELSE
-         wswap = .FALSE.
-      END IF
-      CALL cxios_context_set_current(context%daddr, wswap)
-   END SUBROUTINE context_set_current
-   
-   SUBROUTINE context_create(context_hdl, context_id, calendar_type, init_date)
-      TYPE(XContextHandle)          , INTENT(OUT) :: context_hdl
-      CHARACTER(len = *)            , INTENT(IN)  :: context_id
-      INTEGER                       , INTENT(IN)  :: calendar_type
-      TYPE(XDate)         , OPTIONAL, INTENT(IN)  :: init_date
-      IF (PRESENT(init_date)) THEN
-         CALL cxios_context_create(context_hdl%daddr, context_id, len(context_id), calendar_type, &
-                                  init_date%year, init_date%month, init_date%day, &
-                                  init_date%hour, init_date%minute, init_date%second)
-      ELSE
-         CALL cxios_context_create(context_hdl%daddr, context_id, len(context_id), calendar_type, &
-                                 0, 1, 1, 0, 0, 0)
-      END IF
-   END SUBROUTINE context_create
-
-   LOGICAL FUNCTION context_valid_id(idt)
-      IMPLICIT NONE
-      CHARACTER(len  = *)    , INTENT(IN) :: idt
-      LOGICAL  (kind = 1)                 :: val
-      CALL cxios_context_valid_id(val, idt, len(idt));
-      context_valid_id = val
-   END FUNCTION  context_valid_id
-
-
    
 END MODULE ICONTEXT
Index: /XIOS/trunk/src/fortran/idata.F90
===================================================================
--- /XIOS/trunk/src/fortran/idata.F90	(revision 311)
+++ /XIOS/trunk/src/fortran/idata.F90	(revision 312)
@@ -34,24 +34,9 @@
       END SUBROUTINE cxios_context_finalize
      
-      SUBROUTINE  cxios_init_ioserver(comm_client,comm_parent) BIND(C)
-         USE ISO_C_BINDING
-         INTEGER  (kind = C_INT) :: comm_client
-         INTEGER  (kind = C_INT) :: comm_parent
-      END SUBROUTINE cxios_init_ioserver
-
-      SUBROUTINE  cxios_finalize_ioserver BIND(C)
-      END SUBROUTINE cxios_finalize_ioserver
  
       SUBROUTINE  cxios_finalize BIND(C)
       END SUBROUTINE cxios_finalize
 
-      SUBROUTINE cxios_dtreatment_start() BIND(C)
-         USE ISO_C_BINDING
-      END SUBROUTINE cxios_dtreatment_start
-
-      SUBROUTINE cxios_dtreatment_end() BIND(C)
-         ! Sans argument
-      END SUBROUTINE cxios_dtreatment_end
-
+ 
       SUBROUTINE cxios_write_data_k81(fieldid, fieldid_size, data_k8, data_Xsize) BIND(C)
          USE ISO_C_BINDING
@@ -104,7 +89,4 @@
    END INTERFACE
    
-   INTERFACE write_data
-      MODULE PROCEDURE write_data_k81,write_data_k82,write_data_k83,write_data_k41,write_data_k42,write_data_k43
-   END INTERFACE
    
    CONTAINS ! Fonctions disponibles pour les utilisateurs.
@@ -210,91 +192,4 @@
    END SUBROUTINE xios(send_field_r4_3d)
    
-
-
-
-!!!!!!!!!!!!!! anciennes Interfaces !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-   SUBROUTINE  init_ioserver(local_comm,return_comm )
-   IMPLICIT NONE
-   INCLUDE 'mpif.h'
-      INTEGER, INTENT(OUT),OPTIONAL :: return_comm
-      INTEGER, INTENT(IN),OPTIONAL :: local_comm
-
-      INTEGER  :: comm_client
-      INTEGER  :: comm_parent
-      
-      IF (PRESENT(local_comm)) THEN
-        comm_parent=local_comm
-      ELSE
-        comm_parent=MPI_COMM_WORLD
-      ENDIF
-      
-      CALL cxios_init_ioserver(comm_client,comm_parent)
-      IF (PRESENT(return_comm)) return_comm=comm_client ;
-
-    END SUBROUTINE  init_ioserver
-
-   SUBROUTINE  finalize_ioserver
-   IMPLICIT NONE
-
-      CALL cxios_finalize_ioserver
-
-    END SUBROUTINE  finalize_ioserver
-
-   
-   SUBROUTINE dtreatment_start(context_hdl, filetype)
-      TYPE(XContextHandle), INTENT(IN)           :: context_hdl
-      INTEGER             , INTENT(IN), OPTIONAL :: filetype 
-      INTEGER                                    :: filetype_
-      IF (PRESENT(filetype)) THEN
-         filetype_ = filetype
-      ELSE
-         filetype_ = NETCDF4
-      END IF
-      CALL context_set_current(context_hdl)
-      CALL cxios_dtreatment_start()
-   END SUBROUTINE dtreatment_start
-   
-   SUBROUTINE dtreatment_end(context_hdl)
-      TYPE(XContextHandle), INTENT(IN), OPTIONAL :: context_hdl
-      CALL cxios_dtreatment_end()
-   END SUBROUTINE dtreatment_end
-   
-   SUBROUTINE write_data_k81(fieldid, data1d_k8)
-      CHARACTER(len = *)               , INTENT(IN) :: fieldid
-      REAL     (kind = 8), DIMENSION(*), INTENT(IN) :: data1d_k8(:)
-      CALL cxios_write_data_k81(fieldid, len(fieldid), data1d_k8, size(data1d_k8, 1))
-   END SUBROUTINE write_data_k81
-   
-   SUBROUTINE write_data_k82(fieldid, data2d_k8)
-      CHARACTER(len = *)               , INTENT(IN) :: fieldid
-      REAL     (kind = 8), DIMENSION(*), INTENT(IN) :: data2d_k8(:,:)
-      CALL cxios_write_data_k82(fieldid, len(fieldid), data2d_k8, size(data2d_k8, 1), size(data2d_k8, 2))
-   END SUBROUTINE write_data_k82
-   
-   SUBROUTINE write_data_k83(fieldid, data3d_k8)
-      CHARACTER(len = *)               , INTENT(IN) :: fieldid
-      REAL     (kind = 8), DIMENSION(*), INTENT(IN) :: data3d_k8(:,:,:)
-      CALL cxios_write_data_k83(fieldid, len(fieldid), data3d_k8, size(data3d_k8, 1), size(data3d_k8, 2), size(data3d_k8, 3))
-   END SUBROUTINE write_data_k83
-   
-   SUBROUTINE write_data_k41(fieldid, data1d_k4)
-      CHARACTER(len = *)               , INTENT(IN) :: fieldid
-      REAL     (kind = 4), DIMENSION(*), INTENT(IN) :: data1d_k4(:)
-      CALL cxios_write_data_k41(fieldid, len(fieldid), data1d_k4, size(data1d_k4, 1))
-   END SUBROUTINE write_data_k41
-   
-   SUBROUTINE write_data_k42(fieldid, data2d_k4)
-      CHARACTER(len = *)               , INTENT(IN) :: fieldid
-      REAL     (kind = 4), DIMENSION(*), INTENT(IN) :: data2d_k4(:,:)
-      CALL cxios_write_data_k42(fieldid, len(fieldid), data2d_k4, size(data2d_k4, 1), size(data2d_k4, 2))
-   END SUBROUTINE write_data_k42
-   
-   SUBROUTINE write_data_k43(fieldid, data3d_k4)
-      CHARACTER(len = *)               , INTENT(IN) :: fieldid
-      REAL     (kind = 4), DIMENSION(*), INTENT(IN) :: data3d_k4(:,:,:)
-      CALL cxios_write_data_k43(fieldid, len(fieldid), data3d_k4, size(data3d_k4, 1), size(data3d_k4, 2), size(data3d_k4, 3))
-   END SUBROUTINE write_data_k43
    
 END MODULE IDATA
Index: /XIOS/trunk/src/fortran/idate.F90
===================================================================
--- /XIOS/trunk/src/fortran/idate.F90	(revision 311)
+++ /XIOS/trunk/src/fortran/idate.F90	(revision 312)
@@ -5,12 +5,4 @@
    ! enum XCalendarType
    INTEGER(kind = C_INT), PARAMETER :: D360 = 0 , ALLLEAP = 1 , NOLEAP = 2 , JULIAN = 3 , GREGORIAN = 4
-
-   TYPE XDate
-      INTEGER :: year, month, day, hour, minute, second
-   END TYPE XDate
-
-   TYPE XDuration
-      REAL(kind = 8) :: year, month, day, hour, minute, second
-   END TYPE XDuration
 
    TYPE txios(date)
@@ -63,22 +55,4 @@
    END SUBROUTINE xios(update_calendar)
 
-
-!!!!!!!!!!!! anciennes interfaces !!!!!!!!!!!!!!!!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   
-   SUBROUTINE set_timestep(timestep)
-      TYPE(XDuration), INTENT(IN):: timestep
-      CALL cxios_set_timestep(timestep%year, timestep%month , timestep%day, &
-                             timestep%hour, timestep%minute, timestep%second)
-   END SUBROUTINE set_timestep
-   
-   SUBROUTINE update_calendar(step)
-      INTEGER, INTENT(IN):: step
-      IF (step < 0) THEN
-         PRINT *, "L'argument 'step' ne peut Ãªtre nÃ©gatif"
-         STOP
-      END IF
-      CALL cxios_update_calendar(step)
-   END SUBROUTINE update_calendar
    
 END MODULE IDATE
Index: /XIOS/trunk/src/fortran/idomain.F90
===================================================================
--- /XIOS/trunk/src/fortran/idomain.F90	(revision 311)
+++ /XIOS/trunk/src/fortran/idomain.F90	(revision 312)
@@ -6,12 +6,4 @@
    USE DOMAINGROUP_INTERFACE
    
-   TYPE XDomainHandle
-      INTEGER(kind = C_INTPTR_T) :: daddr
-   END TYPE XDomainHandle
-   
-   TYPE XDomainGroupHandle
-      INTEGER(kind = C_INTPTR_T) :: daddr
-   END TYPE XDomainGroupHandle
-
    TYPE txios(domain)
       INTEGER(kind = C_INTPTR_T) :: daddr
@@ -22,13 +14,4 @@
    END TYPE txios(domaingroup)
    
-   !----------------------------------------------------------------------------
-   INTERFACE set_domain_attributes
-      MODULE PROCEDURE set_domain_attributes_id,set_domain_attributes_hdl
-   END INTERFACE  
-   
-   INTERFACE set_domain_group_attributes
-      MODULE PROCEDURE set_domaingroup_attributes_id,set_domaingroup_attributes_hdl
-   END INTERFACE  
-   !----------------------------------------------------------------------------
    
    CONTAINS ! Fonctions disponibles pour les utilisateurs.
@@ -38,6 +21,6 @@
    ( domaingroup_id, name, standard_name, long_name, domain_group_ref, ni_glo, nj_glo, ibegin, iend,       &
      ni, jbegin, jend, nj, mask, data_dim, data_ni, data_nj, data_ibegin, data_jbegin,                     &
-     zoom_ni, zoom_nj, zoom_ibegin, zoom_jbegin, zoom_ni_loc, zoom_nj_loc, zoom_ibegin_loc,                &
-     zoom_jbegin_loc, data_n_index, data_i_index, data_j_index, lonvalue, latvalue)
+     zoom_ni, zoom_nj, zoom_ibegin, zoom_jbegin, data_n_index, data_i_index, data_j_index,                 &
+     lonvalue, latvalue)
       IMPLICIT NONE
       TYPE(txios(domaingroup))                              :: domaingroup_hdl
@@ -65,8 +48,4 @@
       INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_ibegin
       INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_jbegin
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_ni_loc
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_nj_loc
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_ibegin_loc
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_jbegin_loc
       INTEGER                        , OPTIONAL, INTENT(IN) :: data_n_index
       INTEGER       , dimension(*)   , OPTIONAL, INTENT(IN) :: data_i_index(:)
@@ -79,6 +58,6 @@
    ( domaingroup_hdl, name, standard_name, long_name, domain_group_ref, ni_glo, nj_glo, ibegin, iend,      &
      ni, jbegin, jend, nj, mask, data_dim, data_ni, data_nj, data_ibegin, data_jbegin,                     &
-     zoom_ni, zoom_nj, zoom_ibegin, zoom_jbegin, zoom_ni_loc, zoom_nj_loc, zoom_ibegin_loc,                &
-     zoom_jbegin_loc, data_n_index, data_i_index, data_j_index, lonvalue, latvalue)
+     zoom_ni, zoom_nj, zoom_ibegin, zoom_jbegin, data_n_index, data_i_index, data_j_index,                 &
+     lonvalue, latvalue)
 
    END SUBROUTINE xios(set_domaingroup_attr)
@@ -87,6 +66,6 @@
    ( domaingroup_hdl,name, standard_name, long_name, domain_group_ref, ni_glo, nj_glo, ibegin, iend,       &
      ni, jbegin, jend, nj, mask, data_dim, data_ni, data_nj, data_ibegin, data_jbegin,                     &
-     zoom_ni, zoom_nj, zoom_ibegin, zoom_jbegin, zoom_ni_loc, zoom_nj_loc, zoom_ibegin_loc,                &
-     zoom_jbegin_loc, data_n_index, data_i_index, data_j_index, lonvalue, latvalue)
+     zoom_ni, zoom_nj, zoom_ibegin, zoom_jbegin, data_n_index, data_i_index,                               &
+     data_j_index, lonvalue, latvalue)
       IMPLICIT NONE
       TYPE(txios(domaingroup))             , INTENT(IN) :: domaingroup_hdl
@@ -113,8 +92,4 @@
       INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_ibegin
       INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_jbegin
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_ni_loc
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_nj_loc
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_ibegin_loc
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_jbegin_loc
       INTEGER                          , OPTIONAL, INTENT(IN) :: data_n_index
       INTEGER       , dimension(*)     , OPTIONAL, INTENT(IN) :: data_i_index(:)
@@ -123,9 +98,9 @@
       REAL(kind = 8), dimension(*)     , OPTIONAL, INTENT(IN) :: latvalue(:)   
 
-      CALL xios(set_domaingroup_attr_hdl_)                                                                  &
-   ( domaingroup_hdl,name, standard_name, long_name, domain_group_ref, ni_glo, nj_glo, ibegin, iend,       &
+      CALL xios(set_domaingroup_attr_hdl_)                                                               &
+   ( domaingroup_hdl,name, standard_name, long_name, domain_group_ref, ni_glo, nj_glo, ibegin, iend,     &
      ni, jbegin, jend, nj, mask, data_dim, data_ni, data_nj, data_ibegin, data_jbegin,                   &
-     zoom_ni, zoom_nj, zoom_ibegin, zoom_jbegin, zoom_ni_loc, zoom_nj_loc, zoom_ibegin_loc,                 &
-     zoom_jbegin_loc, data_n_index, data_i_index, data_j_index, lonvalue, latvalue)
+     zoom_ni, zoom_nj, zoom_ibegin, zoom_jbegin, data_n_index, data_i_index, data_j_index,               &
+     lonvalue, latvalue)
 
     END SUBROUTINE xios(set_domaingroup_attr_hdl)
@@ -134,6 +109,6 @@
    ( domaingroup_hdl, name_, standard_name_, long_name_, domain_group_ref_, ni_glo_, nj_glo_, ibegin_, iend_,       &
      ni_, jbegin_, jend_, nj_, mask_, data_dim_, data_ni_, data_nj_, data_ibegin_, data_jbegin_,                   &
-     zoom_ni_, zoom_nj_, zoom_ibegin_, zoom_jbegin_, zoom_ni_loc_, zoom_nj_loc_, zoom_ibegin_loc_,                 &
-     zoom_jbegin_loc_, data_n_index_, data_i_index_, data_j_index_, lonvalue_, latvalue_)
+     zoom_ni_, zoom_nj_, zoom_ibegin_, zoom_jbegin_, data_n_index_, data_i_index_, data_j_index_,                  &
+     lonvalue_, latvalue_)
       IMPLICIT NONE
       TYPE(txios(domaingroup))             , INTENT(IN) :: domaingroup_hdl
@@ -161,8 +136,4 @@
       INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_ibegin_
       INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_jbegin_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_ni_loc_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_nj_loc_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_ibegin_loc_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_jbegin_loc_
       INTEGER                          , OPTIONAL, INTENT(IN) :: data_n_index_
       INTEGER       , dimension(*)     , OPTIONAL, INTENT(IN) :: data_i_index_(:)
@@ -240,16 +211,5 @@
          CALL cxios_set_domaingroup_zoom_jbegin(domaingroup_hdl%daddr, zoom_jbegin_)
       END IF
-      IF (PRESENT(zoom_ni_loc_))      THEN
-         CALL cxios_set_domaingroup_zoom_ni_loc(domaingroup_hdl%daddr, zoom_ni_loc_)
-      END IF   
-      IF (PRESENT(zoom_nj_loc_))      THEN
-         CALL cxios_set_domaingroup_zoom_nj_loc(domaingroup_hdl%daddr, zoom_nj_loc_)
-      END IF
-      IF (PRESENT(zoom_ibegin_loc_))  THEN
-         CALL cxios_set_domaingroup_zoom_ibegin_loc(domaingroup_hdl%daddr, zoom_ibegin_loc_)
-      END IF
-      IF (PRESENT(zoom_jbegin_loc_))  THEN
-         CALL cxios_set_domaingroup_zoom_jbegin_loc(domaingroup_hdl%daddr, zoom_jbegin_loc_)
-      END IF
+
       IF (PRESENT(data_n_index_))     THEN
          CALL cxios_set_domaingroup_data_n_index(domaingroup_hdl%daddr, data_n_index_)
@@ -274,7 +234,8 @@
    ( domain_id, name, standard_name, long_name, domain_group_ref, ni_glo, nj_glo, ibegin, iend,    &
      ni, jbegin, jend, nj, mask, data_dim, data_ni, data_nj, data_ibegin, data_jbegin,             &
-     zoom_ni, zoom_nj, zoom_ibegin, zoom_jbegin, zoom_ni_loc, zoom_nj_loc, zoom_ibegin_loc,        &
-     zoom_jbegin_loc, data_n_index, data_i_index, data_j_index, lonvalue, latvalue)
-      IMPLICIT NONE
+     zoom_ni, zoom_nj, zoom_ibegin, zoom_jbegin, data_n_index, data_i_index, data_j_index,         &
+     lonvalue, latvalue)
+      IMPLICIT NONE
+     
       TYPE(txios(domain))                                   :: domain_hdl
       CHARACTER(len = *)                       , INTENT(IN) :: domain_id
@@ -301,8 +262,4 @@
       INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_ibegin
       INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_jbegin
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_ni_loc
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_nj_loc
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_ibegin_loc
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_jbegin_loc
       INTEGER                        , OPTIONAL, INTENT(IN) :: data_n_index
       INTEGER       , dimension(*)   , OPTIONAL, INTENT(IN) :: data_i_index(:)
@@ -312,19 +269,20 @@
  
       CALL xios(get_domain_handle)(domain_id,domain_hdl)
-      CALL xios(set_domain_attr_hdl_)                                                                     &
+      CALL xios(set_domain_attr_hdl_)                                                               &
    ( domain_hdl, name, standard_name, long_name, domain_group_ref, ni_glo, nj_glo, ibegin, iend,    &
      ni, jbegin, jend, nj, mask, data_dim, data_ni, data_nj, data_ibegin, data_jbegin,              &
-     zoom_ni, zoom_nj, zoom_ibegin, zoom_jbegin, zoom_ni_loc, zoom_nj_loc, zoom_ibegin_loc,         &
-     zoom_jbegin_loc, data_n_index, data_i_index, data_j_index, lonvalue, latvalue)
+     zoom_ni, zoom_nj, zoom_ibegin, zoom_jbegin, data_n_index, data_i_index, data_j_index,          &
+     lonvalue, latvalue)
 
    END SUBROUTINE xios(set_domain_attr)
 
 
-   SUBROUTINE xios(set_domain_attr_hdl)                                                             &
+   SUBROUTINE xios(set_domain_attr_hdl)                                                            &
    ( domain_hdl,name, standard_name, long_name, domain_group_ref, ni_glo, nj_glo, ibegin, iend,    &
      ni, jbegin, jend, nj, mask, data_dim, data_ni, data_nj, data_ibegin, data_jbegin,             &
-     zoom_ni, zoom_nj, zoom_ibegin, zoom_jbegin, zoom_ni_loc, zoom_nj_loc, zoom_ibegin_loc,        &
-     zoom_jbegin_loc, data_n_index, data_i_index, data_j_index, lonvalue, latvalue)
-      IMPLICIT NONE
+     zoom_ni, zoom_nj, zoom_ibegin, zoom_jbegin, data_n_index, data_i_index,                       &
+     data_j_index, lonvalue, latvalue)
+      IMPLICIT NONE
+     
       TYPE(txios(domain))                       , INTENT(IN) :: domain_hdl
       CHARACTER(len = *)               , OPTIONAL, INTENT(IN) :: name
@@ -350,8 +308,4 @@
       INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_ibegin
       INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_jbegin
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_ni_loc
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_nj_loc
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_ibegin_loc
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_jbegin_loc
       INTEGER                          , OPTIONAL, INTENT(IN) :: data_n_index
       INTEGER       , dimension(*)     , OPTIONAL, INTENT(IN) :: data_i_index(:)
@@ -363,14 +317,15 @@
    ( domain_hdl,name, standard_name, long_name, domain_group_ref, ni_glo, nj_glo, ibegin, iend,   &
      ni, jbegin, jend, nj, mask, data_dim, data_ni, data_nj, data_ibegin, data_jbegin,            &
-     zoom_ni, zoom_nj, zoom_ibegin, zoom_jbegin, zoom_ni_loc, zoom_nj_loc, zoom_ibegin_loc,       &
-     zoom_jbegin_loc, data_n_index, data_i_index, data_j_index, lonvalue, latvalue)
+     zoom_ni, zoom_nj, zoom_ibegin, zoom_jbegin, data_n_index, data_i_index, data_j_index,        &
+     lonvalue, latvalue)
      
    END SUBROUTINE xios(set_domain_attr_hdl)
        
-   SUBROUTINE xios(set_domain_attr_hdl_)                                                                  &
+   SUBROUTINE xios(set_domain_attr_hdl_)                                                                 &
    ( domain_hdl,name_, standard_name_, long_name_, domain_group_ref_, ni_glo_, nj_glo_, ibegin_, iend_,  &
      ni_, jbegin_, jend_, nj_, mask_, data_dim_, data_ni_, data_nj_, data_ibegin_, data_jbegin_,         &
-     zoom_ni_, zoom_nj_, zoom_ibegin_, zoom_jbegin_, zoom_ni_loc_, zoom_nj_loc_, zoom_ibegin_loc_,       &
-     zoom_jbegin_loc_, data_n_index_, data_i_index_, data_j_index_, lonvalue_, latvalue_)
+     zoom_ni_, zoom_nj_, zoom_ibegin_, zoom_jbegin_, data_n_index_, data_i_index_, data_j_index_,        &
+     lonvalue_, latvalue_)
+
       IMPLICIT NONE
       TYPE(txios(domain))                       , INTENT(IN) :: domain_hdl
@@ -398,8 +353,4 @@
       INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_ibegin_
       INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_jbegin_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_ni_loc_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_nj_loc_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_ibegin_loc_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_jbegin_loc_
       INTEGER                          , OPTIONAL, INTENT(IN) :: data_n_index_
       INTEGER       , dimension(*)     , OPTIONAL, INTENT(IN) :: data_i_index_(:)
@@ -476,16 +427,4 @@
          CALL cxios_set_domain_zoom_jbegin(domain_hdl%daddr, zoom_jbegin_)
       END IF
-      IF (PRESENT(zoom_ni_loc_))      THEN
-         CALL cxios_set_domain_zoom_ni_loc(domain_hdl%daddr, zoom_ni_loc_)
-      END IF   
-      IF (PRESENT(zoom_nj_loc_))      THEN
-         CALL cxios_set_domain_zoom_nj_loc(domain_hdl%daddr, zoom_nj_loc_)
-      END IF
-      IF (PRESENT(zoom_ibegin_loc_))  THEN
-         CALL cxios_set_domain_zoom_ibegin_loc(domain_hdl%daddr, zoom_ibegin_loc_)
-      END IF
-      IF (PRESENT(zoom_jbegin_loc_))  THEN
-         CALL cxios_set_domain_zoom_jbegin_loc(domain_hdl%daddr, zoom_jbegin_loc_)
-      END IF
       IF (PRESENT(data_n_index_))     THEN
          CALL cxios_set_domain_data_n_index(domain_hdl%daddr, data_n_index_)
@@ -541,442 +480,4 @@
       xios(is_valid_domaingroup) = val
    END FUNCTION  xios(is_valid_domaingroup)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-!!!!!!!!!!!! Ancienne interfaces !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   
-   SUBROUTINE set_domaingroup_attributes_id                                                                        &
-   ( domaingroup_id, name_, standard_name_, long_name_, domain_group_ref_, ni_glo_, nj_glo_, ibegin_, iend_,       &
-     ni_, jbegin_, jend_, nj_, mask_, data_dim_, data_ni_, data_nj_, data_ibegin_, data_jbegin_,                   &
-     zoom_ni_, zoom_nj_, zoom_ibegin_, zoom_jbegin_, zoom_ni_loc_, zoom_nj_loc_, zoom_ibegin_loc_,                 &
-     zoom_jbegin_loc_, data_n_index_, data_i_index_, data_j_index_, lonvalue_, latvalue_)
-      IMPLICIT NONE
-      TYPE(XDomainGroupHandle)                              :: domaingroup_hdl
-      CHARACTER(len = *)                       , INTENT(IN) :: domaingroup_id
-      CHARACTER(len = *)             , OPTIONAL, INTENT(IN) :: name_
-      CHARACTER(len = *)             , OPTIONAL, INTENT(IN) :: standard_name_
-      CHARACTER(len = *)             , OPTIONAL, INTENT(IN) :: long_name_
-      CHARACTER(len = *)             , OPTIONAL, INTENT(IN) :: domain_group_ref_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: ni_glo_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: nj_glo_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: ibegin_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: iend_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: ni_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: jbegin_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: jend_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: nj_
-      LOGICAL          , dimension(*), OPTIONAL, INTENT(IN) :: mask_(:,:)
-      INTEGER                        , OPTIONAL, INTENT(IN) :: data_dim_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: data_ni_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: data_nj_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: data_ibegin_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: data_jbegin_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_ni_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_nj_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_ibegin_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_jbegin_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_ni_loc_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_nj_loc_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_ibegin_loc_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_jbegin_loc_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: data_n_index_
-      INTEGER       , dimension(*)   , OPTIONAL, INTENT(IN) :: data_i_index_(:)
-      INTEGER       , dimension(*)   , OPTIONAL, INTENT(IN) :: data_j_index_(:)
-      REAL(kind = 8), dimension(*)   , OPTIONAL, INTENT(IN) :: lonvalue_(:)
-      REAL(kind = 8), dimension(*)   , OPTIONAL, INTENT(IN) :: latvalue_(:)
- 
-      CALL domaingroup_handle_create(domaingroup_hdl, domaingroup_id)
-      CALL set_domaingroup_attributes_hdl                                                                          &
-   ( domaingroup_hdl, name_, standard_name_, long_name_, domain_group_ref_, ni_glo_, nj_glo_, ibegin_, iend_,      &
-     ni_, jbegin_, jend_, nj_, mask_, data_dim_, data_ni_, data_nj_, data_ibegin_, data_jbegin_,                   &
-     zoom_ni_, zoom_nj_, zoom_ibegin_, zoom_jbegin_, zoom_ni_loc_, zoom_nj_loc_, zoom_ibegin_loc_,                 &
-     zoom_jbegin_loc_, data_n_index_, data_i_index_, data_j_index_, lonvalue_, latvalue_)
-
-   END SUBROUTINE set_domaingroup_attributes_id
-   
-   SUBROUTINE set_domaingroup_attributes_hdl                                                                       &
-   ( domaingroup_hdl,name_, standard_name_, long_name_, domain_group_ref_, ni_glo_, nj_glo_, ibegin_, iend_,       &
-     ni_, jbegin_, jend_, nj_, mask_, data_dim_, data_ni_, data_nj_, data_ibegin_, data_jbegin_,                   &
-     zoom_ni_, zoom_nj_, zoom_ibegin_, zoom_jbegin_, zoom_ni_loc_, zoom_nj_loc_, zoom_ibegin_loc_,                 &
-     zoom_jbegin_loc_, data_n_index_, data_i_index_, data_j_index_, lonvalue_, latvalue_)
-      IMPLICIT NONE
-      TYPE(XDomainGroupHandle)                   , INTENT(IN) :: domaingroup_hdl
-      CHARACTER(len = *)               , OPTIONAL, INTENT(IN) :: name_
-      CHARACTER(len = *)               , OPTIONAL, INTENT(IN) :: standard_name_
-      CHARACTER(len = *)               , OPTIONAL, INTENT(IN) :: long_name_
-      CHARACTER(len = *)               , OPTIONAL, INTENT(IN) :: domain_group_ref_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: ni_glo_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: nj_glo_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: ibegin_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: iend_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: ni_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: jbegin_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: jend_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: nj_
-      LOGICAL          , dimension(*)  , OPTIONAL, INTENT(IN) :: mask_(:,:)
-      LOGICAL(kind = 1), dimension(:,:), ALLOCATABLE          :: mask__! (size(mask_,1),size(mask,2))
-      INTEGER                          , OPTIONAL, INTENT(IN) :: data_dim_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: data_ni_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: data_nj_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: data_ibegin_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: data_jbegin_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_ni_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_nj_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_ibegin_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_jbegin_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_ni_loc_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_nj_loc_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_ibegin_loc_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_jbegin_loc_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: data_n_index_
-      INTEGER       , dimension(*)     , OPTIONAL, INTENT(IN) :: data_i_index_(:)
-      INTEGER       , dimension(*)     , OPTIONAL, INTENT(IN) :: data_j_index_(:)
-      REAL(kind = 8), dimension(*)     , OPTIONAL, INTENT(IN) :: lonvalue_(:)
-      REAL(kind = 8), dimension(*)     , OPTIONAL, INTENT(IN) :: latvalue_(:)
-      
-      IF (PRESENT(name_))             THEN
-         CALL cxios_set_domaingroup_name(domaingroup_hdl%daddr, name_, len(name_))
-      END IF
-      IF (PRESENT(standard_name_))    THEN
-         CALL cxios_set_domaingroup_standard_name(domaingroup_hdl%daddr, standard_name_, len(standard_name_))
-      END IF
-      IF (PRESENT(long_name_))        THEN
-         CALL cxios_set_domaingroup_long_name(domaingroup_hdl%daddr, long_name_, len(long_name_))
-       END IF
-      IF (PRESENT(domain_group_ref_)) THEN
-         CALL cxios_set_domaingroup_domain_group_ref(domaingroup_hdl%daddr, domain_group_ref_, len(domain_group_ref_))
-      END IF
-      IF (PRESENT(ni_glo_))           THEN
-         CALL cxios_set_domaingroup_ni_glo(domaingroup_hdl%daddr, ni_glo_)
-      END IF
-      IF (PRESENT(nj_glo_))           THEN
-         CALL cxios_set_domaingroup_nj_glo(domaingroup_hdl%daddr, nj_glo_)
-      END IF
-      IF (PRESENT(ibegin_))           THEN
-         CALL cxios_set_domaingroup_ibegin(domaingroup_hdl%daddr, ibegin_)
-       END IF
-      IF (PRESENT(iend_))             THEN
-         CALL cxios_set_domaingroup_iend(domaingroup_hdl%daddr, iend_)
-      END IF
-      IF (PRESENT(ni_))               THEN
-         CALL cxios_set_domaingroup_ni(domaingroup_hdl%daddr, ni_)
-      END IF
-      IF (PRESENT(jbegin_))           THEN
-         CALL cxios_set_domaingroup_jbegin(domaingroup_hdl%daddr, jbegin_)
-      END IF
-      IF (PRESENT(jend_))             THEN
-         CALL cxios_set_domaingroup_jend(domaingroup_hdl%daddr, jend_)
-      END IF
-      IF (PRESENT(nj_))               THEN
-         CALL cxios_set_domaingroup_nj(domaingroup_hdl%daddr, nj_)
-      END IF
-      IF (PRESENT(mask_))             THEN
-         ALLOCATE(mask__(size(mask_, 1), size(mask_, 2)))
-         mask__(:,:) = mask_(:,:)
-         CALL cxios_set_domaingroup_mask(domaingroup_hdl%daddr, mask__, size(mask_, 1), size(mask_, 2))         
-         DEALLOCATE(mask__)
-      END IF
-      IF (PRESENT(data_dim_))         THEN
-         CALL cxios_set_domaingroup_data_dim(domaingroup_hdl%daddr, data_dim_)
-      END IF
-      IF (PRESENT(data_ni_))          THEN
-         CALL cxios_set_domaingroup_data_ni(domaingroup_hdl%daddr, data_ni_)
-      END IF 
-      IF (PRESENT(data_nj_))          THEN
-         CALL cxios_set_domaingroup_data_nj(domaingroup_hdl%daddr, data_nj_)
-      END IF
-      IF (PRESENT(data_ibegin_))      THEN
-         CALL cxios_set_domaingroup_data_ibegin(domaingroup_hdl%daddr, data_ibegin_)
-      END IF
-      IF (PRESENT(data_jbegin_))      THEN
-         CALL cxios_set_domaingroup_data_jbegin(domaingroup_hdl%daddr, data_jbegin_)
-      END IF
-      IF (PRESENT(zoom_ni_))          THEN
-         CALL cxios_set_domaingroup_zoom_ni(domaingroup_hdl%daddr, zoom_ni_)
-      END IF
-      IF (PRESENT(zoom_nj_))          THEN
-       CALL cxios_set_domaingroup_zoom_nj(domaingroup_hdl%daddr, zoom_nj_)
-      END IF
-      IF (PRESENT(zoom_ibegin_))      THEN
-         CALL cxios_set_domaingroup_zoom_ibegin(domaingroup_hdl%daddr, zoom_ibegin_)
-      END IF
-      IF (PRESENT(zoom_jbegin_))      THEN
-         CALL cxios_set_domaingroup_zoom_jbegin(domaingroup_hdl%daddr, zoom_jbegin_)
-      END IF
-      IF (PRESENT(zoom_ni_loc_))      THEN
-         CALL cxios_set_domaingroup_zoom_ni_loc(domaingroup_hdl%daddr, zoom_ni_loc_)
-      END IF   
-      IF (PRESENT(zoom_nj_loc_))      THEN
-         CALL cxios_set_domaingroup_zoom_nj_loc(domaingroup_hdl%daddr, zoom_nj_loc_)
-      END IF
-      IF (PRESENT(zoom_ibegin_loc_))  THEN
-         CALL cxios_set_domaingroup_zoom_ibegin_loc(domaingroup_hdl%daddr, zoom_ibegin_loc_)
-      END IF
-      IF (PRESENT(zoom_jbegin_loc_))  THEN
-         CALL cxios_set_domaingroup_zoom_jbegin_loc(domaingroup_hdl%daddr, zoom_jbegin_loc_)
-      END IF
-      IF (PRESENT(data_n_index_))     THEN
-         CALL cxios_set_domaingroup_data_n_index(domaingroup_hdl%daddr, data_n_index_)
-      END IF
-      IF (PRESENT(data_i_index_))     THEN
-         CALL cxios_set_domaingroup_data_i_index(domaingroup_hdl%daddr, data_i_index_, size(data_i_index_, 1))
-      END IF
-      IF (PRESENT(data_j_index_))     THEN
-         CALL cxios_set_domaingroup_data_j_index(domaingroup_hdl%daddr, data_j_index_, size(data_j_index_, 1))
-      END IF
-      IF (PRESENT(lonvalue_))         THEN
-         CALL cxios_set_domaingroup_lonvalue(domaingroup_hdl%daddr, lonvalue_, size(lonvalue_, 1))
-      END IF
-      IF (PRESENT(latvalue_))         THEN
-         CALL cxios_set_domaingroup_latvalue(domaingroup_hdl%daddr, latvalue_, size(latvalue_, 1))
-      END IF
-
-   END SUBROUTINE set_domaingroup_attributes_hdl
-   
-   SUBROUTINE set_domain_attributes_id                                                                   &
-   ( domain_id, name_, standard_name_, long_name_, domain_group_ref_, ni_glo_, nj_glo_, ibegin_, iend_,  &
-     ni_, jbegin_, jend_, nj_, mask_, data_dim_, data_ni_, data_nj_, data_ibegin_, data_jbegin_,         &
-     zoom_ni_, zoom_nj_, zoom_ibegin_, zoom_jbegin_, zoom_ni_loc_, zoom_nj_loc_, zoom_ibegin_loc_,       &
-     zoom_jbegin_loc_, data_n_index_, data_i_index_, data_j_index_, lonvalue_, latvalue_)
-      IMPLICIT NONE
-      TYPE(XDomainHandle)                                   :: domain_hdl
-      CHARACTER(len = *)                       , INTENT(IN) :: domain_id
-      CHARACTER(len = *)             , OPTIONAL, INTENT(IN) :: name_
-      CHARACTER(len = *)             , OPTIONAL, INTENT(IN) :: standard_name_
-      CHARACTER(len = *)             , OPTIONAL, INTENT(IN) :: long_name_
-      CHARACTER(len = *)             , OPTIONAL, INTENT(IN) :: domain_group_ref_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: ni_glo_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: nj_glo_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: ibegin_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: iend_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: ni_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: jbegin_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: jend_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: nj_
-      LOGICAL          , dimension(*), OPTIONAL, INTENT(IN) :: mask_(:,:)
-      INTEGER                        , OPTIONAL, INTENT(IN) :: data_dim_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: data_ni_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: data_nj_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: data_ibegin_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: data_jbegin_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_ni_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_nj_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_ibegin_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_jbegin_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_ni_loc_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_nj_loc_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_ibegin_loc_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: zoom_jbegin_loc_
-      INTEGER                        , OPTIONAL, INTENT(IN) :: data_n_index_
-      INTEGER       , dimension(*)   , OPTIONAL, INTENT(IN) :: data_i_index_(:)
-      INTEGER       , dimension(*)   , OPTIONAL, INTENT(IN) :: data_j_index_(:)
-      REAL(kind = 8), dimension(*)   , OPTIONAL, INTENT(IN) :: lonvalue_(:)
-      REAL(kind = 8), dimension(*)   , OPTIONAL, INTENT(IN) :: latvalue_(:)
- 
-      CALL domain_handle_create(domain_hdl, domain_id)
-      CALL set_domain_attributes_hdl                                                                     &
-   ( domain_hdl, name_, standard_name_, long_name_, domain_group_ref_, ni_glo_, nj_glo_, ibegin_, iend_, &
-     ni_, jbegin_, jend_, nj_, mask_, data_dim_, data_ni_, data_nj_, data_ibegin_, data_jbegin_,         &
-     zoom_ni_, zoom_nj_, zoom_ibegin_, zoom_jbegin_, zoom_ni_loc_, zoom_nj_loc_, zoom_ibegin_loc_,       &
-     zoom_jbegin_loc_, data_n_index_, data_i_index_, data_j_index_, lonvalue_, latvalue_)
-
-   END SUBROUTINE set_domain_attributes_id
-   
-   SUBROUTINE set_domain_attributes_hdl                                                                  &
-   ( domain_hdl,name_, standard_name_, long_name_, domain_group_ref_, ni_glo_, nj_glo_, ibegin_, iend_,  &
-     ni_, jbegin_, jend_, nj_, mask_, data_dim_, data_ni_, data_nj_, data_ibegin_, data_jbegin_,         &
-     zoom_ni_, zoom_nj_, zoom_ibegin_, zoom_jbegin_, zoom_ni_loc_, zoom_nj_loc_, zoom_ibegin_loc_,       &
-     zoom_jbegin_loc_, data_n_index_, data_i_index_, data_j_index_, lonvalue_, latvalue_)
-      IMPLICIT NONE
-      TYPE(XDomainHandle)                        , INTENT(IN) :: domain_hdl
-      CHARACTER(len = *)               , OPTIONAL, INTENT(IN) :: name_
-      CHARACTER(len = *)               , OPTIONAL, INTENT(IN) :: standard_name_
-      CHARACTER(len = *)               , OPTIONAL, INTENT(IN) :: long_name_
-      CHARACTER(len = *)               , OPTIONAL, INTENT(IN) :: domain_group_ref_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: ni_glo_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: nj_glo_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: ibegin_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: iend_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: ni_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: jbegin_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: jend_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: nj_
-      LOGICAL          , dimension(*)  , OPTIONAL, INTENT(IN) :: mask_(:,:)
-      LOGICAL(kind = 1), dimension(:,:), ALLOCATABLE          :: mask__
-      INTEGER                          , OPTIONAL, INTENT(IN) :: data_dim_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: data_ni_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: data_nj_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: data_ibegin_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: data_jbegin_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_ni_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_nj_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_ibegin_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_jbegin_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_ni_loc_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_nj_loc_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_ibegin_loc_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: zoom_jbegin_loc_
-      INTEGER                          , OPTIONAL, INTENT(IN) :: data_n_index_
-      INTEGER       , dimension(*)     , OPTIONAL, INTENT(IN) :: data_i_index_(:)
-      INTEGER       , dimension(*)     , OPTIONAL, INTENT(IN) :: data_j_index_(:)
-      REAL(kind = 8), dimension(*)     , OPTIONAL, INTENT(IN) :: lonvalue_(:)
-      REAL(kind = 8), dimension(*)     , OPTIONAL, INTENT(IN) :: latvalue_(:)
-      IF (PRESENT(name_))             THEN
-         CALL cxios_set_domain_name(domain_hdl%daddr, name_, len(name_))
-      END IF
-      IF (PRESENT(standard_name_))    THEN
-         CALL cxios_set_domain_standard_name(domain_hdl%daddr, standard_name_, len(standard_name_))
-      END IF
-      IF (PRESENT(long_name_))        THEN
-         CALL cxios_set_domain_long_name(domain_hdl%daddr, long_name_, len(long_name_))
-       END IF
-      IF (PRESENT(domain_group_ref_)) THEN
-         CALL cxios_set_domain_domain_group_ref(domain_hdl%daddr, domain_group_ref_, len(domain_group_ref_))
-      END IF
-      IF (PRESENT(ni_glo_))           THEN
-         CALL cxios_set_domain_ni_glo(domain_hdl%daddr, ni_glo_)
-      END IF
-      IF (PRESENT(nj_glo_))           THEN
-         CALL cxios_set_domain_nj_glo(domain_hdl%daddr, nj_glo_)
-      END IF
-      IF (PRESENT(ibegin_))           THEN
-         CALL cxios_set_domain_ibegin(domain_hdl%daddr, ibegin_)
-       END IF
-      IF (PRESENT(iend_))             THEN
-         CALL cxios_set_domain_iend(domain_hdl%daddr, iend_)
-      END IF
-      IF (PRESENT(ni_))               THEN
-         CALL cxios_set_domain_ni(domain_hdl%daddr, ni_)
-      END IF
-      IF (PRESENT(jbegin_))           THEN
-         CALL cxios_set_domain_jbegin(domain_hdl%daddr, jbegin_)
-      END IF
-      IF (PRESENT(jend_))             THEN
-         CALL cxios_set_domain_jend(domain_hdl%daddr, jend_)
-      END IF
-      IF (PRESENT(nj_))               THEN
-         CALL cxios_set_domain_nj(domain_hdl%daddr, nj_)
-      END IF
-      IF (PRESENT(mask_))             THEN
-         ALLOCATE(mask__(size(mask_, 1), size(mask_, 2)))
-         mask__(:,:) = mask_(:,:)
-         CALL cxios_set_domain_mask(domain_hdl%daddr, mask__, size(mask_, 1), size(mask_, 2))         
-         DEALLOCATE(mask__)
-      END IF
-      IF (PRESENT(data_dim_))         THEN
-         CALL cxios_set_domain_data_dim(domain_hdl%daddr, data_dim_)
-      END IF
-      IF (PRESENT(data_ni_))          THEN
-         CALL cxios_set_domain_data_ni(domain_hdl%daddr, data_ni_)
-      END IF 
-      IF (PRESENT(data_nj_))          THEN
-         CALL cxios_set_domain_data_nj(domain_hdl%daddr, data_nj_)
-      END IF
-      IF (PRESENT(data_ibegin_))      THEN
-         CALL cxios_set_domain_data_ibegin(domain_hdl%daddr, data_ibegin_)
-      END IF
-      IF (PRESENT(data_jbegin_))      THEN
-         CALL cxios_set_domain_data_jbegin(domain_hdl%daddr, data_jbegin_)
-      END IF
-      IF (PRESENT(zoom_ni_))          THEN
-         CALL cxios_set_domain_zoom_ni(domain_hdl%daddr, zoom_ni_)
-      END IF
-      IF (PRESENT(zoom_nj_))          THEN
-       CALL cxios_set_domain_zoom_nj(domain_hdl%daddr, zoom_nj_)
-      END IF
-      IF (PRESENT(zoom_ibegin_))      THEN
-         CALL cxios_set_domain_zoom_ibegin(domain_hdl%daddr, zoom_ibegin_)
-      END IF
-      IF (PRESENT(zoom_jbegin_))      THEN
-         CALL cxios_set_domain_zoom_jbegin(domain_hdl%daddr, zoom_jbegin_)
-      END IF
-      IF (PRESENT(zoom_ni_loc_))      THEN
-         CALL cxios_set_domain_zoom_ni_loc(domain_hdl%daddr, zoom_ni_loc_)
-      END IF   
-      IF (PRESENT(zoom_nj_loc_))      THEN
-         CALL cxios_set_domain_zoom_nj_loc(domain_hdl%daddr, zoom_nj_loc_)
-      END IF
-      IF (PRESENT(zoom_ibegin_loc_))  THEN
-         CALL cxios_set_domain_zoom_ibegin_loc(domain_hdl%daddr, zoom_ibegin_loc_)
-      END IF
-      IF (PRESENT(zoom_jbegin_loc_))  THEN
-         CALL cxios_set_domain_zoom_jbegin_loc(domain_hdl%daddr, zoom_jbegin_loc_)
-      END IF
-      IF (PRESENT(data_n_index_))     THEN
-         CALL cxios_set_domain_data_n_index(domain_hdl%daddr, data_n_index_)
-      END IF
-      IF (PRESENT(data_i_index_))     THEN
-         CALL cxios_set_domain_data_i_index(domain_hdl%daddr, data_i_index_, size(data_i_index_, 1))
-      END IF
-      IF (PRESENT(data_j_index_))     THEN
-         CALL cxios_set_domain_data_j_index(domain_hdl%daddr, data_j_index_, size(data_j_index_, 1))
-      END IF
-      IF (PRESENT(lonvalue_))         THEN
-         CALL cxios_set_domain_lonvalue(domain_hdl%daddr, lonvalue_, size(lonvalue_, 1))
-      END IF
-      IF (PRESENT(latvalue_))         THEN
-         CALL cxios_set_domain_latvalue(domain_hdl%daddr, latvalue_, size(latvalue_, 1))
-      END IF
-
-   END SUBROUTINE set_domain_attributes_hdl
-   
-   SUBROUTINE domain_handle_create(ret, idt)
-      IMPLICIT NONE
-      TYPE(XDomainHandle), INTENT(OUT):: ret
-      CHARACTER(len = *) , INTENT(IN) :: idt      
-      CALL cxios_domain_handle_create(ret%daddr, idt, len(idt))            
-   END SUBROUTINE domain_handle_create
-   
-   SUBROUTINE domaingroup_handle_create(ret, idt)
-      IMPLICIT NONE
-      TYPE(XDomainGroupHandle), INTENT(OUT):: ret
-      CHARACTER(len = *)      , INTENT(IN) :: idt      
-      CALL cxios_domaingroup_handle_create(ret%daddr, idt, len(idt))            
-   END SUBROUTINE domaingroup_handle_create
-
-   LOGICAL FUNCTION domain_valid_id(idt)
-      IMPLICIT NONE
-      CHARACTER(len  = *)    , INTENT(IN) :: idt
-      LOGICAL  (kind = 1)                 :: val
-      CALL cxios_domain_valid_id(val, idt, len(idt));
-      domain_valid_id = val
-   END FUNCTION  domain_valid_id
-
-   LOGICAL FUNCTION domaingroup_valid_id(idt)
-      IMPLICIT NONE
-      CHARACTER(len  = *)    , INTENT(IN) :: idt
-      LOGICAL  (kind = 1)                 :: val
-      CALL cxios_domaingroup_valid_id(val, idt, len(idt));
-      domaingroup_valid_id = val
-   END FUNCTION  domaingroup_valid_id
    
 END MODULE IDOMAIN
Index: /XIOS/trunk/src/fortran/ifield.F90
===================================================================
--- /XIOS/trunk/src/fortran/ifield.F90	(revision 311)
+++ /XIOS/trunk/src/fortran/ifield.F90	(revision 312)
@@ -6,12 +6,4 @@
    USE FIELDGROUP_INTERFACE
    
-   TYPE XFieldHandle
-      INTEGER(kind = C_INTPTR_T) :: daddr
-   END TYPE XFieldHandle
-   
-   TYPE XFieldGroupHandle
-      INTEGER(kind = C_INTPTR_T) :: daddr
-   END TYPE XFieldGroupHandle
-
    TYPE txios(field)
       INTEGER(kind = C_INTPTR_T) :: daddr
@@ -21,15 +13,4 @@
       INTEGER(kind = C_INTPTR_T) :: daddr
    END TYPE txios(fieldgroup)
-   
-   !----------------------------------------------------------------------------
-   INTERFACE set_field_attributes
-      MODULE PROCEDURE set_field_attributes_id,set_field_attributes_hdl
-   END INTERFACE  
-   
-   INTERFACE set_field_group_attributes
-      MODULE PROCEDURE set_fieldgroup_attributes_id,set_fieldgroup_attributes_hdl
-   END INTERFACE  
-   !----------------------------------------------------------------------------
-   
    
    CONTAINS ! Fonctions disponibles pour les utilisateurs.
@@ -341,237 +322,4 @@
    END FUNCTION  xios(field_is_active_hdl) 
  
-   
-   
-   
-   
-   
-   
-   
-
-
-!!!!!!!!!!!!!!!!!!!!!!!!!! Ancienne interfaces !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!    
-   SUBROUTINE set_fieldgroup_attributes_id                                                 &
-   (fieldgroup_id, name_, standard_name_, long_name_, unit_, operation_, freq_op_, level_, &
-    prec_, enabled_, domain_ref_, axis_ref_, grid_ref_, field_ref_, default_value_)
-    
-      IMPLICIT NONE
-      TYPE(XFieldGroupHandle)                       :: fieldgroup_hdl
-      CHARACTER(len = *)               , INTENT(IN) :: fieldgroup_id
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: name_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: standard_name_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: long_name_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: unit_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: operation_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: freq_op_
-      INTEGER                , OPTIONAL, INTENT(IN) :: level_
-      INTEGER                , OPTIONAL, INTENT(IN) :: prec_
-      LOGICAL                , OPTIONAL, INTENT(IN) :: enabled_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: domain_ref_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: axis_ref_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: grid_ref_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: field_ref_
-      REAL(kind=8)           , OPTIONAL, INTENT(IN) :: default_value_
-        
-      CALL fieldgroup_handle_create(fieldgroup_hdl, fieldgroup_id)
-      CALL set_fieldgroup_attributes_hdl                                                          &
-         (fieldgroup_hdl, name_, standard_name_, long_name_, unit_, operation_, freq_op_, level_, &
-          prec_, enabled_, domain_ref_, axis_ref_, grid_ref_, field_ref_, default_value_)
-
-   END SUBROUTINE set_fieldgroup_attributes_id
-
-   SUBROUTINE set_fieldgroup_attributes_hdl                                                 &
-   (fieldgroup_hdl, name_, standard_name_, long_name_, unit_, operation_, freq_op_, level_, &
-    prec_, enabled_, domain_ref_, axis_ref_, grid_ref_, field_ref_, default_value_)
-      IMPLICIT NONE
-      TYPE(XFieldgroupHandle)          , INTENT(IN) :: fieldgroup_hdl
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: name_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: standard_name_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: long_name_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: unit_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: operation_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: freq_op_
-      INTEGER                , OPTIONAL, INTENT(IN) :: level_
-      INTEGER                , OPTIONAL, INTENT(IN) :: prec_
-      LOGICAL(kind = 1)                             :: enabled__
-      LOGICAL                , OPTIONAL, INTENT(IN) :: enabled_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: domain_ref_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: axis_ref_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: grid_ref_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: field_ref_
-      REAL(kind=8)           , OPTIONAL, INTENT(IN) :: default_value_
-      
-      IF (PRESENT(name_))           THEN
-         CALL cxios_set_fieldgroup_name(fieldgroup_hdl%daddr, name_, len(name_))
-      END IF
-      IF (PRESENT(standard_name_))  THEN
-         CALL cxios_set_fieldgroup_standard_name(fieldgroup_hdl%daddr, standard_name_, len(standard_name_))
-      END IF
-      IF (PRESENT(long_name_))      THEN
-         CALL cxios_set_fieldgroup_long_name(fieldgroup_hdl%daddr, long_name_, len(long_name_))
-      END IF
-      IF (PRESENT(unit_))           THEN
-         CALL cxios_set_fieldgroup_unit(fieldgroup_hdl%daddr, unit_, len(unit_))
-      END IF
-      IF (PRESENT(operation_))      THEN
-         CALL cxios_set_fieldgroup_operation(fieldgroup_hdl%daddr, operation_, len(operation_))
-      END IF
-      IF (PRESENT(freq_op_))        THEN
-         CALL cxios_set_fieldgroup_freq_op(fieldgroup_hdl%daddr, freq_op_, len(freq_op_))
-      END IF
-      IF (PRESENT(level_))          THEN
-         CALL cxios_set_fieldgroup_level(fieldgroup_hdl%daddr, level_)
-      END IF
-      IF (PRESENT(prec_))           THEN
-         CALL cxios_set_fieldgroup_prec(fieldgroup_hdl%daddr, prec_)
-      END IF
-      IF (PRESENT(enabled_))        THEN
-         enabled__ = enabled_  
-         CALL cxios_set_fieldgroup_enabled(fieldgroup_hdl%daddr, enabled__)
-      END IF
-      IF (PRESENT(domain_ref_))     THEN
-         CALL cxios_set_fieldgroup_domain_ref(fieldgroup_hdl%daddr, domain_ref_, len(domain_ref_))
-      END IF
-      IF (PRESENT(axis_ref_))       THEN
-         CALL cxios_set_fieldgroup_axis_ref(fieldgroup_hdl%daddr, axis_ref_, len(axis_ref_))
-      END IF
-      IF (PRESENT(grid_ref_))       THEN
-         CALL cxios_set_fieldgroup_grid_ref(fieldgroup_hdl%daddr, grid_ref_, len(grid_ref_))
-      END IF
-      IF (PRESENT(field_ref_))      THEN
-         CALL cxios_set_fieldgroup_field_ref(fieldgroup_hdl%daddr, field_ref_, len(field_ref_))
-      END IF
-      IF (PRESENT(default_value_))  THEN
-         CALL cxios_set_fieldgroup_default_value(fieldgroup_hdl%daddr, default_value_)
-      END IF
-
-   END SUBROUTINE set_fieldgroup_attributes_hdl
-   
-   SUBROUTINE set_field_attributes_id                                                 &
-   (field_id, name_, standard_name_, long_name_, unit_, operation_, freq_op_, level_, &
-    prec_, enabled_, domain_ref_, axis_ref_, grid_ref_, field_ref_, default_value_)
-    
-      IMPLICIT NONE
-      TYPE(XFieldHandle)                            :: field_hdl
-      CHARACTER(len = *)               , INTENT(IN) :: field_id
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: name_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: standard_name_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: long_name_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: unit_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: operation_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: freq_op_
-      INTEGER                , OPTIONAL, INTENT(IN) :: level_
-      INTEGER                , OPTIONAL, INTENT(IN) :: prec_
-      LOGICAL                , OPTIONAL, INTENT(IN) :: enabled_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: domain_ref_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: axis_ref_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: grid_ref_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: field_ref_
-      REAL(kind=8)           , OPTIONAL, INTENT(IN) :: default_value_
-      
-      CALL field_handle_create(field_hdl, field_id)
-      CALL set_field_attributes_hdl                                                          &
-         (field_hdl, name_, standard_name_, long_name_, unit_, operation_, freq_op_, level_, &
-          prec_, enabled_, domain_ref_, axis_ref_, grid_ref_, field_ref_, default_value_)
-
-   END SUBROUTINE set_field_attributes_id
-
-   SUBROUTINE set_field_attributes_hdl                                                 &
-   (field_hdl, name_, standard_name_, long_name_, unit_, operation_, freq_op_, level_, &
-    prec_, enabled_, domain_ref_, axis_ref_, grid_ref_, field_ref_, default_value_)
-      IMPLICIT NONE
-      TYPE(XFieldHandle)               , INTENT(IN) :: field_hdl
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: name_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: standard_name_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: long_name_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: unit_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: operation_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: freq_op_
-      INTEGER                , OPTIONAL, INTENT(IN) :: level_
-      INTEGER                , OPTIONAL, INTENT(IN) :: prec_
-      LOGICAL(kind = 1)                             :: enabled__
-      LOGICAL                , OPTIONAL, INTENT(IN) :: enabled_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: domain_ref_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: axis_ref_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: grid_ref_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: field_ref_
-      REAL(kind=8)           , OPTIONAL, INTENT(IN) :: default_value_
-      
-      IF (PRESENT(name_))           THEN
-         CALL cxios_set_field_name(field_hdl%daddr, name_, len(name_))
-      END IF
-      IF (PRESENT(standard_name_))  THEN
-         CALL cxios_set_field_standard_name(field_hdl%daddr, standard_name_, len(standard_name_))
-      END IF
-      IF (PRESENT(long_name_))      THEN
-         CALL cxios_set_field_long_name(field_hdl%daddr, long_name_, len(long_name_))
-      END IF
-      IF (PRESENT(unit_))           THEN
-         CALL cxios_set_field_unit(field_hdl%daddr, unit_, len(unit_))
-      END IF
-      IF (PRESENT(operation_))      THEN
-         CALL cxios_set_field_operation(field_hdl%daddr, operation_, len(operation_))
-      END IF
-      IF (PRESENT(freq_op_))        THEN
-         CALL cxios_set_field_freq_op(field_hdl%daddr, freq_op_, len(freq_op_))
-      END IF
-      IF (PRESENT(level_))          THEN
-         CALL cxios_set_field_level(field_hdl%daddr, level_)
-      END IF
-      IF (PRESENT(prec_))           THEN
-         CALL cxios_set_field_prec(field_hdl%daddr, prec_)
-      END IF
-      IF (PRESENT(enabled_))        THEN
-         enabled__ = enabled_  
-         CALL cxios_set_field_enabled(field_hdl%daddr, enabled__)
-      END IF
-      IF (PRESENT(domain_ref_))     THEN
-         CALL cxios_set_field_domain_ref(field_hdl%daddr, domain_ref_, len(domain_ref_))
-      END IF
-      IF (PRESENT(axis_ref_))       THEN
-         CALL cxios_set_field_axis_ref(field_hdl%daddr, axis_ref_, len(axis_ref_))
-      END IF
-      IF (PRESENT(grid_ref_))       THEN
-         CALL cxios_set_field_grid_ref(field_hdl%daddr, grid_ref_, len(grid_ref_))
-      END IF
-      IF (PRESENT(field_ref_))      THEN
-         CALL cxios_set_field_field_ref(field_hdl%daddr, field_ref_, len(field_ref_))
-      END IF
-      IF (PRESENT(default_value_))  THEN
-         CALL cxios_set_field_default_value(field_hdl%daddr, default_value_)
-      END IF
-
-   END SUBROUTINE set_field_attributes_hdl
-
-   SUBROUTINE field_handle_create(ret, idt)
-      IMPLICIT NONE
-      TYPE(XFieldHandle), INTENT(OUT):: ret
-      CHARACTER(len = *), INTENT(IN) :: idt      
-      CALL cxios_field_handle_create(ret%daddr, idt, len(idt))            
-   END SUBROUTINE field_handle_create
-   
-   SUBROUTINE fieldgroup_handle_create(ret, idt)
-      IMPLICIT NONE
-      TYPE(XFieldGroupHandle), INTENT(OUT):: ret
-      CHARACTER(len = *)     , INTENT(IN) :: idt      
-      CALL cxios_fieldgroup_handle_create(ret%daddr, idt, len(idt))            
-   END SUBROUTINE fieldgroup_handle_create
-
-   LOGICAL FUNCTION field_valid_id(idt)
-      IMPLICIT NONE
-      CHARACTER(len  = *)    , INTENT(IN) :: idt
-      LOGICAL  (kind = 1)                 :: val
-      CALL cxios_field_valid_id(val, idt, len(idt));
-      field_valid_id = val
-   END FUNCTION  field_valid_id
- 
-
-   LOGICAL FUNCTION fieldgroup_valid_id(idt)
-      IMPLICIT NONE
-      CHARACTER(len  = *)    , INTENT(IN) :: idt
-      LOGICAL  (kind = 1)                 :: val
-      CALL cxios_fieldgroup_valid_id(val, idt, len(idt));
-      fieldgroup_valid_id = val
-   END FUNCTION  fieldgroup_valid_id
 
 END MODULE IFIELD
Index: /XIOS/trunk/src/fortran/ifile.F90
===================================================================
--- /XIOS/trunk/src/fortran/ifile.F90	(revision 311)
+++ /XIOS/trunk/src/fortran/ifile.F90	(revision 312)
@@ -6,12 +6,4 @@
    USE FILEGROUP_INTERFACE
    
-   TYPE XFileHandle
-      INTEGER(kind = C_INTPTR_T) :: daddr
-   END TYPE XFileHandle
-   
-   TYPE XFileGroupHandle
-      INTEGER(kind = C_INTPTR_T) :: daddr
-   END TYPE XFileGroupHandle
-
    TYPE txios(file)
       INTEGER(kind = C_INTPTR_T) :: daddr
@@ -22,14 +14,4 @@
    END TYPE txios(filegroup)
    
-   !----------------------------------------------------------------------------
-   INTERFACE set_file_attributes
-      MODULE PROCEDURE set_file_attributes_id,set_file_attributes_hdl
-   END INTERFACE  
-   
-   INTERFACE set_file_group_attributes
-      MODULE PROCEDURE set_filegroup_attributes_id,set_filegroup_attributes_hdl
-   END INTERFACE  
-   !----------------------------------------------------------------------------
-  
    CONTAINS ! Fonctions disponibles pour les utilisateurs.
 
@@ -180,5 +162,4 @@
 
 
-
    SUBROUTINE xios(get_file_handle)( idt, ret)
       IMPLICIT NONE
@@ -219,148 +200,4 @@
    END FUNCTION  xios(is_valid_filegroup)
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-!!!!!!!!!!!!!! Anciennes interfaces !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   
-   SUBROUTINE set_file_attributes_id(file_id, name_ , description_, name_suffix_, output_freq_, output_level_, enabled_)
-      IMPLICIT NONE
-      TYPE(XFileHandle)                        :: file_hdl
-      CHARACTER(len = *)          , INTENT(IN) :: file_id
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: name_
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: description_
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: name_suffix_
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: output_freq_
-      INTEGER           , OPTIONAL, INTENT(IN) :: output_level_
-      LOGICAL           , OPTIONAL, INTENT(IN) :: enabled_
-      
-      CALL file_handle_create(file_hdl, file_id)
-      CALL set_file_attributes_hdl(file_hdl, name_ , description_, name_suffix_, output_freq_, output_level_, enabled_)
-      
-   END SUBROUTINE set_file_attributes_id
-   
-   SUBROUTINE set_file_attributes_hdl(file_hdl, name_ , description_, name_suffix_, output_freq_, output_level_, enabled_)
-      TYPE(XFileHandle)           , INTENT(IN) :: file_hdl
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: name_
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: description_
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: name_suffix_
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: output_freq_
-      INTEGER           , OPTIONAL, INTENT(IN) :: output_level_
-      LOGICAL(kind = 1)                        :: enabled__
-      LOGICAL           , OPTIONAL, INTENT(IN) :: enabled_
-      
-      IF (PRESENT(name_))         THEN
-         CALL cxios_set_file_name(file_hdl%daddr, name_, len(name_))
-      END IF
-      IF (PRESENT(description_))  THEN
-         CALL cxios_set_file_description(file_hdl%daddr, description_, len(description_))
-      END IF
-      IF (PRESENT(name_suffix_))  THEN
-         CALL cxios_set_file_name_suffix(file_hdl%daddr, name_suffix_, len(name_suffix_))
-      END IF
-      IF (PRESENT(output_freq_))  THEN
-         CALL cxios_set_file_output_freq(file_hdl%daddr, output_freq_, len(output_freq_))
-      END IF
-      IF (PRESENT(output_level_)) THEN
-         CALL cxios_set_file_output_level(file_hdl%daddr, output_level_)
-      END IF
-      IF (PRESENT(enabled_))      THEN
-         enabled__ = enabled_        
-         CALL cxios_set_file_enabled(file_hdl%daddr, enabled__)
-      END IF
-
-   END SUBROUTINE set_file_attributes_hdl
-   
-   SUBROUTINE set_filegroup_attributes_id(filegroup_id, name_ , description_, name_suffix_, output_freq_, output_level_, enabled_)
-      IMPLICIT NONE
-      TYPE(XFileGroupHandle)                   :: filegroup_hdl
-      CHARACTER(len = *)          , INTENT(IN) :: filegroup_id
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: name_
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: description_
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: name_suffix_
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: output_freq_
-      INTEGER           , OPTIONAL, INTENT(IN) :: output_level_
-      LOGICAL           , OPTIONAL, INTENT(IN) :: enabled_
-      
-      CALL filegroup_handle_create(filegroup_hdl, filegroup_id)
-      CALL set_filegroup_attributes_hdl(filegroup_hdl, name_ , description_, name_suffix_, output_freq_, output_level_, enabled_)
-      
-   END SUBROUTINE set_filegroup_attributes_id
-   
-   SUBROUTINE set_filegroup_attributes_hdl(filegroup_hdl, name_ , description_, name_suffix_, output_freq_, output_level_, enabled_)
-      IMPLICIT NONE
-      TYPE(XFileGroupHandle)      , INTENT(IN) :: filegroup_hdl
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: name_
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: description_
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: name_suffix_
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: output_freq_
-      INTEGER           , OPTIONAL, INTENT(IN) :: output_level_
-      LOGICAL(kind = 1)                        :: enabled__
-      LOGICAL           , OPTIONAL, INTENT(IN) :: enabled_
-      
-      IF (PRESENT(name_))         THEN
-         CALL cxios_set_filegroup_name(filegroup_hdl%daddr, name_, len(name_))
-      END IF
-      IF (PRESENT(description_))  THEN
-         CALL cxios_set_filegroup_description(filegroup_hdl%daddr, description_, len(description_))
-      END IF
-      IF (PRESENT(name_suffix_))  THEN
-         CALL cxios_set_filegroup_name_suffix(filegroup_hdl%daddr, name_suffix_, len(name_suffix_))
-      END IF
-      IF (PRESENT(output_freq_))  THEN
-         CALL cxios_set_filegroup_output_freq(filegroup_hdl%daddr, output_freq_, len(output_freq_))
-      END IF
-      IF (PRESENT(output_level_)) THEN
-         CALL cxios_set_filegroup_output_level(filegroup_hdl%daddr, output_level_)
-      END IF
-      IF (PRESENT(enabled_))      THEN
-        enabled__ = enabled_ 
-        CALL cxios_set_filegroup_enabled(filegroup_hdl%daddr, enabled__)
-      END IF
-
-   END SUBROUTINE set_filegroup_attributes_hdl
-   
-   SUBROUTINE file_handle_create(ret, idt)
-      IMPLICIT NONE
-      TYPE(XFileHandle) , INTENT(OUT):: ret
-      CHARACTER(len = *), INTENT(IN) :: idt      
-      CALL cxios_file_handle_create(ret%daddr, idt, len(idt))            
-   END SUBROUTINE file_handle_create
-   
-   SUBROUTINE filegroup_handle_create(ret, idt)
-      IMPLICIT NONE
-      TYPE(XFileGroupHandle), INTENT(OUT):: ret
-      CHARACTER(len = *)    , INTENT(IN) :: idt      
-      CALL cxios_filegroup_handle_create(ret%daddr, idt, len(idt))            
-   END SUBROUTINE filegroup_handle_create
-
-   LOGICAL FUNCTION file_valid_id(idt)
-      IMPLICIT NONE
-      CHARACTER(len  = *)    , INTENT(IN) :: idt
-      LOGICAL  (kind = 1)                 :: val
-      CALL cxios_file_valid_id(val, idt, len(idt));
-      file_valid_id = val
-   END FUNCTION  file_valid_id
-
-   LOGICAL FUNCTION filegroup_valid_id(idt)
-      IMPLICIT NONE
-      CHARACTER(len  = *)    , INTENT(IN) :: idt
-      LOGICAL  (kind = 1)                 :: val
-      CALL cxios_filegroup_valid_id(val, idt, len(idt));
-      filegroup_valid_id = val
-   END FUNCTION  filegroup_valid_id
    
 END MODULE IFILE
Index: /XIOS/trunk/src/fortran/igrid.F90
===================================================================
--- /XIOS/trunk/src/fortran/igrid.F90	(revision 311)
+++ /XIOS/trunk/src/fortran/igrid.F90	(revision 312)
@@ -5,12 +5,4 @@
    USE GRID_INTERFACE
    USE GRIDGROUP_INTERFACE
-   
-   TYPE XGridHandle
-      INTEGER(kind = C_INTPTR_T) :: daddr
-   END TYPE XGridHandle
-   
-   TYPE XGridGroupHandle
-      INTEGER(kind = C_INTPTR_T) :: daddr
-   END TYPE XGridGroupHandle
 
    TYPE txios(grid)
@@ -22,13 +14,4 @@
    END TYPE txios(gridgroup)
    
-   !----------------------------------------------------------------------------
-   INTERFACE set_grid_attributes
-      MODULE PROCEDURE set_grid_attributes_id,set_grid_attributes_hdl
-   END INTERFACE  
-   
-   INTERFACE set_grid_group_attributes
-      MODULE PROCEDURE set_gridgroup_attributes_id,set_gridgroup_attributes_hdl
-   END INTERFACE  
-   !----------------------------------------------------------------------------
    
    CONTAINS ! Fonctions disponibles pour les utilisateurs.
@@ -175,128 +158,4 @@
    END FUNCTION  xios(is_valid_gridgroup)
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-!!!!!!!!!!!!!!!!!!!!  Anciennes interfaces !!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   
-   SUBROUTINE set_grid_attributes_id(grid_id, name_, description_, domain_ref_, axis_ref_)
-      IMPLICIT NONE
-      TYPE(XGridHandle)                             :: grid_hdl
-      CHARACTER(len = *)               , INTENT(IN) :: grid_id
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: name_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: description_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: domain_ref_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: axis_ref_
-      
-      CALL grid_handle_create(grid_hdl, grid_id)
-      CALL set_grid_attributes_hdl(grid_hdl, name_, description_, domain_ref_, axis_ref_)
-
-   END SUBROUTINE set_grid_attributes_id
-
-   SUBROUTINE set_grid_attributes_hdl(grid_hdl, name_, description_, domain_ref_, axis_ref_)
-      IMPLICIT NONE
-      TYPE      (XGridHandle)                       :: grid_hdl
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: name_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: description_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: domain_ref_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: axis_ref_
-      
-      IF (PRESENT(name_))        THEN
-       CALL cxios_set_grid_name(grid_hdl%daddr, name_, len(name_))
-      END IF
-      IF (PRESENT(description_)) THEN
-       CALL cxios_set_grid_description(grid_hdl%daddr, description_, len(description_))
-      END IF
-      IF (PRESENT(domain_ref_))  THEN
-       CALL cxios_set_grid_domain_ref(grid_hdl%daddr, domain_ref_, len(domain_ref_))
-      END IF
-      IF (PRESENT(axis_ref_))    THEN
-       CALL cxios_set_grid_axis_ref(grid_hdl%daddr, axis_ref_, len(axis_ref_))
-      END IF
-   END SUBROUTINE set_grid_attributes_hdl
-   
-   SUBROUTINE set_gridgroup_attributes_id(gridgroup_id, name_, description_, domain_ref_, axis_ref_)
-      IMPLICIT NONE
-      TYPE(XGridGroupHandle)                        :: gridgroup_hdl
-      CHARACTER(len = *)               , INTENT(IN) :: gridgroup_id
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: name_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: description_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: domain_ref_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: axis_ref_
-      
-      CALL gridgroup_handle_create(gridgroup_hdl, gridgroup_id)
-      CALL set_gridgroup_attributes_hdl(gridgroup_hdl, name_, description_, domain_ref_, axis_ref_)
-
-   END SUBROUTINE set_gridgroup_attributes_id
-
-   SUBROUTINE set_gridgroup_attributes_hdl(gridgroup_hdl, name_, description_, domain_ref_, axis_ref_)
-      IMPLICIT NONE
-      TYPE      (XGridGroupHandle)                  :: gridgroup_hdl
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: name_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: description_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: domain_ref_
-      CHARACTER(len = *)     , OPTIONAL, INTENT(IN) :: axis_ref_
-      
-      IF (PRESENT(name_))        THEN
-       CALL cxios_set_gridgroup_name(gridgroup_hdl%daddr, name_, len(name_))
-      END IF
-      IF (PRESENT(description_)) THEN
-       CALL cxios_set_gridgroup_description(gridgroup_hdl%daddr, description_, len(description_))
-      END IF
-      IF (PRESENT(domain_ref_))  THEN
-       CALL cxios_set_gridgroup_domain_ref(gridgroup_hdl%daddr, domain_ref_, len(domain_ref_))
-      END IF
-      IF (PRESENT(axis_ref_))    THEN
-       CALL cxios_set_gridgroup_axis_ref(gridgroup_hdl%daddr, axis_ref_, len(axis_ref_))
-      END IF
-   END SUBROUTINE set_gridgroup_attributes_hdl
-
-   SUBROUTINE grid_handle_create(ret, idt)
-      IMPLICIT NONE
-      TYPE(XGridHandle), INTENT(OUT):: ret
-      CHARACTER(len = *), INTENT(IN) :: idt      
-      CALL cxios_grid_handle_create(ret%daddr, idt, len(idt))            
-   END SUBROUTINE grid_handle_create
-   
-   SUBROUTINE gridgroup_handle_create(ret, idt)
-      IMPLICIT NONE
-      TYPE(XGridGroupHandle), INTENT(OUT):: ret
-      CHARACTER(len = *)     , INTENT(IN) :: idt      
-      CALL cxios_gridgroup_handle_create(ret%daddr, idt, len(idt))            
-   END SUBROUTINE gridgroup_handle_create
-
-   LOGICAL FUNCTION grid_valid_id(idt)
-      IMPLICIT NONE
-      CHARACTER(len  = *)    , INTENT(IN) :: idt
-      LOGICAL  (kind = 1)                 :: val
-      CALL cxios_grid_valid_id(val, idt, len(idt));
-      grid_valid_id = val
-   END FUNCTION  grid_valid_id
-
-   LOGICAL FUNCTION gridgroup_valid_id(idt)
-      IMPLICIT NONE
-      CHARACTER(len  = *)    , INTENT(IN) :: idt
-      LOGICAL  (kind = 1)                 :: val
-      CALL cxios_gridgroup_valid_id(val, idt, len(idt));
-      gridgroup_valid_id = val
-   END FUNCTION  gridgroup_valid_id
    
 END MODULE IGRID
Index: /XIOS/trunk/src/fortran/ixml_tree.F90
===================================================================
--- /XIOS/trunk/src/fortran/ixml_tree.F90	(revision 311)
+++ /XIOS/trunk/src/fortran/ixml_tree.F90	(revision 312)
@@ -126,15 +126,5 @@
      
    END INTERFACE
-   
-   !----------------------------------------------------------------------------
-   INTERFACE xml_tree_add
-      MODULE PROCEDURE xml_tree_add_axis,   xml_tree_add_axisgroup,    &
-                       xml_tree_add_file,   xml_tree_add_filegroup,    &
-                       xml_tree_add_grid,   xml_tree_add_gridgroup,    &
-                       xml_tree_add_field,  xml_tree_add_fieldgroup,   &
-                       xml_tree_add_domain, xml_tree_add_domaingroup,  &
-                       xml_tree_add_fieldgrouptofile, xml_tree_add_fieldtofile
-   END INTERFACE  
-   !----------------------------------------------------------------------------
+
    
    CONTAINS ! Fonctions disponibles pour les utilisateurs.
@@ -298,191 +288,4 @@
 
    END SUBROUTINE xios(add_fieldgrouptofile)
-
-!   SUBROUTINE xml_tree_show(filename)
-!      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: filename
-!      IF (PRESENT(filename)) THEN
-!         CALL cxios_xml_tree_show(filename, len(filename))
-!      ELSE
-!         CALL cxios_xml_tree_show("NONE", -1)
-!      END IF
-!   END SUBROUTINE xml_tree_show
-   
-!   SUBROUTINE xml_parse_file(filename)
-!      CHARACTER(len = *), INTENT(IN) :: filename
-!      CALL cxios_xml_parse_file(filename, len(filename))
-!   END SUBROUTINE xml_Parse_File
-   
-!   SUBROUTINE xml_parse_string(xmlcontent)
-!      CHARACTER(len = *), INTENT(IN) :: xmlcontent
-!      CALL cxios_xml_parse_string(xmlcontent, len(xmlcontent))
-!   END SUBROUTINE xml_Parse_String
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-!!!!!!!!!!!!! Anciennes interfaces !!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-   SUBROUTINE xml_tree_add_axis(parent_hdl, child_hdl, child_id)
-      TYPE(XAxisGroupHandle)      , INTENT(IN) :: parent_hdl
-      TYPE(XAxisHandle)           , INTENT(OUT):: child_hdl
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: child_id
-      IF (PRESENT(child_id)) THEN
-         CALL cxios_xml_tree_add_axis(parent_hdl%daddr, child_hdl%daddr, child_id, len(child_id))
-      ELSE
-         CALL cxios_xml_tree_add_axis(parent_hdl%daddr, child_hdl%daddr, "NONE", -1)
-      END IF
-   END SUBROUTINE xml_tree_add_axis
-   
-   SUBROUTINE xml_tree_add_file(parent_hdl, child_hdl, child_id)
-      TYPE(XFileGroupHandle)      , INTENT(IN) :: parent_hdl
-      TYPE(XFileHandle)           , INTENT(OUT):: child_hdl
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: child_id
-      IF (PRESENT(child_id)) THEN
-         CALL cxios_xml_tree_add_file(parent_hdl%daddr, child_hdl%daddr, child_id, len(child_id))
-      ELSE
-         CALL cxios_xml_tree_add_file(parent_hdl%daddr, child_hdl%daddr, "NONE", -1)
-      END IF
-   END SUBROUTINE xml_tree_add_file
-   
-   SUBROUTINE xml_tree_add_grid(parent_hdl, child_hdl, child_id)
-      TYPE(XGridGroupHandle)      , INTENT(IN) :: parent_hdl
-      TYPE(XGridHandle)           , INTENT(OUT):: child_hdl
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: child_id
-      IF (PRESENT(child_id)) THEN
-         CALL cxios_xml_tree_add_grid(parent_hdl%daddr, child_hdl%daddr, child_id, len(child_id))
-      ELSE
-         CALL cxios_xml_tree_add_grid(parent_hdl%daddr, child_hdl%daddr, "NONE", -1)
-      END IF
-   END SUBROUTINE xml_tree_add_grid
-   
-   SUBROUTINE xml_tree_add_field(parent_hdl, child_hdl, child_id)
-      TYPE(XFieldGroupHandle)     , INTENT(IN) :: parent_hdl
-      TYPE(XFieldHandle)          , INTENT(OUT):: child_hdl
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: child_id
-      IF (PRESENT(child_id)) THEN
-         CALL cxios_xml_tree_add_field(parent_hdl%daddr, child_hdl%daddr, child_id, len(child_id))
-      ELSE
-         CALL cxios_xml_tree_add_field(parent_hdl%daddr, child_hdl%daddr, "NONE", -1)
-      END IF
-   END SUBROUTINE xml_tree_add_field
-   
-   SUBROUTINE xml_tree_add_domain(parent_hdl, child_hdl, child_id)
-      TYPE(XDomainGroupHandle)     , INTENT(IN) :: parent_hdl
-      TYPE(XDomainHandle)          , INTENT(OUT):: child_hdl
-      CHARACTER(len = *), OPTIONAL , INTENT(IN) :: child_id
-      IF (PRESENT(child_id)) THEN
-         CALL cxios_xml_tree_add_domain(parent_hdl%daddr, child_hdl%daddr, child_id, len(child_id))
-      ELSE
-         CALL cxios_xml_tree_add_domain(parent_hdl%daddr, child_hdl%daddr, "NONE", -1)
-      END IF
-   END SUBROUTINE xml_tree_add_domain
-   
-   SUBROUTINE xml_tree_add_fieldtofile(parent_hdl, child_hdl, child_id)
-      TYPE(XFileHandle)            , INTENT(IN) :: parent_hdl
-      TYPE(XFieldHandle)           , INTENT(OUT):: child_hdl
-      CHARACTER(len = *), OPTIONAL , INTENT(IN) :: child_id
-      IF (PRESENT(child_id)) THEN
-         CALL cxios_xml_tree_add_fieldtofile(parent_hdl%daddr, child_hdl%daddr, child_id, len(child_id))
-      ELSE
-         CALL cxios_xml_tree_add_fieldtofile(parent_hdl%daddr, child_hdl%daddr, "NONE", -1)
-      END IF
-   END SUBROUTINE xml_tree_add_fieldtofile
-
-   SUBROUTINE xml_tree_add_axisgroup(parent_hdl, child_hdl, child_id)
-      TYPE(XAxisGroupHandle)      , INTENT(IN) :: parent_hdl
-      TYPE(XAxisGroupHandle)      , INTENT(OUT):: child_hdl
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: child_id
-      IF (PRESENT(child_id)) THEN
-         CALL cxios_xml_tree_add_axisgroup(parent_hdl%daddr, child_hdl%daddr, child_id, len(child_id))
-      ELSE
-         CALL cxios_xml_tree_add_axisgroup(parent_hdl%daddr, child_hdl%daddr, "NONE", -1)
-      END IF
-   END SUBROUTINE xml_tree_add_axisgroup
-
-   SUBROUTINE xml_tree_add_filegroup(parent_hdl, child_hdl, child_id)
-      TYPE(XFileGroupHandle)      , INTENT(IN) :: parent_hdl
-      TYPE(XFileGroupHandle)      , INTENT(OUT):: child_hdl
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: child_id
-      IF (PRESENT(child_id)) THEN
-         CALL cxios_xml_tree_add_filegroup(parent_hdl%daddr, child_hdl%daddr, child_id, len(child_id))
-      ELSE
-         CALL cxios_xml_tree_add_filegroup(parent_hdl%daddr, child_hdl%daddr, "NONE", -1)
-      END IF
-   END SUBROUTINE xml_tree_add_filegroup
-
-   SUBROUTINE xml_tree_add_gridgroup(parent_hdl, child_hdl, child_id)
-      TYPE(XGridGroupHandle)      , INTENT(IN) :: parent_hdl
-      TYPE(XGridGroupHandle)      , INTENT(OUT):: child_hdl
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: child_id
-      IF (PRESENT(child_id)) THEN
-         CALL cxios_xml_tree_add_gridgroup(parent_hdl%daddr, child_hdl%daddr, child_id, len(child_id))
-      ELSE
-         CALL cxios_xml_tree_add_gridgroup(parent_hdl%daddr, child_hdl%daddr, "NONE", -1)
-      END IF
-   END SUBROUTINE xml_tree_add_gridgroup
-
-   SUBROUTINE xml_tree_add_fieldgroup(parent_hdl, child_hdl, child_id)
-      TYPE(XFieldGroupHandle)     , INTENT(IN) :: parent_hdl
-      TYPE(XFieldGroupHandle)     , INTENT(OUT):: child_hdl
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: child_id
-      IF (PRESENT(child_id)) THEN
-         CALL cxios_xml_tree_add_fieldgroup(parent_hdl%daddr, child_hdl%daddr, child_id, len(child_id))
-      ELSE
-         CALL cxios_xml_tree_add_fieldgroup(parent_hdl%daddr, child_hdl%daddr, "NONE", -1)
-      END IF
-   END SUBROUTINE xml_tree_add_fieldgroup
-
-   SUBROUTINE xml_tree_add_domaingroup(parent_hdl, child_hdl, child_id)
-      TYPE(XDomainGroupHandle)     , INTENT(IN) :: parent_hdl
-      TYPE(XDomainGroupHandle)     , INTENT(OUT):: child_hdl
-      CHARACTER(len = *), OPTIONAL , INTENT(IN) :: child_id
-      IF (PRESENT(child_id)) THEN
-         CALL cxios_xml_tree_add_domaingroup(parent_hdl%daddr, child_hdl%daddr, child_id, len(child_id))
-      ELSE
-         CALL cxios_xml_tree_add_domaingroup(parent_hdl%daddr, child_hdl%daddr, "NONE", -1)
-      END IF
-   END SUBROUTINE xml_tree_add_domaingroup
-
-   SUBROUTINE xml_tree_add_fieldgrouptofile(parent_hdl, child_hdl, child_id)
-      TYPE(XFileHandle)            , INTENT(IN) :: parent_hdl
-      TYPE(XFieldGroupHandle)      , INTENT(OUT):: child_hdl
-      CHARACTER(len = *), OPTIONAL , INTENT(IN) :: child_id
-      IF (PRESENT(child_id)) THEN
-         CALL cxios_xml_tree_add_fieldgrouptofile(parent_hdl%daddr, child_hdl%daddr, child_id, len(child_id))
-      ELSE
-         CALL cxios_xml_tree_add_fieldgrouptofile(parent_hdl%daddr, child_hdl%daddr, "NONE", -1)
-      END IF
-   END SUBROUTINE xml_tree_add_fieldgrouptofile
-
-   SUBROUTINE xml_tree_show(filename)
-      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: filename
-      IF (PRESENT(filename)) THEN
-         CALL cxios_xml_tree_show(filename, len(filename))
-      ELSE
-         CALL cxios_xml_tree_show("NONE", -1)
-      END IF
-   END SUBROUTINE xml_tree_show
-   
-   SUBROUTINE xml_parse_file(filename)
-      CHARACTER(len = *), INTENT(IN) :: filename
-      CALL cxios_xml_parse_file(filename, len(filename))
-   END SUBROUTINE xml_Parse_File
-   
-   SUBROUTINE xml_parse_string(xmlcontent)
-      CHARACTER(len = *), INTENT(IN) :: xmlcontent
-      CALL cxios_xml_parse_string(xmlcontent, len(xmlcontent))
-   END SUBROUTINE xml_Parse_String
       
 END MODULE IXML_TREE
