Index: XIOS/trunk/src/interface/fortran_attr/axis_interface_attr.F90
===================================================================
--- XIOS/trunk/src/interface/fortran_attr/axis_interface_attr.F90	(revision 664)
+++ XIOS/trunk/src/interface/fortran_attr/axis_interface_attr.F90	(revision 666)
@@ -31,4 +31,23 @@
 
 
+    SUBROUTINE cxios_set_axis_begin(axis_hdl, begin) BIND(C)
+      USE ISO_C_BINDING
+      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
+      INTEGER (KIND=C_INT)      , VALUE :: begin
+    END SUBROUTINE cxios_set_axis_begin
+
+    SUBROUTINE cxios_get_axis_begin(axis_hdl, begin) BIND(C)
+      USE ISO_C_BINDING
+      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
+      INTEGER (KIND=C_INT)             :: begin
+    END SUBROUTINE cxios_get_axis_begin
+
+    FUNCTION cxios_is_defined_axis_begin(axis_hdl) BIND(C)
+      USE ISO_C_BINDING
+      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axis_begin
+      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
+    END FUNCTION cxios_is_defined_axis_begin
+
+
     SUBROUTINE cxios_set_axis_bounds(axis_hdl, bounds, extent1, extent2) BIND(C)
       USE ISO_C_BINDING
@@ -111,23 +130,4 @@
       INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
     END FUNCTION cxios_is_defined_axis_data_n
-
-
-    SUBROUTINE cxios_set_axis_ibegin(axis_hdl, ibegin) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
-      INTEGER (KIND=C_INT)      , VALUE :: ibegin
-    END SUBROUTINE cxios_set_axis_ibegin
-
-    SUBROUTINE cxios_get_axis_ibegin(axis_hdl, ibegin) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
-      INTEGER (KIND=C_INT)             :: ibegin
-    END SUBROUTINE cxios_get_axis_ibegin
-
-    FUNCTION cxios_is_defined_axis_ibegin(axis_hdl) BIND(C)
-      USE ISO_C_BINDING
-      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axis_ibegin
-      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
-    END FUNCTION cxios_is_defined_axis_ibegin
 
 
@@ -174,4 +174,42 @@
 
 
+    SUBROUTINE cxios_set_axis_n(axis_hdl, n) BIND(C)
+      USE ISO_C_BINDING
+      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
+      INTEGER (KIND=C_INT)      , VALUE :: n
+    END SUBROUTINE cxios_set_axis_n
+
+    SUBROUTINE cxios_get_axis_n(axis_hdl, n) BIND(C)
+      USE ISO_C_BINDING
+      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
+      INTEGER (KIND=C_INT)             :: n
+    END SUBROUTINE cxios_get_axis_n
+
+    FUNCTION cxios_is_defined_axis_n(axis_hdl) BIND(C)
+      USE ISO_C_BINDING
+      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axis_n
+      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
+    END FUNCTION cxios_is_defined_axis_n
+
+
+    SUBROUTINE cxios_set_axis_n_glo(axis_hdl, n_glo) BIND(C)
+      USE ISO_C_BINDING
+      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
+      INTEGER (KIND=C_INT)      , VALUE :: n_glo
+    END SUBROUTINE cxios_set_axis_n_glo
+
+    SUBROUTINE cxios_get_axis_n_glo(axis_hdl, n_glo) BIND(C)
+      USE ISO_C_BINDING
+      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
+      INTEGER (KIND=C_INT)             :: n_glo
+    END SUBROUTINE cxios_get_axis_n_glo
+
+    FUNCTION cxios_is_defined_axis_n_glo(axis_hdl) BIND(C)
+      USE ISO_C_BINDING
+      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axis_n_glo
+      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
+    END FUNCTION cxios_is_defined_axis_n_glo
+
+
     SUBROUTINE cxios_set_axis_name(axis_hdl, name, name_size) BIND(C)
       USE ISO_C_BINDING
@@ -195,23 +233,4 @@
 
 
-    SUBROUTINE cxios_set_axis_ni(axis_hdl, ni) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
-      INTEGER (KIND=C_INT)      , VALUE :: ni
-    END SUBROUTINE cxios_set_axis_ni
-
-    SUBROUTINE cxios_get_axis_ni(axis_hdl, ni) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
-      INTEGER (KIND=C_INT)             :: ni
-    END SUBROUTINE cxios_get_axis_ni
-
-    FUNCTION cxios_is_defined_axis_ni(axis_hdl) BIND(C)
-      USE ISO_C_BINDING
-      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axis_ni
-      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
-    END FUNCTION cxios_is_defined_axis_ni
-
-
     SUBROUTINE cxios_set_axis_positive(axis_hdl, positive, positive_size) BIND(C)
       USE ISO_C_BINDING
@@ -235,23 +254,4 @@
 
 
-    SUBROUTINE cxios_set_axis_size(axis_hdl, size) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
-      INTEGER (KIND=C_INT)      , VALUE :: size
-    END SUBROUTINE cxios_set_axis_size
-
-    SUBROUTINE cxios_get_axis_size(axis_hdl, size) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
-      INTEGER (KIND=C_INT)             :: size
-    END SUBROUTINE cxios_get_axis_size
-
-    FUNCTION cxios_is_defined_axis_size(axis_hdl) BIND(C)
-      USE ISO_C_BINDING
-      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axis_size
-      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
-    END FUNCTION cxios_is_defined_axis_size
-
-
     SUBROUTINE cxios_set_axis_standard_name(axis_hdl, standard_name, standard_name_size) BIND(C)
       USE ISO_C_BINDING
@@ -316,61 +316,4 @@
     END FUNCTION cxios_is_defined_axis_value
 
-
-    SUBROUTINE cxios_set_axis_zoom_begin(axis_hdl, zoom_begin) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
-      INTEGER (KIND=C_INT)      , VALUE :: zoom_begin
-    END SUBROUTINE cxios_set_axis_zoom_begin
-
-    SUBROUTINE cxios_get_axis_zoom_begin(axis_hdl, zoom_begin) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
-      INTEGER (KIND=C_INT)             :: zoom_begin
-    END SUBROUTINE cxios_get_axis_zoom_begin
-
-    FUNCTION cxios_is_defined_axis_zoom_begin(axis_hdl) BIND(C)
-      USE ISO_C_BINDING
-      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axis_zoom_begin
-      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
-    END FUNCTION cxios_is_defined_axis_zoom_begin
-
-
-    SUBROUTINE cxios_set_axis_zoom_end(axis_hdl, zoom_end) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
-      INTEGER (KIND=C_INT)      , VALUE :: zoom_end
-    END SUBROUTINE cxios_set_axis_zoom_end
-
-    SUBROUTINE cxios_get_axis_zoom_end(axis_hdl, zoom_end) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
-      INTEGER (KIND=C_INT)             :: zoom_end
-    END SUBROUTINE cxios_get_axis_zoom_end
-
-    FUNCTION cxios_is_defined_axis_zoom_end(axis_hdl) BIND(C)
-      USE ISO_C_BINDING
-      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axis_zoom_end
-      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
-    END FUNCTION cxios_is_defined_axis_zoom_end
-
-
-    SUBROUTINE cxios_set_axis_zoom_size(axis_hdl, zoom_size) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
-      INTEGER (KIND=C_INT)      , VALUE :: zoom_size
-    END SUBROUTINE cxios_set_axis_zoom_size
-
-    SUBROUTINE cxios_get_axis_zoom_size(axis_hdl, zoom_size) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
-      INTEGER (KIND=C_INT)             :: zoom_size
-    END SUBROUTINE cxios_get_axis_zoom_size
-
-    FUNCTION cxios_is_defined_axis_zoom_size(axis_hdl) BIND(C)
-      USE ISO_C_BINDING
-      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axis_zoom_size
-      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl
-    END FUNCTION cxios_is_defined_axis_zoom_size
-
   END INTERFACE
 
Index: XIOS/trunk/src/interface/fortran_attr/axisgroup_interface_attr.F90
===================================================================
--- XIOS/trunk/src/interface/fortran_attr/axisgroup_interface_attr.F90	(revision 664)
+++ XIOS/trunk/src/interface/fortran_attr/axisgroup_interface_attr.F90	(revision 666)
@@ -31,4 +31,23 @@
 
 
+    SUBROUTINE cxios_set_axisgroup_begin(axisgroup_hdl, begin) BIND(C)
+      USE ISO_C_BINDING
+      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
+      INTEGER (KIND=C_INT)      , VALUE :: begin
+    END SUBROUTINE cxios_set_axisgroup_begin
+
+    SUBROUTINE cxios_get_axisgroup_begin(axisgroup_hdl, begin) BIND(C)
+      USE ISO_C_BINDING
+      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
+      INTEGER (KIND=C_INT)             :: begin
+    END SUBROUTINE cxios_get_axisgroup_begin
+
+    FUNCTION cxios_is_defined_axisgroup_begin(axisgroup_hdl) BIND(C)
+      USE ISO_C_BINDING
+      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axisgroup_begin
+      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
+    END FUNCTION cxios_is_defined_axisgroup_begin
+
+
     SUBROUTINE cxios_set_axisgroup_bounds(axisgroup_hdl, bounds, extent1, extent2) BIND(C)
       USE ISO_C_BINDING
@@ -134,23 +153,4 @@
 
 
-    SUBROUTINE cxios_set_axisgroup_ibegin(axisgroup_hdl, ibegin) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
-      INTEGER (KIND=C_INT)      , VALUE :: ibegin
-    END SUBROUTINE cxios_set_axisgroup_ibegin
-
-    SUBROUTINE cxios_get_axisgroup_ibegin(axisgroup_hdl, ibegin) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
-      INTEGER (KIND=C_INT)             :: ibegin
-    END SUBROUTINE cxios_get_axisgroup_ibegin
-
-    FUNCTION cxios_is_defined_axisgroup_ibegin(axisgroup_hdl) BIND(C)
-      USE ISO_C_BINDING
-      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axisgroup_ibegin
-      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
-    END FUNCTION cxios_is_defined_axisgroup_ibegin
-
-
     SUBROUTINE cxios_set_axisgroup_long_name(axisgroup_hdl, long_name, long_name_size) BIND(C)
       USE ISO_C_BINDING
@@ -195,4 +195,42 @@
 
 
+    SUBROUTINE cxios_set_axisgroup_n(axisgroup_hdl, n) BIND(C)
+      USE ISO_C_BINDING
+      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
+      INTEGER (KIND=C_INT)      , VALUE :: n
+    END SUBROUTINE cxios_set_axisgroup_n
+
+    SUBROUTINE cxios_get_axisgroup_n(axisgroup_hdl, n) BIND(C)
+      USE ISO_C_BINDING
+      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
+      INTEGER (KIND=C_INT)             :: n
+    END SUBROUTINE cxios_get_axisgroup_n
+
+    FUNCTION cxios_is_defined_axisgroup_n(axisgroup_hdl) BIND(C)
+      USE ISO_C_BINDING
+      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axisgroup_n
+      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
+    END FUNCTION cxios_is_defined_axisgroup_n
+
+
+    SUBROUTINE cxios_set_axisgroup_n_glo(axisgroup_hdl, n_glo) BIND(C)
+      USE ISO_C_BINDING
+      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
+      INTEGER (KIND=C_INT)      , VALUE :: n_glo
+    END SUBROUTINE cxios_set_axisgroup_n_glo
+
+    SUBROUTINE cxios_get_axisgroup_n_glo(axisgroup_hdl, n_glo) BIND(C)
+      USE ISO_C_BINDING
+      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
+      INTEGER (KIND=C_INT)             :: n_glo
+    END SUBROUTINE cxios_get_axisgroup_n_glo
+
+    FUNCTION cxios_is_defined_axisgroup_n_glo(axisgroup_hdl) BIND(C)
+      USE ISO_C_BINDING
+      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axisgroup_n_glo
+      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
+    END FUNCTION cxios_is_defined_axisgroup_n_glo
+
+
     SUBROUTINE cxios_set_axisgroup_name(axisgroup_hdl, name, name_size) BIND(C)
       USE ISO_C_BINDING
@@ -216,23 +254,4 @@
 
 
-    SUBROUTINE cxios_set_axisgroup_ni(axisgroup_hdl, ni) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
-      INTEGER (KIND=C_INT)      , VALUE :: ni
-    END SUBROUTINE cxios_set_axisgroup_ni
-
-    SUBROUTINE cxios_get_axisgroup_ni(axisgroup_hdl, ni) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
-      INTEGER (KIND=C_INT)             :: ni
-    END SUBROUTINE cxios_get_axisgroup_ni
-
-    FUNCTION cxios_is_defined_axisgroup_ni(axisgroup_hdl) BIND(C)
-      USE ISO_C_BINDING
-      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axisgroup_ni
-      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
-    END FUNCTION cxios_is_defined_axisgroup_ni
-
-
     SUBROUTINE cxios_set_axisgroup_positive(axisgroup_hdl, positive, positive_size) BIND(C)
       USE ISO_C_BINDING
@@ -256,23 +275,4 @@
 
 
-    SUBROUTINE cxios_set_axisgroup_size(axisgroup_hdl, size) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
-      INTEGER (KIND=C_INT)      , VALUE :: size
-    END SUBROUTINE cxios_set_axisgroup_size
-
-    SUBROUTINE cxios_get_axisgroup_size(axisgroup_hdl, size) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
-      INTEGER (KIND=C_INT)             :: size
-    END SUBROUTINE cxios_get_axisgroup_size
-
-    FUNCTION cxios_is_defined_axisgroup_size(axisgroup_hdl) BIND(C)
-      USE ISO_C_BINDING
-      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axisgroup_size
-      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
-    END FUNCTION cxios_is_defined_axisgroup_size
-
-
     SUBROUTINE cxios_set_axisgroup_standard_name(axisgroup_hdl, standard_name, standard_name_size) BIND(C)
       USE ISO_C_BINDING
@@ -337,61 +337,4 @@
     END FUNCTION cxios_is_defined_axisgroup_value
 
-
-    SUBROUTINE cxios_set_axisgroup_zoom_begin(axisgroup_hdl, zoom_begin) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
-      INTEGER (KIND=C_INT)      , VALUE :: zoom_begin
-    END SUBROUTINE cxios_set_axisgroup_zoom_begin
-
-    SUBROUTINE cxios_get_axisgroup_zoom_begin(axisgroup_hdl, zoom_begin) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
-      INTEGER (KIND=C_INT)             :: zoom_begin
-    END SUBROUTINE cxios_get_axisgroup_zoom_begin
-
-    FUNCTION cxios_is_defined_axisgroup_zoom_begin(axisgroup_hdl) BIND(C)
-      USE ISO_C_BINDING
-      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axisgroup_zoom_begin
-      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
-    END FUNCTION cxios_is_defined_axisgroup_zoom_begin
-
-
-    SUBROUTINE cxios_set_axisgroup_zoom_end(axisgroup_hdl, zoom_end) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
-      INTEGER (KIND=C_INT)      , VALUE :: zoom_end
-    END SUBROUTINE cxios_set_axisgroup_zoom_end
-
-    SUBROUTINE cxios_get_axisgroup_zoom_end(axisgroup_hdl, zoom_end) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
-      INTEGER (KIND=C_INT)             :: zoom_end
-    END SUBROUTINE cxios_get_axisgroup_zoom_end
-
-    FUNCTION cxios_is_defined_axisgroup_zoom_end(axisgroup_hdl) BIND(C)
-      USE ISO_C_BINDING
-      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axisgroup_zoom_end
-      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
-    END FUNCTION cxios_is_defined_axisgroup_zoom_end
-
-
-    SUBROUTINE cxios_set_axisgroup_zoom_size(axisgroup_hdl, zoom_size) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
-      INTEGER (KIND=C_INT)      , VALUE :: zoom_size
-    END SUBROUTINE cxios_set_axisgroup_zoom_size
-
-    SUBROUTINE cxios_get_axisgroup_zoom_size(axisgroup_hdl, zoom_size) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
-      INTEGER (KIND=C_INT)             :: zoom_size
-    END SUBROUTINE cxios_get_axisgroup_zoom_size
-
-    FUNCTION cxios_is_defined_axisgroup_zoom_size(axisgroup_hdl) BIND(C)
-      USE ISO_C_BINDING
-      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axisgroup_zoom_size
-      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl
-    END FUNCTION cxios_is_defined_axisgroup_zoom_size
-
   END INTERFACE
 
Index: XIOS/trunk/src/interface/fortran_attr/domain_interface_attr.F90
===================================================================
--- XIOS/trunk/src/interface/fortran_attr/domain_interface_attr.F90	(revision 664)
+++ XIOS/trunk/src/interface/fortran_attr/domain_interface_attr.F90	(revision 666)
@@ -228,23 +228,4 @@
 
 
-    SUBROUTINE cxios_set_domain_data_n_index(domain_hdl, data_n_index) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl
-      INTEGER (KIND=C_INT)      , VALUE :: data_n_index
-    END SUBROUTINE cxios_set_domain_data_n_index
-
-    SUBROUTINE cxios_get_domain_data_n_index(domain_hdl, data_n_index) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl
-      INTEGER (KIND=C_INT)             :: data_n_index
-    END SUBROUTINE cxios_get_domain_data_n_index
-
-    FUNCTION cxios_is_defined_domain_data_n_index(domain_hdl) BIND(C)
-      USE ISO_C_BINDING
-      LOGICAL(kind=C_BOOL) :: cxios_is_defined_domain_data_n_index
-      INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl
-    END FUNCTION cxios_is_defined_domain_data_n_index
-
-
     SUBROUTINE cxios_set_domain_data_ni(domain_hdl, data_ni) BIND(C)
       USE ISO_C_BINDING
Index: XIOS/trunk/src/interface/fortran_attr/domaingroup_interface_attr.F90
===================================================================
--- XIOS/trunk/src/interface/fortran_attr/domaingroup_interface_attr.F90	(revision 664)
+++ XIOS/trunk/src/interface/fortran_attr/domaingroup_interface_attr.F90	(revision 666)
@@ -228,23 +228,4 @@
 
 
-    SUBROUTINE cxios_set_domaingroup_data_n_index(domaingroup_hdl, data_n_index) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl
-      INTEGER (KIND=C_INT)      , VALUE :: data_n_index
-    END SUBROUTINE cxios_set_domaingroup_data_n_index
-
-    SUBROUTINE cxios_get_domaingroup_data_n_index(domaingroup_hdl, data_n_index) BIND(C)
-      USE ISO_C_BINDING
-      INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl
-      INTEGER (KIND=C_INT)             :: data_n_index
-    END SUBROUTINE cxios_get_domaingroup_data_n_index
-
-    FUNCTION cxios_is_defined_domaingroup_data_n_index(domaingroup_hdl) BIND(C)
-      USE ISO_C_BINDING
-      LOGICAL(kind=C_BOOL) :: cxios_is_defined_domaingroup_data_n_index
-      INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl
-    END FUNCTION cxios_is_defined_domaingroup_data_n_index
-
-
     SUBROUTINE cxios_set_domaingroup_data_ni(domaingroup_hdl, data_ni) BIND(C)
       USE ISO_C_BINDING
Index: XIOS/trunk/src/interface/fortran_attr/iaxis_attr.F90
===================================================================
--- XIOS/trunk/src/interface/fortran_attr/iaxis_attr.F90	(revision 664)
+++ XIOS/trunk/src/interface/fortran_attr/iaxis_attr.F90	(revision 666)
@@ -12,6 +12,6 @@
 
   SUBROUTINE xios(set_axis_attr)  &
-    ( axis_id, axis_ref, bounds, data_begin, data_index, data_n, ibegin, long_name, mask, name, ni  &
-    , positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size )
+    ( axis_id, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  &
+    , name, positive, standard_name, unit, value )
 
     IMPLICIT NONE
@@ -19,88 +19,78 @@
       CHARACTER(LEN=*), INTENT(IN) ::axis_id
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref
+      INTEGER  , OPTIONAL, INTENT(IN) :: begin
       REAL (KIND=8) , OPTIONAL, INTENT(IN) :: bounds(:,:)
       INTEGER  , OPTIONAL, INTENT(IN) :: data_begin
       INTEGER  , OPTIONAL, INTENT(IN) :: data_index(:)
       INTEGER  , OPTIONAL, INTENT(IN) :: data_n
-      INTEGER  , OPTIONAL, INTENT(IN) :: ibegin
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name
       LOGICAL  , OPTIONAL, INTENT(IN) :: mask(:)
       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:)
+      INTEGER  , OPTIONAL, INTENT(IN) :: n
+      INTEGER  , OPTIONAL, INTENT(IN) :: n_glo
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name
-      INTEGER  , OPTIONAL, INTENT(IN) :: ni
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: positive
-      INTEGER  , OPTIONAL, INTENT(IN) :: size
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: unit
       REAL (KIND=8) , OPTIONAL, INTENT(IN) :: value(:)
-      INTEGER  , OPTIONAL, INTENT(IN) :: zoom_begin
-      INTEGER  , OPTIONAL, INTENT(IN) :: zoom_end
-      INTEGER  , OPTIONAL, INTENT(IN) :: zoom_size
 
       CALL xios(get_axis_handle)(axis_id,axis_hdl)
       CALL xios(set_axis_attr_hdl_)   &
-      ( axis_hdl, axis_ref, bounds, data_begin, data_index, data_n, ibegin, long_name, mask, name  &
-      , ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size )
+      ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  &
+      , name, positive, standard_name, unit, value )
 
   END SUBROUTINE xios(set_axis_attr)
 
   SUBROUTINE xios(set_axis_attr_hdl)  &
-    ( axis_hdl, axis_ref, bounds, data_begin, data_index, data_n, ibegin, long_name, mask, name  &
-    , ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size )
+    ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  &
+    , name, positive, standard_name, unit, value )
 
     IMPLICIT NONE
       TYPE(txios(axis)) , INTENT(IN) :: axis_hdl
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref
+      INTEGER  , OPTIONAL, INTENT(IN) :: begin
       REAL (KIND=8) , OPTIONAL, INTENT(IN) :: bounds(:,:)
       INTEGER  , OPTIONAL, INTENT(IN) :: data_begin
       INTEGER  , OPTIONAL, INTENT(IN) :: data_index(:)
       INTEGER  , OPTIONAL, INTENT(IN) :: data_n
-      INTEGER  , OPTIONAL, INTENT(IN) :: ibegin
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name
       LOGICAL  , OPTIONAL, INTENT(IN) :: mask(:)
       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:)
+      INTEGER  , OPTIONAL, INTENT(IN) :: n
+      INTEGER  , OPTIONAL, INTENT(IN) :: n_glo
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name
-      INTEGER  , OPTIONAL, INTENT(IN) :: ni
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: positive
-      INTEGER  , OPTIONAL, INTENT(IN) :: size
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: unit
       REAL (KIND=8) , OPTIONAL, INTENT(IN) :: value(:)
-      INTEGER  , OPTIONAL, INTENT(IN) :: zoom_begin
-      INTEGER  , OPTIONAL, INTENT(IN) :: zoom_end
-      INTEGER  , OPTIONAL, INTENT(IN) :: zoom_size
 
       CALL xios(set_axis_attr_hdl_)  &
-      ( axis_hdl, axis_ref, bounds, data_begin, data_index, data_n, ibegin, long_name, mask, name  &
-      , ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size )
+      ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  &
+      , name, positive, standard_name, unit, value )
 
   END SUBROUTINE xios(set_axis_attr_hdl)
 
   SUBROUTINE xios(set_axis_attr_hdl_)   &
-    ( axis_hdl, axis_ref_, bounds_, data_begin_, data_index_, data_n_, ibegin_, long_name_, mask_  &
-    , name_, ni_, positive_, size_, standard_name_, unit_, value_, zoom_begin_, zoom_end_, zoom_size_  &
-     )
+    ( axis_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, long_name_, mask_  &
+    , n_, n_glo_, name_, positive_, standard_name_, unit_, value_ )
 
     IMPLICIT NONE
       TYPE(txios(axis)) , INTENT(IN) :: axis_hdl
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref_
+      INTEGER  , OPTIONAL, INTENT(IN) :: begin_
       REAL (KIND=8) , OPTIONAL, INTENT(IN) :: bounds_(:,:)
       INTEGER  , OPTIONAL, INTENT(IN) :: data_begin_
       INTEGER  , OPTIONAL, INTENT(IN) :: data_index_(:)
       INTEGER  , OPTIONAL, INTENT(IN) :: data_n_
-      INTEGER  , OPTIONAL, INTENT(IN) :: ibegin_
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name_
       LOGICAL  , OPTIONAL, INTENT(IN) :: mask_(:)
       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask__tmp(:)
+      INTEGER  , OPTIONAL, INTENT(IN) :: n_
+      INTEGER  , OPTIONAL, INTENT(IN) :: n_glo_
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_
-      INTEGER  , OPTIONAL, INTENT(IN) :: ni_
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: positive_
-      INTEGER  , OPTIONAL, INTENT(IN) :: size_
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name_
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: unit_
       REAL (KIND=8) , OPTIONAL, INTENT(IN) :: value_(:)
-      INTEGER  , OPTIONAL, INTENT(IN) :: zoom_begin_
-      INTEGER  , OPTIONAL, INTENT(IN) :: zoom_end_
-      INTEGER  , OPTIONAL, INTENT(IN) :: zoom_size_
 
       IF (PRESENT(axis_ref_)) THEN
@@ -108,4 +98,8 @@
       ENDIF
 
+      IF (PRESENT(begin_)) THEN
+        CALL cxios_set_axis_begin(axis_hdl%daddr, begin_)
+      ENDIF
+
       IF (PRESENT(bounds_)) THEN
         CALL cxios_set_axis_bounds(axis_hdl%daddr, bounds_, size(bounds_,1), size(bounds_,2))
@@ -122,8 +116,4 @@
       IF (PRESENT(data_n_)) THEN
         CALL cxios_set_axis_data_n(axis_hdl%daddr, data_n_)
-      ENDIF
-
-      IF (PRESENT(ibegin_)) THEN
-        CALL cxios_set_axis_ibegin(axis_hdl%daddr, ibegin_)
       ENDIF
 
@@ -138,20 +128,20 @@
       ENDIF
 
+      IF (PRESENT(n_)) THEN
+        CALL cxios_set_axis_n(axis_hdl%daddr, n_)
+      ENDIF
+
+      IF (PRESENT(n_glo_)) THEN
+        CALL cxios_set_axis_n_glo(axis_hdl%daddr, n_glo_)
+      ENDIF
+
       IF (PRESENT(name_)) THEN
         CALL cxios_set_axis_name(axis_hdl%daddr, name_, len(name_))
       ENDIF
 
-      IF (PRESENT(ni_)) THEN
-        CALL cxios_set_axis_ni(axis_hdl%daddr, ni_)
-      ENDIF
-
       IF (PRESENT(positive_)) THEN
         CALL cxios_set_axis_positive(axis_hdl%daddr, positive_, len(positive_))
       ENDIF
 
-      IF (PRESENT(size_)) THEN
-        CALL cxios_set_axis_size(axis_hdl%daddr, size_)
-      ENDIF
-
       IF (PRESENT(standard_name_)) THEN
         CALL cxios_set_axis_standard_name(axis_hdl%daddr, standard_name_, len(standard_name_))
@@ -166,21 +156,9 @@
       ENDIF
 
-      IF (PRESENT(zoom_begin_)) THEN
-        CALL cxios_set_axis_zoom_begin(axis_hdl%daddr, zoom_begin_)
-      ENDIF
-
-      IF (PRESENT(zoom_end_)) THEN
-        CALL cxios_set_axis_zoom_end(axis_hdl%daddr, zoom_end_)
-      ENDIF
-
-      IF (PRESENT(zoom_size_)) THEN
-        CALL cxios_set_axis_zoom_size(axis_hdl%daddr, zoom_size_)
-      ENDIF
-
   END SUBROUTINE xios(set_axis_attr_hdl_)
 
   SUBROUTINE xios(get_axis_attr)  &
-    ( axis_id, axis_ref, bounds, data_begin, data_index, data_n, ibegin, long_name, mask, name, ni  &
-    , positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size )
+    ( axis_id, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  &
+    , name, positive, standard_name, unit, value )
 
     IMPLICIT NONE
@@ -188,88 +166,78 @@
       CHARACTER(LEN=*), INTENT(IN) ::axis_id
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref
+      INTEGER  , OPTIONAL, INTENT(OUT) :: begin
       REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: bounds(:,:)
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_begin
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_index(:)
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_n
-      INTEGER  , OPTIONAL, INTENT(OUT) :: ibegin
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name
       LOGICAL  , OPTIONAL, INTENT(OUT) :: mask(:)
       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:)
+      INTEGER  , OPTIONAL, INTENT(OUT) :: n
+      INTEGER  , OPTIONAL, INTENT(OUT) :: n_glo
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name
-      INTEGER  , OPTIONAL, INTENT(OUT) :: ni
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: positive
-      INTEGER  , OPTIONAL, INTENT(OUT) :: size
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: unit
       REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: value(:)
-      INTEGER  , OPTIONAL, INTENT(OUT) :: zoom_begin
-      INTEGER  , OPTIONAL, INTENT(OUT) :: zoom_end
-      INTEGER  , OPTIONAL, INTENT(OUT) :: zoom_size
 
       CALL xios(get_axis_handle)(axis_id,axis_hdl)
       CALL xios(get_axis_attr_hdl_)   &
-      ( axis_hdl, axis_ref, bounds, data_begin, data_index, data_n, ibegin, long_name, mask, name  &
-      , ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size )
+      ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  &
+      , name, positive, standard_name, unit, value )
 
   END SUBROUTINE xios(get_axis_attr)
 
   SUBROUTINE xios(get_axis_attr_hdl)  &
-    ( axis_hdl, axis_ref, bounds, data_begin, data_index, data_n, ibegin, long_name, mask, name  &
-    , ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size )
+    ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  &
+    , name, positive, standard_name, unit, value )
 
     IMPLICIT NONE
       TYPE(txios(axis)) , INTENT(IN) :: axis_hdl
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref
+      INTEGER  , OPTIONAL, INTENT(OUT) :: begin
       REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: bounds(:,:)
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_begin
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_index(:)
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_n
-      INTEGER  , OPTIONAL, INTENT(OUT) :: ibegin
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name
       LOGICAL  , OPTIONAL, INTENT(OUT) :: mask(:)
       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:)
+      INTEGER  , OPTIONAL, INTENT(OUT) :: n
+      INTEGER  , OPTIONAL, INTENT(OUT) :: n_glo
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name
-      INTEGER  , OPTIONAL, INTENT(OUT) :: ni
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: positive
-      INTEGER  , OPTIONAL, INTENT(OUT) :: size
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: unit
       REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: value(:)
-      INTEGER  , OPTIONAL, INTENT(OUT) :: zoom_begin
-      INTEGER  , OPTIONAL, INTENT(OUT) :: zoom_end
-      INTEGER  , OPTIONAL, INTENT(OUT) :: zoom_size
 
       CALL xios(get_axis_attr_hdl_)  &
-      ( axis_hdl, axis_ref, bounds, data_begin, data_index, data_n, ibegin, long_name, mask, name  &
-      , ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size )
+      ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  &
+      , name, positive, standard_name, unit, value )
 
   END SUBROUTINE xios(get_axis_attr_hdl)
 
   SUBROUTINE xios(get_axis_attr_hdl_)   &
-    ( axis_hdl, axis_ref_, bounds_, data_begin_, data_index_, data_n_, ibegin_, long_name_, mask_  &
-    , name_, ni_, positive_, size_, standard_name_, unit_, value_, zoom_begin_, zoom_end_, zoom_size_  &
-     )
+    ( axis_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, long_name_, mask_  &
+    , n_, n_glo_, name_, positive_, standard_name_, unit_, value_ )
 
     IMPLICIT NONE
       TYPE(txios(axis)) , INTENT(IN) :: axis_hdl
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref_
+      INTEGER  , OPTIONAL, INTENT(OUT) :: begin_
       REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: bounds_(:,:)
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_begin_
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_index_(:)
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_n_
-      INTEGER  , OPTIONAL, INTENT(OUT) :: ibegin_
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name_
       LOGICAL  , OPTIONAL, INTENT(OUT) :: mask_(:)
       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask__tmp(:)
+      INTEGER  , OPTIONAL, INTENT(OUT) :: n_
+      INTEGER  , OPTIONAL, INTENT(OUT) :: n_glo_
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_
-      INTEGER  , OPTIONAL, INTENT(OUT) :: ni_
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: positive_
-      INTEGER  , OPTIONAL, INTENT(OUT) :: size_
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name_
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: unit_
       REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: value_(:)
-      INTEGER  , OPTIONAL, INTENT(OUT) :: zoom_begin_
-      INTEGER  , OPTIONAL, INTENT(OUT) :: zoom_end_
-      INTEGER  , OPTIONAL, INTENT(OUT) :: zoom_size_
 
       IF (PRESENT(axis_ref_)) THEN
@@ -277,4 +245,8 @@
       ENDIF
 
+      IF (PRESENT(begin_)) THEN
+        CALL cxios_get_axis_begin(axis_hdl%daddr, begin_)
+      ENDIF
+
       IF (PRESENT(bounds_)) THEN
         CALL cxios_get_axis_bounds(axis_hdl%daddr, bounds_, size(bounds_,1), size(bounds_,2))
@@ -291,8 +263,4 @@
       IF (PRESENT(data_n_)) THEN
         CALL cxios_get_axis_data_n(axis_hdl%daddr, data_n_)
-      ENDIF
-
-      IF (PRESENT(ibegin_)) THEN
-        CALL cxios_get_axis_ibegin(axis_hdl%daddr, ibegin_)
       ENDIF
 
@@ -307,20 +275,20 @@
       ENDIF
 
+      IF (PRESENT(n_)) THEN
+        CALL cxios_get_axis_n(axis_hdl%daddr, n_)
+      ENDIF
+
+      IF (PRESENT(n_glo_)) THEN
+        CALL cxios_get_axis_n_glo(axis_hdl%daddr, n_glo_)
+      ENDIF
+
       IF (PRESENT(name_)) THEN
         CALL cxios_get_axis_name(axis_hdl%daddr, name_, len(name_))
       ENDIF
 
-      IF (PRESENT(ni_)) THEN
-        CALL cxios_get_axis_ni(axis_hdl%daddr, ni_)
-      ENDIF
-
       IF (PRESENT(positive_)) THEN
         CALL cxios_get_axis_positive(axis_hdl%daddr, positive_, len(positive_))
       ENDIF
 
-      IF (PRESENT(size_)) THEN
-        CALL cxios_get_axis_size(axis_hdl%daddr, size_)
-      ENDIF
-
       IF (PRESENT(standard_name_)) THEN
         CALL cxios_get_axis_standard_name(axis_hdl%daddr, standard_name_, len(standard_name_))
@@ -335,21 +303,9 @@
       ENDIF
 
-      IF (PRESENT(zoom_begin_)) THEN
-        CALL cxios_get_axis_zoom_begin(axis_hdl%daddr, zoom_begin_)
-      ENDIF
-
-      IF (PRESENT(zoom_end_)) THEN
-        CALL cxios_get_axis_zoom_end(axis_hdl%daddr, zoom_end_)
-      ENDIF
-
-      IF (PRESENT(zoom_size_)) THEN
-        CALL cxios_get_axis_zoom_size(axis_hdl%daddr, zoom_size_)
-      ENDIF
-
   END SUBROUTINE xios(get_axis_attr_hdl_)
 
   SUBROUTINE xios(is_defined_axis_attr)  &
-    ( axis_id, axis_ref, bounds, data_begin, data_index, data_n, ibegin, long_name, mask, name, ni  &
-    , positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size )
+    ( axis_id, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  &
+    , name, positive, standard_name, unit, value )
 
     IMPLICIT NONE
@@ -358,4 +314,6 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref
       LOGICAL(KIND=C_BOOL) :: axis_ref_tmp
+      LOGICAL, OPTIONAL, INTENT(OUT) :: begin
+      LOGICAL(KIND=C_BOOL) :: begin_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: bounds
       LOGICAL(KIND=C_BOOL) :: bounds_tmp
@@ -366,18 +324,16 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: data_n
       LOGICAL(KIND=C_BOOL) :: data_n_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: ibegin
-      LOGICAL(KIND=C_BOOL) :: ibegin_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: long_name
       LOGICAL(KIND=C_BOOL) :: long_name_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: mask
       LOGICAL(KIND=C_BOOL) :: mask_tmp
+      LOGICAL, OPTIONAL, INTENT(OUT) :: n
+      LOGICAL(KIND=C_BOOL) :: n_tmp
+      LOGICAL, OPTIONAL, INTENT(OUT) :: n_glo
+      LOGICAL(KIND=C_BOOL) :: n_glo_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: name
       LOGICAL(KIND=C_BOOL) :: name_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: ni
-      LOGICAL(KIND=C_BOOL) :: ni_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: positive
       LOGICAL(KIND=C_BOOL) :: positive_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: size
-      LOGICAL(KIND=C_BOOL) :: size_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name
       LOGICAL(KIND=C_BOOL) :: standard_name_tmp
@@ -386,21 +342,15 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: value
       LOGICAL(KIND=C_BOOL) :: value_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_begin
-      LOGICAL(KIND=C_BOOL) :: zoom_begin_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_end
-      LOGICAL(KIND=C_BOOL) :: zoom_end_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_size
-      LOGICAL(KIND=C_BOOL) :: zoom_size_tmp
 
       CALL xios(get_axis_handle)(axis_id,axis_hdl)
       CALL xios(is_defined_axis_attr_hdl_)   &
-      ( axis_hdl, axis_ref, bounds, data_begin, data_index, data_n, ibegin, long_name, mask, name  &
-      , ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size )
+      ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  &
+      , name, positive, standard_name, unit, value )
 
   END SUBROUTINE xios(is_defined_axis_attr)
 
   SUBROUTINE xios(is_defined_axis_attr_hdl)  &
-    ( axis_hdl, axis_ref, bounds, data_begin, data_index, data_n, ibegin, long_name, mask, name  &
-    , ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size )
+    ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  &
+    , name, positive, standard_name, unit, value )
 
     IMPLICIT NONE
@@ -408,4 +358,6 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref
       LOGICAL(KIND=C_BOOL) :: axis_ref_tmp
+      LOGICAL, OPTIONAL, INTENT(OUT) :: begin
+      LOGICAL(KIND=C_BOOL) :: begin_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: bounds
       LOGICAL(KIND=C_BOOL) :: bounds_tmp
@@ -416,18 +368,16 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: data_n
       LOGICAL(KIND=C_BOOL) :: data_n_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: ibegin
-      LOGICAL(KIND=C_BOOL) :: ibegin_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: long_name
       LOGICAL(KIND=C_BOOL) :: long_name_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: mask
       LOGICAL(KIND=C_BOOL) :: mask_tmp
+      LOGICAL, OPTIONAL, INTENT(OUT) :: n
+      LOGICAL(KIND=C_BOOL) :: n_tmp
+      LOGICAL, OPTIONAL, INTENT(OUT) :: n_glo
+      LOGICAL(KIND=C_BOOL) :: n_glo_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: name
       LOGICAL(KIND=C_BOOL) :: name_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: ni
-      LOGICAL(KIND=C_BOOL) :: ni_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: positive
       LOGICAL(KIND=C_BOOL) :: positive_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: size
-      LOGICAL(KIND=C_BOOL) :: size_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name
       LOGICAL(KIND=C_BOOL) :: standard_name_tmp
@@ -436,21 +386,14 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: value
       LOGICAL(KIND=C_BOOL) :: value_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_begin
-      LOGICAL(KIND=C_BOOL) :: zoom_begin_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_end
-      LOGICAL(KIND=C_BOOL) :: zoom_end_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_size
-      LOGICAL(KIND=C_BOOL) :: zoom_size_tmp
 
       CALL xios(is_defined_axis_attr_hdl_)  &
-      ( axis_hdl, axis_ref, bounds, data_begin, data_index, data_n, ibegin, long_name, mask, name  &
-      , ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size )
+      ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  &
+      , name, positive, standard_name, unit, value )
 
   END SUBROUTINE xios(is_defined_axis_attr_hdl)
 
   SUBROUTINE xios(is_defined_axis_attr_hdl_)   &
-    ( axis_hdl, axis_ref_, bounds_, data_begin_, data_index_, data_n_, ibegin_, long_name_, mask_  &
-    , name_, ni_, positive_, size_, standard_name_, unit_, value_, zoom_begin_, zoom_end_, zoom_size_  &
-     )
+    ( axis_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, long_name_, mask_  &
+    , n_, n_glo_, name_, positive_, standard_name_, unit_, value_ )
 
     IMPLICIT NONE
@@ -458,4 +401,6 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref_
       LOGICAL(KIND=C_BOOL) :: axis_ref__tmp
+      LOGICAL, OPTIONAL, INTENT(OUT) :: begin_
+      LOGICAL(KIND=C_BOOL) :: begin__tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: bounds_
       LOGICAL(KIND=C_BOOL) :: bounds__tmp
@@ -466,18 +411,16 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: data_n_
       LOGICAL(KIND=C_BOOL) :: data_n__tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: ibegin_
-      LOGICAL(KIND=C_BOOL) :: ibegin__tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: long_name_
       LOGICAL(KIND=C_BOOL) :: long_name__tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: mask_
       LOGICAL(KIND=C_BOOL) :: mask__tmp
+      LOGICAL, OPTIONAL, INTENT(OUT) :: n_
+      LOGICAL(KIND=C_BOOL) :: n__tmp
+      LOGICAL, OPTIONAL, INTENT(OUT) :: n_glo_
+      LOGICAL(KIND=C_BOOL) :: n_glo__tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: name_
       LOGICAL(KIND=C_BOOL) :: name__tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: ni_
-      LOGICAL(KIND=C_BOOL) :: ni__tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: positive_
       LOGICAL(KIND=C_BOOL) :: positive__tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: size_
-      LOGICAL(KIND=C_BOOL) :: size__tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name_
       LOGICAL(KIND=C_BOOL) :: standard_name__tmp
@@ -486,10 +429,4 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: value_
       LOGICAL(KIND=C_BOOL) :: value__tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_begin_
-      LOGICAL(KIND=C_BOOL) :: zoom_begin__tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_end_
-      LOGICAL(KIND=C_BOOL) :: zoom_end__tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_size_
-      LOGICAL(KIND=C_BOOL) :: zoom_size__tmp
 
       IF (PRESENT(axis_ref_)) THEN
@@ -498,4 +435,9 @@
       ENDIF
 
+      IF (PRESENT(begin_)) THEN
+        begin__tmp = cxios_is_defined_axis_begin(axis_hdl%daddr)
+        begin_ = begin__tmp
+      ENDIF
+
       IF (PRESENT(bounds_)) THEN
         bounds__tmp = cxios_is_defined_axis_bounds(axis_hdl%daddr)
@@ -518,9 +460,4 @@
       ENDIF
 
-      IF (PRESENT(ibegin_)) THEN
-        ibegin__tmp = cxios_is_defined_axis_ibegin(axis_hdl%daddr)
-        ibegin_ = ibegin__tmp
-      ENDIF
-
       IF (PRESENT(long_name_)) THEN
         long_name__tmp = cxios_is_defined_axis_long_name(axis_hdl%daddr)
@@ -533,4 +470,14 @@
       ENDIF
 
+      IF (PRESENT(n_)) THEN
+        n__tmp = cxios_is_defined_axis_n(axis_hdl%daddr)
+        n_ = n__tmp
+      ENDIF
+
+      IF (PRESENT(n_glo_)) THEN
+        n_glo__tmp = cxios_is_defined_axis_n_glo(axis_hdl%daddr)
+        n_glo_ = n_glo__tmp
+      ENDIF
+
       IF (PRESENT(name_)) THEN
         name__tmp = cxios_is_defined_axis_name(axis_hdl%daddr)
@@ -538,9 +485,4 @@
       ENDIF
 
-      IF (PRESENT(ni_)) THEN
-        ni__tmp = cxios_is_defined_axis_ni(axis_hdl%daddr)
-        ni_ = ni__tmp
-      ENDIF
-
       IF (PRESENT(positive_)) THEN
         positive__tmp = cxios_is_defined_axis_positive(axis_hdl%daddr)
@@ -548,9 +490,4 @@
       ENDIF
 
-      IF (PRESENT(size_)) THEN
-        size__tmp = cxios_is_defined_axis_size(axis_hdl%daddr)
-        size_ = size__tmp
-      ENDIF
-
       IF (PRESENT(standard_name_)) THEN
         standard_name__tmp = cxios_is_defined_axis_standard_name(axis_hdl%daddr)
@@ -568,19 +505,4 @@
       ENDIF
 
-      IF (PRESENT(zoom_begin_)) THEN
-        zoom_begin__tmp = cxios_is_defined_axis_zoom_begin(axis_hdl%daddr)
-        zoom_begin_ = zoom_begin__tmp
-      ENDIF
-
-      IF (PRESENT(zoom_end_)) THEN
-        zoom_end__tmp = cxios_is_defined_axis_zoom_end(axis_hdl%daddr)
-        zoom_end_ = zoom_end__tmp
-      ENDIF
-
-      IF (PRESENT(zoom_size_)) THEN
-        zoom_size__tmp = cxios_is_defined_axis_zoom_size(axis_hdl%daddr)
-        zoom_size_ = zoom_size__tmp
-      ENDIF
-
   END SUBROUTINE xios(is_defined_axis_attr_hdl_)
 
Index: XIOS/trunk/src/interface/fortran_attr/iaxisgroup_attr.F90
===================================================================
--- XIOS/trunk/src/interface/fortran_attr/iaxisgroup_attr.F90	(revision 664)
+++ XIOS/trunk/src/interface/fortran_attr/iaxisgroup_attr.F90	(revision 666)
@@ -12,7 +12,6 @@
 
   SUBROUTINE xios(set_axisgroup_attr)  &
-    ( axisgroup_id, axis_ref, bounds, data_begin, data_index, data_n, group_ref, ibegin, long_name  &
-    , mask, name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size  &
-     )
+    ( axisgroup_id, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  &
+    , mask, n, n_glo, name, positive, standard_name, unit, value )
 
     IMPLICIT NONE
@@ -20,4 +19,5 @@
       CHARACTER(LEN=*), INTENT(IN) ::axisgroup_id
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref
+      INTEGER  , OPTIONAL, INTENT(IN) :: begin
       REAL (KIND=8) , OPTIONAL, INTENT(IN) :: bounds(:,:)
       INTEGER  , OPTIONAL, INTENT(IN) :: data_begin
@@ -25,35 +25,30 @@
       INTEGER  , OPTIONAL, INTENT(IN) :: data_n
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref
-      INTEGER  , OPTIONAL, INTENT(IN) :: ibegin
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name
       LOGICAL  , OPTIONAL, INTENT(IN) :: mask(:)
       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:)
+      INTEGER  , OPTIONAL, INTENT(IN) :: n
+      INTEGER  , OPTIONAL, INTENT(IN) :: n_glo
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name
-      INTEGER  , OPTIONAL, INTENT(IN) :: ni
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: positive
-      INTEGER  , OPTIONAL, INTENT(IN) :: size
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: unit
       REAL (KIND=8) , OPTIONAL, INTENT(IN) :: value(:)
-      INTEGER  , OPTIONAL, INTENT(IN) :: zoom_begin
-      INTEGER  , OPTIONAL, INTENT(IN) :: zoom_end
-      INTEGER  , OPTIONAL, INTENT(IN) :: zoom_size
 
       CALL xios(get_axisgroup_handle)(axisgroup_id,axisgroup_hdl)
       CALL xios(set_axisgroup_attr_hdl_)   &
-      ( axisgroup_hdl, axis_ref, bounds, data_begin, data_index, data_n, group_ref, ibegin, long_name  &
-      , mask, name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size  &
-       )
+      ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  &
+      , mask, n, n_glo, name, positive, standard_name, unit, value )
 
   END SUBROUTINE xios(set_axisgroup_attr)
 
   SUBROUTINE xios(set_axisgroup_attr_hdl)  &
-    ( axisgroup_hdl, axis_ref, bounds, data_begin, data_index, data_n, group_ref, ibegin, long_name  &
-    , mask, name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size  &
-     )
+    ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  &
+    , mask, n, n_glo, name, positive, standard_name, unit, value )
 
     IMPLICIT NONE
       TYPE(txios(axisgroup)) , INTENT(IN) :: axisgroup_hdl
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref
+      INTEGER  , OPTIONAL, INTENT(IN) :: begin
       REAL (KIND=8) , OPTIONAL, INTENT(IN) :: bounds(:,:)
       INTEGER  , OPTIONAL, INTENT(IN) :: data_begin
@@ -61,34 +56,29 @@
       INTEGER  , OPTIONAL, INTENT(IN) :: data_n
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref
-      INTEGER  , OPTIONAL, INTENT(IN) :: ibegin
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name
       LOGICAL  , OPTIONAL, INTENT(IN) :: mask(:)
       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:)
+      INTEGER  , OPTIONAL, INTENT(IN) :: n
+      INTEGER  , OPTIONAL, INTENT(IN) :: n_glo
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name
-      INTEGER  , OPTIONAL, INTENT(IN) :: ni
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: positive
-      INTEGER  , OPTIONAL, INTENT(IN) :: size
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: unit
       REAL (KIND=8) , OPTIONAL, INTENT(IN) :: value(:)
-      INTEGER  , OPTIONAL, INTENT(IN) :: zoom_begin
-      INTEGER  , OPTIONAL, INTENT(IN) :: zoom_end
-      INTEGER  , OPTIONAL, INTENT(IN) :: zoom_size
 
       CALL xios(set_axisgroup_attr_hdl_)  &
-      ( axisgroup_hdl, axis_ref, bounds, data_begin, data_index, data_n, group_ref, ibegin, long_name  &
-      , mask, name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size  &
-       )
+      ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  &
+      , mask, n, n_glo, name, positive, standard_name, unit, value )
 
   END SUBROUTINE xios(set_axisgroup_attr_hdl)
 
   SUBROUTINE xios(set_axisgroup_attr_hdl_)   &
-    ( axisgroup_hdl, axis_ref_, bounds_, data_begin_, data_index_, data_n_, group_ref_, ibegin_  &
-    , long_name_, mask_, name_, ni_, positive_, size_, standard_name_, unit_, value_, zoom_begin_  &
-    , zoom_end_, zoom_size_ )
+    ( axisgroup_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, group_ref_, long_name_  &
+    , mask_, n_, n_glo_, name_, positive_, standard_name_, unit_, value_ )
 
     IMPLICIT NONE
       TYPE(txios(axisgroup)) , INTENT(IN) :: axisgroup_hdl
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref_
+      INTEGER  , OPTIONAL, INTENT(IN) :: begin_
       REAL (KIND=8) , OPTIONAL, INTENT(IN) :: bounds_(:,:)
       INTEGER  , OPTIONAL, INTENT(IN) :: data_begin_
@@ -96,18 +86,14 @@
       INTEGER  , OPTIONAL, INTENT(IN) :: data_n_
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref_
-      INTEGER  , OPTIONAL, INTENT(IN) :: ibegin_
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name_
       LOGICAL  , OPTIONAL, INTENT(IN) :: mask_(:)
       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask__tmp(:)
+      INTEGER  , OPTIONAL, INTENT(IN) :: n_
+      INTEGER  , OPTIONAL, INTENT(IN) :: n_glo_
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_
-      INTEGER  , OPTIONAL, INTENT(IN) :: ni_
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: positive_
-      INTEGER  , OPTIONAL, INTENT(IN) :: size_
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name_
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: unit_
       REAL (KIND=8) , OPTIONAL, INTENT(IN) :: value_(:)
-      INTEGER  , OPTIONAL, INTENT(IN) :: zoom_begin_
-      INTEGER  , OPTIONAL, INTENT(IN) :: zoom_end_
-      INTEGER  , OPTIONAL, INTENT(IN) :: zoom_size_
 
       IF (PRESENT(axis_ref_)) THEN
@@ -115,4 +101,8 @@
       ENDIF
 
+      IF (PRESENT(begin_)) THEN
+        CALL cxios_set_axisgroup_begin(axisgroup_hdl%daddr, begin_)
+      ENDIF
+
       IF (PRESENT(bounds_)) THEN
         CALL cxios_set_axisgroup_bounds(axisgroup_hdl%daddr, bounds_, size(bounds_,1), size(bounds_,2))
@@ -133,8 +123,4 @@
       IF (PRESENT(group_ref_)) THEN
         CALL cxios_set_axisgroup_group_ref(axisgroup_hdl%daddr, group_ref_, len(group_ref_))
-      ENDIF
-
-      IF (PRESENT(ibegin_)) THEN
-        CALL cxios_set_axisgroup_ibegin(axisgroup_hdl%daddr, ibegin_)
       ENDIF
 
@@ -149,20 +135,20 @@
       ENDIF
 
+      IF (PRESENT(n_)) THEN
+        CALL cxios_set_axisgroup_n(axisgroup_hdl%daddr, n_)
+      ENDIF
+
+      IF (PRESENT(n_glo_)) THEN
+        CALL cxios_set_axisgroup_n_glo(axisgroup_hdl%daddr, n_glo_)
+      ENDIF
+
       IF (PRESENT(name_)) THEN
         CALL cxios_set_axisgroup_name(axisgroup_hdl%daddr, name_, len(name_))
       ENDIF
 
-      IF (PRESENT(ni_)) THEN
-        CALL cxios_set_axisgroup_ni(axisgroup_hdl%daddr, ni_)
-      ENDIF
-
       IF (PRESENT(positive_)) THEN
         CALL cxios_set_axisgroup_positive(axisgroup_hdl%daddr, positive_, len(positive_))
       ENDIF
 
-      IF (PRESENT(size_)) THEN
-        CALL cxios_set_axisgroup_size(axisgroup_hdl%daddr, size_)
-      ENDIF
-
       IF (PRESENT(standard_name_)) THEN
         CALL cxios_set_axisgroup_standard_name(axisgroup_hdl%daddr, standard_name_, len(standard_name_))
@@ -177,22 +163,9 @@
       ENDIF
 
-      IF (PRESENT(zoom_begin_)) THEN
-        CALL cxios_set_axisgroup_zoom_begin(axisgroup_hdl%daddr, zoom_begin_)
-      ENDIF
-
-      IF (PRESENT(zoom_end_)) THEN
-        CALL cxios_set_axisgroup_zoom_end(axisgroup_hdl%daddr, zoom_end_)
-      ENDIF
-
-      IF (PRESENT(zoom_size_)) THEN
-        CALL cxios_set_axisgroup_zoom_size(axisgroup_hdl%daddr, zoom_size_)
-      ENDIF
-
   END SUBROUTINE xios(set_axisgroup_attr_hdl_)
 
   SUBROUTINE xios(get_axisgroup_attr)  &
-    ( axisgroup_id, axis_ref, bounds, data_begin, data_index, data_n, group_ref, ibegin, long_name  &
-    , mask, name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size  &
-     )
+    ( axisgroup_id, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  &
+    , mask, n, n_glo, name, positive, standard_name, unit, value )
 
     IMPLICIT NONE
@@ -200,4 +173,5 @@
       CHARACTER(LEN=*), INTENT(IN) ::axisgroup_id
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref
+      INTEGER  , OPTIONAL, INTENT(OUT) :: begin
       REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: bounds(:,:)
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_begin
@@ -205,35 +179,30 @@
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_n
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref
-      INTEGER  , OPTIONAL, INTENT(OUT) :: ibegin
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name
       LOGICAL  , OPTIONAL, INTENT(OUT) :: mask(:)
       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:)
+      INTEGER  , OPTIONAL, INTENT(OUT) :: n
+      INTEGER  , OPTIONAL, INTENT(OUT) :: n_glo
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name
-      INTEGER  , OPTIONAL, INTENT(OUT) :: ni
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: positive
-      INTEGER  , OPTIONAL, INTENT(OUT) :: size
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: unit
       REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: value(:)
-      INTEGER  , OPTIONAL, INTENT(OUT) :: zoom_begin
-      INTEGER  , OPTIONAL, INTENT(OUT) :: zoom_end
-      INTEGER  , OPTIONAL, INTENT(OUT) :: zoom_size
 
       CALL xios(get_axisgroup_handle)(axisgroup_id,axisgroup_hdl)
       CALL xios(get_axisgroup_attr_hdl_)   &
-      ( axisgroup_hdl, axis_ref, bounds, data_begin, data_index, data_n, group_ref, ibegin, long_name  &
-      , mask, name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size  &
-       )
+      ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  &
+      , mask, n, n_glo, name, positive, standard_name, unit, value )
 
   END SUBROUTINE xios(get_axisgroup_attr)
 
   SUBROUTINE xios(get_axisgroup_attr_hdl)  &
-    ( axisgroup_hdl, axis_ref, bounds, data_begin, data_index, data_n, group_ref, ibegin, long_name  &
-    , mask, name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size  &
-     )
+    ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  &
+    , mask, n, n_glo, name, positive, standard_name, unit, value )
 
     IMPLICIT NONE
       TYPE(txios(axisgroup)) , INTENT(IN) :: axisgroup_hdl
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref
+      INTEGER  , OPTIONAL, INTENT(OUT) :: begin
       REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: bounds(:,:)
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_begin
@@ -241,34 +210,29 @@
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_n
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref
-      INTEGER  , OPTIONAL, INTENT(OUT) :: ibegin
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name
       LOGICAL  , OPTIONAL, INTENT(OUT) :: mask(:)
       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:)
+      INTEGER  , OPTIONAL, INTENT(OUT) :: n
+      INTEGER  , OPTIONAL, INTENT(OUT) :: n_glo
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name
-      INTEGER  , OPTIONAL, INTENT(OUT) :: ni
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: positive
-      INTEGER  , OPTIONAL, INTENT(OUT) :: size
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: unit
       REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: value(:)
-      INTEGER  , OPTIONAL, INTENT(OUT) :: zoom_begin
-      INTEGER  , OPTIONAL, INTENT(OUT) :: zoom_end
-      INTEGER  , OPTIONAL, INTENT(OUT) :: zoom_size
 
       CALL xios(get_axisgroup_attr_hdl_)  &
-      ( axisgroup_hdl, axis_ref, bounds, data_begin, data_index, data_n, group_ref, ibegin, long_name  &
-      , mask, name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size  &
-       )
+      ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  &
+      , mask, n, n_glo, name, positive, standard_name, unit, value )
 
   END SUBROUTINE xios(get_axisgroup_attr_hdl)
 
   SUBROUTINE xios(get_axisgroup_attr_hdl_)   &
-    ( axisgroup_hdl, axis_ref_, bounds_, data_begin_, data_index_, data_n_, group_ref_, ibegin_  &
-    , long_name_, mask_, name_, ni_, positive_, size_, standard_name_, unit_, value_, zoom_begin_  &
-    , zoom_end_, zoom_size_ )
+    ( axisgroup_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, group_ref_, long_name_  &
+    , mask_, n_, n_glo_, name_, positive_, standard_name_, unit_, value_ )
 
     IMPLICIT NONE
       TYPE(txios(axisgroup)) , INTENT(IN) :: axisgroup_hdl
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref_
+      INTEGER  , OPTIONAL, INTENT(OUT) :: begin_
       REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: bounds_(:,:)
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_begin_
@@ -276,18 +240,14 @@
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_n_
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref_
-      INTEGER  , OPTIONAL, INTENT(OUT) :: ibegin_
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name_
       LOGICAL  , OPTIONAL, INTENT(OUT) :: mask_(:)
       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask__tmp(:)
+      INTEGER  , OPTIONAL, INTENT(OUT) :: n_
+      INTEGER  , OPTIONAL, INTENT(OUT) :: n_glo_
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_
-      INTEGER  , OPTIONAL, INTENT(OUT) :: ni_
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: positive_
-      INTEGER  , OPTIONAL, INTENT(OUT) :: size_
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name_
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: unit_
       REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: value_(:)
-      INTEGER  , OPTIONAL, INTENT(OUT) :: zoom_begin_
-      INTEGER  , OPTIONAL, INTENT(OUT) :: zoom_end_
-      INTEGER  , OPTIONAL, INTENT(OUT) :: zoom_size_
 
       IF (PRESENT(axis_ref_)) THEN
@@ -295,4 +255,8 @@
       ENDIF
 
+      IF (PRESENT(begin_)) THEN
+        CALL cxios_get_axisgroup_begin(axisgroup_hdl%daddr, begin_)
+      ENDIF
+
       IF (PRESENT(bounds_)) THEN
         CALL cxios_get_axisgroup_bounds(axisgroup_hdl%daddr, bounds_, size(bounds_,1), size(bounds_,2))
@@ -313,8 +277,4 @@
       IF (PRESENT(group_ref_)) THEN
         CALL cxios_get_axisgroup_group_ref(axisgroup_hdl%daddr, group_ref_, len(group_ref_))
-      ENDIF
-
-      IF (PRESENT(ibegin_)) THEN
-        CALL cxios_get_axisgroup_ibegin(axisgroup_hdl%daddr, ibegin_)
       ENDIF
 
@@ -329,20 +289,20 @@
       ENDIF
 
+      IF (PRESENT(n_)) THEN
+        CALL cxios_get_axisgroup_n(axisgroup_hdl%daddr, n_)
+      ENDIF
+
+      IF (PRESENT(n_glo_)) THEN
+        CALL cxios_get_axisgroup_n_glo(axisgroup_hdl%daddr, n_glo_)
+      ENDIF
+
       IF (PRESENT(name_)) THEN
         CALL cxios_get_axisgroup_name(axisgroup_hdl%daddr, name_, len(name_))
       ENDIF
 
-      IF (PRESENT(ni_)) THEN
-        CALL cxios_get_axisgroup_ni(axisgroup_hdl%daddr, ni_)
-      ENDIF
-
       IF (PRESENT(positive_)) THEN
         CALL cxios_get_axisgroup_positive(axisgroup_hdl%daddr, positive_, len(positive_))
       ENDIF
 
-      IF (PRESENT(size_)) THEN
-        CALL cxios_get_axisgroup_size(axisgroup_hdl%daddr, size_)
-      ENDIF
-
       IF (PRESENT(standard_name_)) THEN
         CALL cxios_get_axisgroup_standard_name(axisgroup_hdl%daddr, standard_name_, len(standard_name_))
@@ -357,22 +317,9 @@
       ENDIF
 
-      IF (PRESENT(zoom_begin_)) THEN
-        CALL cxios_get_axisgroup_zoom_begin(axisgroup_hdl%daddr, zoom_begin_)
-      ENDIF
-
-      IF (PRESENT(zoom_end_)) THEN
-        CALL cxios_get_axisgroup_zoom_end(axisgroup_hdl%daddr, zoom_end_)
-      ENDIF
-
-      IF (PRESENT(zoom_size_)) THEN
-        CALL cxios_get_axisgroup_zoom_size(axisgroup_hdl%daddr, zoom_size_)
-      ENDIF
-
   END SUBROUTINE xios(get_axisgroup_attr_hdl_)
 
   SUBROUTINE xios(is_defined_axisgroup_attr)  &
-    ( axisgroup_id, axis_ref, bounds, data_begin, data_index, data_n, group_ref, ibegin, long_name  &
-    , mask, name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size  &
-     )
+    ( axisgroup_id, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  &
+    , mask, n, n_glo, name, positive, standard_name, unit, value )
 
     IMPLICIT NONE
@@ -381,4 +328,6 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref
       LOGICAL(KIND=C_BOOL) :: axis_ref_tmp
+      LOGICAL, OPTIONAL, INTENT(OUT) :: begin
+      LOGICAL(KIND=C_BOOL) :: begin_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: bounds
       LOGICAL(KIND=C_BOOL) :: bounds_tmp
@@ -391,18 +340,16 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: group_ref
       LOGICAL(KIND=C_BOOL) :: group_ref_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: ibegin
-      LOGICAL(KIND=C_BOOL) :: ibegin_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: long_name
       LOGICAL(KIND=C_BOOL) :: long_name_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: mask
       LOGICAL(KIND=C_BOOL) :: mask_tmp
+      LOGICAL, OPTIONAL, INTENT(OUT) :: n
+      LOGICAL(KIND=C_BOOL) :: n_tmp
+      LOGICAL, OPTIONAL, INTENT(OUT) :: n_glo
+      LOGICAL(KIND=C_BOOL) :: n_glo_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: name
       LOGICAL(KIND=C_BOOL) :: name_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: ni
-      LOGICAL(KIND=C_BOOL) :: ni_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: positive
       LOGICAL(KIND=C_BOOL) :: positive_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: size
-      LOGICAL(KIND=C_BOOL) :: size_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name
       LOGICAL(KIND=C_BOOL) :: standard_name_tmp
@@ -411,23 +358,15 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: value
       LOGICAL(KIND=C_BOOL) :: value_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_begin
-      LOGICAL(KIND=C_BOOL) :: zoom_begin_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_end
-      LOGICAL(KIND=C_BOOL) :: zoom_end_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_size
-      LOGICAL(KIND=C_BOOL) :: zoom_size_tmp
 
       CALL xios(get_axisgroup_handle)(axisgroup_id,axisgroup_hdl)
       CALL xios(is_defined_axisgroup_attr_hdl_)   &
-      ( axisgroup_hdl, axis_ref, bounds, data_begin, data_index, data_n, group_ref, ibegin, long_name  &
-      , mask, name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size  &
-       )
+      ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  &
+      , mask, n, n_glo, name, positive, standard_name, unit, value )
 
   END SUBROUTINE xios(is_defined_axisgroup_attr)
 
   SUBROUTINE xios(is_defined_axisgroup_attr_hdl)  &
-    ( axisgroup_hdl, axis_ref, bounds, data_begin, data_index, data_n, group_ref, ibegin, long_name  &
-    , mask, name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size  &
-     )
+    ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  &
+    , mask, n, n_glo, name, positive, standard_name, unit, value )
 
     IMPLICIT NONE
@@ -435,4 +374,6 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref
       LOGICAL(KIND=C_BOOL) :: axis_ref_tmp
+      LOGICAL, OPTIONAL, INTENT(OUT) :: begin
+      LOGICAL(KIND=C_BOOL) :: begin_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: bounds
       LOGICAL(KIND=C_BOOL) :: bounds_tmp
@@ -445,18 +386,16 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: group_ref
       LOGICAL(KIND=C_BOOL) :: group_ref_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: ibegin
-      LOGICAL(KIND=C_BOOL) :: ibegin_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: long_name
       LOGICAL(KIND=C_BOOL) :: long_name_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: mask
       LOGICAL(KIND=C_BOOL) :: mask_tmp
+      LOGICAL, OPTIONAL, INTENT(OUT) :: n
+      LOGICAL(KIND=C_BOOL) :: n_tmp
+      LOGICAL, OPTIONAL, INTENT(OUT) :: n_glo
+      LOGICAL(KIND=C_BOOL) :: n_glo_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: name
       LOGICAL(KIND=C_BOOL) :: name_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: ni
-      LOGICAL(KIND=C_BOOL) :: ni_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: positive
       LOGICAL(KIND=C_BOOL) :: positive_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: size
-      LOGICAL(KIND=C_BOOL) :: size_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name
       LOGICAL(KIND=C_BOOL) :: standard_name_tmp
@@ -465,22 +404,14 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: value
       LOGICAL(KIND=C_BOOL) :: value_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_begin
-      LOGICAL(KIND=C_BOOL) :: zoom_begin_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_end
-      LOGICAL(KIND=C_BOOL) :: zoom_end_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_size
-      LOGICAL(KIND=C_BOOL) :: zoom_size_tmp
 
       CALL xios(is_defined_axisgroup_attr_hdl_)  &
-      ( axisgroup_hdl, axis_ref, bounds, data_begin, data_index, data_n, group_ref, ibegin, long_name  &
-      , mask, name, ni, positive, size, standard_name, unit, value, zoom_begin, zoom_end, zoom_size  &
-       )
+      ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  &
+      , mask, n, n_glo, name, positive, standard_name, unit, value )
 
   END SUBROUTINE xios(is_defined_axisgroup_attr_hdl)
 
   SUBROUTINE xios(is_defined_axisgroup_attr_hdl_)   &
-    ( axisgroup_hdl, axis_ref_, bounds_, data_begin_, data_index_, data_n_, group_ref_, ibegin_  &
-    , long_name_, mask_, name_, ni_, positive_, size_, standard_name_, unit_, value_, zoom_begin_  &
-    , zoom_end_, zoom_size_ )
+    ( axisgroup_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, group_ref_, long_name_  &
+    , mask_, n_, n_glo_, name_, positive_, standard_name_, unit_, value_ )
 
     IMPLICIT NONE
@@ -488,4 +419,6 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref_
       LOGICAL(KIND=C_BOOL) :: axis_ref__tmp
+      LOGICAL, OPTIONAL, INTENT(OUT) :: begin_
+      LOGICAL(KIND=C_BOOL) :: begin__tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: bounds_
       LOGICAL(KIND=C_BOOL) :: bounds__tmp
@@ -498,18 +431,16 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: group_ref_
       LOGICAL(KIND=C_BOOL) :: group_ref__tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: ibegin_
-      LOGICAL(KIND=C_BOOL) :: ibegin__tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: long_name_
       LOGICAL(KIND=C_BOOL) :: long_name__tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: mask_
       LOGICAL(KIND=C_BOOL) :: mask__tmp
+      LOGICAL, OPTIONAL, INTENT(OUT) :: n_
+      LOGICAL(KIND=C_BOOL) :: n__tmp
+      LOGICAL, OPTIONAL, INTENT(OUT) :: n_glo_
+      LOGICAL(KIND=C_BOOL) :: n_glo__tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: name_
       LOGICAL(KIND=C_BOOL) :: name__tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: ni_
-      LOGICAL(KIND=C_BOOL) :: ni__tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: positive_
       LOGICAL(KIND=C_BOOL) :: positive__tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: size_
-      LOGICAL(KIND=C_BOOL) :: size__tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name_
       LOGICAL(KIND=C_BOOL) :: standard_name__tmp
@@ -518,10 +449,4 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: value_
       LOGICAL(KIND=C_BOOL) :: value__tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_begin_
-      LOGICAL(KIND=C_BOOL) :: zoom_begin__tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_end_
-      LOGICAL(KIND=C_BOOL) :: zoom_end__tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: zoom_size_
-      LOGICAL(KIND=C_BOOL) :: zoom_size__tmp
 
       IF (PRESENT(axis_ref_)) THEN
@@ -530,4 +455,9 @@
       ENDIF
 
+      IF (PRESENT(begin_)) THEN
+        begin__tmp = cxios_is_defined_axisgroup_begin(axisgroup_hdl%daddr)
+        begin_ = begin__tmp
+      ENDIF
+
       IF (PRESENT(bounds_)) THEN
         bounds__tmp = cxios_is_defined_axisgroup_bounds(axisgroup_hdl%daddr)
@@ -555,9 +485,4 @@
       ENDIF
 
-      IF (PRESENT(ibegin_)) THEN
-        ibegin__tmp = cxios_is_defined_axisgroup_ibegin(axisgroup_hdl%daddr)
-        ibegin_ = ibegin__tmp
-      ENDIF
-
       IF (PRESENT(long_name_)) THEN
         long_name__tmp = cxios_is_defined_axisgroup_long_name(axisgroup_hdl%daddr)
@@ -570,4 +495,14 @@
       ENDIF
 
+      IF (PRESENT(n_)) THEN
+        n__tmp = cxios_is_defined_axisgroup_n(axisgroup_hdl%daddr)
+        n_ = n__tmp
+      ENDIF
+
+      IF (PRESENT(n_glo_)) THEN
+        n_glo__tmp = cxios_is_defined_axisgroup_n_glo(axisgroup_hdl%daddr)
+        n_glo_ = n_glo__tmp
+      ENDIF
+
       IF (PRESENT(name_)) THEN
         name__tmp = cxios_is_defined_axisgroup_name(axisgroup_hdl%daddr)
@@ -575,9 +510,4 @@
       ENDIF
 
-      IF (PRESENT(ni_)) THEN
-        ni__tmp = cxios_is_defined_axisgroup_ni(axisgroup_hdl%daddr)
-        ni_ = ni__tmp
-      ENDIF
-
       IF (PRESENT(positive_)) THEN
         positive__tmp = cxios_is_defined_axisgroup_positive(axisgroup_hdl%daddr)
@@ -585,9 +515,4 @@
       ENDIF
 
-      IF (PRESENT(size_)) THEN
-        size__tmp = cxios_is_defined_axisgroup_size(axisgroup_hdl%daddr)
-        size_ = size__tmp
-      ENDIF
-
       IF (PRESENT(standard_name_)) THEN
         standard_name__tmp = cxios_is_defined_axisgroup_standard_name(axisgroup_hdl%daddr)
@@ -605,19 +530,4 @@
       ENDIF
 
-      IF (PRESENT(zoom_begin_)) THEN
-        zoom_begin__tmp = cxios_is_defined_axisgroup_zoom_begin(axisgroup_hdl%daddr)
-        zoom_begin_ = zoom_begin__tmp
-      ENDIF
-
-      IF (PRESENT(zoom_end_)) THEN
-        zoom_end__tmp = cxios_is_defined_axisgroup_zoom_end(axisgroup_hdl%daddr)
-        zoom_end_ = zoom_end__tmp
-      ENDIF
-
-      IF (PRESENT(zoom_size_)) THEN
-        zoom_size__tmp = cxios_is_defined_axisgroup_zoom_size(axisgroup_hdl%daddr)
-        zoom_size_ = zoom_size__tmp
-      ENDIF
-
   END SUBROUTINE xios(is_defined_axisgroup_attr_hdl_)
 
Index: XIOS/trunk/src/interface/fortran_attr/idomain_attr.F90
===================================================================
--- XIOS/trunk/src/interface/fortran_attr/idomain_attr.F90	(revision 664)
+++ XIOS/trunk/src/interface/fortran_attr/idomain_attr.F90	(revision 666)
@@ -13,7 +13,7 @@
   SUBROUTINE xios(set_domain_attr)  &
     ( domain_id, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  &
-    , data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref, domain_ref  &
-    , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  &
-    , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
+    , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, i_index  &
+    , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  &
+    , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
 
     IMPLICIT NONE
@@ -30,5 +30,4 @@
       INTEGER  , OPTIONAL, INTENT(IN) :: data_j_index(:)
       INTEGER  , OPTIONAL, INTENT(IN) :: data_jbegin
-      INTEGER  , OPTIONAL, INTENT(IN) :: data_n_index
       INTEGER  , OPTIONAL, INTENT(IN) :: data_ni
       INTEGER  , OPTIONAL, INTENT(IN) :: data_nj
@@ -60,7 +59,7 @@
       CALL xios(set_domain_attr_hdl_)   &
       ( domain_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  &
-      , data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref, domain_ref  &
-      , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  &
-      , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
+      , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, i_index  &
+      , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  &
+      , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
 
   END SUBROUTINE xios(set_domain_attr)
@@ -68,7 +67,7 @@
   SUBROUTINE xios(set_domain_attr_hdl)  &
     ( domain_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  &
-    , data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref, domain_ref  &
-    , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  &
-    , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
+    , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, i_index  &
+    , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  &
+    , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
 
     IMPLICIT NONE
@@ -84,5 +83,4 @@
       INTEGER  , OPTIONAL, INTENT(IN) :: data_j_index(:)
       INTEGER  , OPTIONAL, INTENT(IN) :: data_jbegin
-      INTEGER  , OPTIONAL, INTENT(IN) :: data_n_index
       INTEGER  , OPTIONAL, INTENT(IN) :: data_ni
       INTEGER  , OPTIONAL, INTENT(IN) :: data_nj
@@ -113,7 +111,7 @@
       CALL xios(set_domain_attr_hdl_)  &
       ( domain_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  &
-      , data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref, domain_ref  &
-      , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  &
-      , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
+      , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, i_index  &
+      , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  &
+      , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
 
   END SUBROUTINE xios(set_domain_attr_hdl)
@@ -121,8 +119,8 @@
   SUBROUTINE xios(set_domain_attr_hdl_)   &
     ( domain_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_  &
-    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_n_index_, data_ni_, data_nj_  &
-    , domain_group_ref_, domain_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_  &
-    , long_name_, lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_  &
-    , nvertex_, standard_name_, type_ )
+    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_group_ref_  &
+    , domain_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_, long_name_  &
+    , lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_  &
+    , standard_name_, type_ )
 
     IMPLICIT NONE
@@ -138,5 +136,4 @@
       INTEGER  , OPTIONAL, INTENT(IN) :: data_j_index_(:)
       INTEGER  , OPTIONAL, INTENT(IN) :: data_jbegin_
-      INTEGER  , OPTIONAL, INTENT(IN) :: data_n_index_
       INTEGER  , OPTIONAL, INTENT(IN) :: data_ni_
       INTEGER  , OPTIONAL, INTENT(IN) :: data_nj_
@@ -205,8 +202,4 @@
       ENDIF
 
-      IF (PRESENT(data_n_index_)) THEN
-        CALL cxios_set_domain_data_n_index(domain_hdl%daddr, data_n_index_)
-      ENDIF
-
       IF (PRESENT(data_ni_)) THEN
         CALL cxios_set_domain_data_ni(domain_hdl%daddr, data_ni_)
@@ -309,7 +302,7 @@
   SUBROUTINE xios(get_domain_attr)  &
     ( domain_id, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  &
-    , data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref, domain_ref  &
-    , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  &
-    , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
+    , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, i_index  &
+    , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  &
+    , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
 
     IMPLICIT NONE
@@ -326,5 +319,4 @@
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_j_index(:)
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_jbegin
-      INTEGER  , OPTIONAL, INTENT(OUT) :: data_n_index
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_ni
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_nj
@@ -356,7 +348,7 @@
       CALL xios(get_domain_attr_hdl_)   &
       ( domain_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  &
-      , data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref, domain_ref  &
-      , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  &
-      , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
+      , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, i_index  &
+      , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  &
+      , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
 
   END SUBROUTINE xios(get_domain_attr)
@@ -364,7 +356,7 @@
   SUBROUTINE xios(get_domain_attr_hdl)  &
     ( domain_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  &
-    , data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref, domain_ref  &
-    , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  &
-    , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
+    , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, i_index  &
+    , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  &
+    , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
 
     IMPLICIT NONE
@@ -380,5 +372,4 @@
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_j_index(:)
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_jbegin
-      INTEGER  , OPTIONAL, INTENT(OUT) :: data_n_index
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_ni
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_nj
@@ -409,7 +400,7 @@
       CALL xios(get_domain_attr_hdl_)  &
       ( domain_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  &
-      , data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref, domain_ref  &
-      , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  &
-      , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
+      , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, i_index  &
+      , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  &
+      , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
 
   END SUBROUTINE xios(get_domain_attr_hdl)
@@ -417,8 +408,8 @@
   SUBROUTINE xios(get_domain_attr_hdl_)   &
     ( domain_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_  &
-    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_n_index_, data_ni_, data_nj_  &
-    , domain_group_ref_, domain_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_  &
-    , long_name_, lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_  &
-    , nvertex_, standard_name_, type_ )
+    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_group_ref_  &
+    , domain_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_, long_name_  &
+    , lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_  &
+    , standard_name_, type_ )
 
     IMPLICIT NONE
@@ -434,5 +425,4 @@
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_j_index_(:)
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_jbegin_
-      INTEGER  , OPTIONAL, INTENT(OUT) :: data_n_index_
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_ni_
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_nj_
@@ -501,8 +491,4 @@
       ENDIF
 
-      IF (PRESENT(data_n_index_)) THEN
-        CALL cxios_get_domain_data_n_index(domain_hdl%daddr, data_n_index_)
-      ENDIF
-
       IF (PRESENT(data_ni_)) THEN
         CALL cxios_get_domain_data_ni(domain_hdl%daddr, data_ni_)
@@ -605,7 +591,7 @@
   SUBROUTINE xios(is_defined_domain_attr)  &
     ( domain_id, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  &
-    , data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref, domain_ref  &
-    , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  &
-    , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
+    , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, i_index  &
+    , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  &
+    , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
 
     IMPLICIT NONE
@@ -632,6 +618,4 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: data_jbegin
       LOGICAL(KIND=C_BOOL) :: data_jbegin_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: data_n_index
-      LOGICAL(KIND=C_BOOL) :: data_n_index_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: data_ni
       LOGICAL(KIND=C_BOOL) :: data_ni_tmp
@@ -684,7 +668,7 @@
       CALL xios(is_defined_domain_attr_hdl_)   &
       ( domain_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  &
-      , data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref, domain_ref  &
-      , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  &
-      , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
+      , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, i_index  &
+      , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  &
+      , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
 
   END SUBROUTINE xios(is_defined_domain_attr)
@@ -692,7 +676,7 @@
   SUBROUTINE xios(is_defined_domain_attr_hdl)  &
     ( domain_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  &
-    , data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref, domain_ref  &
-    , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  &
-    , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
+    , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, i_index  &
+    , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  &
+    , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
 
     IMPLICIT NONE
@@ -718,6 +702,4 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: data_jbegin
       LOGICAL(KIND=C_BOOL) :: data_jbegin_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: data_n_index
-      LOGICAL(KIND=C_BOOL) :: data_n_index_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: data_ni
       LOGICAL(KIND=C_BOOL) :: data_ni_tmp
@@ -769,7 +751,7 @@
       CALL xios(is_defined_domain_attr_hdl_)  &
       ( domain_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  &
-      , data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref, domain_ref  &
-      , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  &
-      , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
+      , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, i_index  &
+      , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  &
+      , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type )
 
   END SUBROUTINE xios(is_defined_domain_attr_hdl)
@@ -777,8 +759,8 @@
   SUBROUTINE xios(is_defined_domain_attr_hdl_)   &
     ( domain_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_  &
-    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_n_index_, data_ni_, data_nj_  &
-    , domain_group_ref_, domain_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_  &
-    , long_name_, lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_  &
-    , nvertex_, standard_name_, type_ )
+    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_group_ref_  &
+    , domain_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_, long_name_  &
+    , lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_  &
+    , standard_name_, type_ )
 
     IMPLICIT NONE
@@ -804,6 +786,4 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: data_jbegin_
       LOGICAL(KIND=C_BOOL) :: data_jbegin__tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: data_n_index_
-      LOGICAL(KIND=C_BOOL) :: data_n_index__tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: data_ni_
       LOGICAL(KIND=C_BOOL) :: data_ni__tmp
@@ -903,9 +883,4 @@
       ENDIF
 
-      IF (PRESENT(data_n_index_)) THEN
-        data_n_index__tmp = cxios_is_defined_domain_data_n_index(domain_hdl%daddr)
-        data_n_index_ = data_n_index__tmp
-      ENDIF
-
       IF (PRESENT(data_ni_)) THEN
         data_ni__tmp = cxios_is_defined_domain_data_ni(domain_hdl%daddr)
Index: XIOS/trunk/src/interface/fortran_attr/idomaingroup_attr.F90
===================================================================
--- XIOS/trunk/src/interface/fortran_attr/idomaingroup_attr.F90	(revision 664)
+++ XIOS/trunk/src/interface/fortran_attr/idomaingroup_attr.F90	(revision 666)
@@ -13,8 +13,8 @@
   SUBROUTINE xios(set_domaingroup_attr)  &
     ( domaingroup_id, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  &
-    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref  &
-    , domain_ref, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name  &
-    , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name  &
-    , type )
+    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref  &
+    , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  &
+    , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  &
+     )
 
     IMPLICIT NONE
@@ -31,5 +31,4 @@
       INTEGER  , OPTIONAL, INTENT(IN) :: data_j_index(:)
       INTEGER  , OPTIONAL, INTENT(IN) :: data_jbegin
-      INTEGER  , OPTIONAL, INTENT(IN) :: data_n_index
       INTEGER  , OPTIONAL, INTENT(IN) :: data_ni
       INTEGER  , OPTIONAL, INTENT(IN) :: data_nj
@@ -62,8 +61,8 @@
       CALL xios(set_domaingroup_attr_hdl_)   &
       ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  &
-      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref  &
-      , domain_ref, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name  &
-      , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name  &
-      , type )
+      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref  &
+      , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  &
+      , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  &
+       )
 
   END SUBROUTINE xios(set_domaingroup_attr)
@@ -71,8 +70,8 @@
   SUBROUTINE xios(set_domaingroup_attr_hdl)  &
     ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  &
-    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref  &
-    , domain_ref, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name  &
-    , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name  &
-    , type )
+    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref  &
+    , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  &
+    , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  &
+     )
 
     IMPLICIT NONE
@@ -88,5 +87,4 @@
       INTEGER  , OPTIONAL, INTENT(IN) :: data_j_index(:)
       INTEGER  , OPTIONAL, INTENT(IN) :: data_jbegin
-      INTEGER  , OPTIONAL, INTENT(IN) :: data_n_index
       INTEGER  , OPTIONAL, INTENT(IN) :: data_ni
       INTEGER  , OPTIONAL, INTENT(IN) :: data_nj
@@ -118,8 +116,8 @@
       CALL xios(set_domaingroup_attr_hdl_)  &
       ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  &
-      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref  &
-      , domain_ref, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name  &
-      , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name  &
-      , type )
+      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref  &
+      , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  &
+      , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  &
+       )
 
   END SUBROUTINE xios(set_domaingroup_attr_hdl)
@@ -127,8 +125,8 @@
   SUBROUTINE xios(set_domaingroup_attr_hdl_)   &
     ( domaingroup_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_  &
-    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_n_index_, data_ni_, data_nj_  &
-    , domain_group_ref_, domain_ref_, group_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_  &
-    , latvalue_2d_, long_name_, lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_  &
-    , nj_, nj_glo_, nvertex_, standard_name_, type_ )
+    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_group_ref_  &
+    , domain_ref_, group_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_  &
+    , long_name_, lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_  &
+    , nvertex_, standard_name_, type_ )
 
     IMPLICIT NONE
@@ -144,5 +142,4 @@
       INTEGER  , OPTIONAL, INTENT(IN) :: data_j_index_(:)
       INTEGER  , OPTIONAL, INTENT(IN) :: data_jbegin_
-      INTEGER  , OPTIONAL, INTENT(IN) :: data_n_index_
       INTEGER  , OPTIONAL, INTENT(IN) :: data_ni_
       INTEGER  , OPTIONAL, INTENT(IN) :: data_nj_
@@ -212,8 +209,4 @@
       ENDIF
 
-      IF (PRESENT(data_n_index_)) THEN
-        CALL cxios_set_domaingroup_data_n_index(domaingroup_hdl%daddr, data_n_index_)
-      ENDIF
-
       IF (PRESENT(data_ni_)) THEN
         CALL cxios_set_domaingroup_data_ni(domaingroup_hdl%daddr, data_ni_)
@@ -320,8 +313,8 @@
   SUBROUTINE xios(get_domaingroup_attr)  &
     ( domaingroup_id, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  &
-    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref  &
-    , domain_ref, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name  &
-    , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name  &
-    , type )
+    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref  &
+    , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  &
+    , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  &
+     )
 
     IMPLICIT NONE
@@ -338,5 +331,4 @@
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_j_index(:)
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_jbegin
-      INTEGER  , OPTIONAL, INTENT(OUT) :: data_n_index
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_ni
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_nj
@@ -369,8 +361,8 @@
       CALL xios(get_domaingroup_attr_hdl_)   &
       ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  &
-      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref  &
-      , domain_ref, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name  &
-      , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name  &
-      , type )
+      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref  &
+      , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  &
+      , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  &
+       )
 
   END SUBROUTINE xios(get_domaingroup_attr)
@@ -378,8 +370,8 @@
   SUBROUTINE xios(get_domaingroup_attr_hdl)  &
     ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  &
-    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref  &
-    , domain_ref, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name  &
-    , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name  &
-    , type )
+    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref  &
+    , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  &
+    , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  &
+     )
 
     IMPLICIT NONE
@@ -395,5 +387,4 @@
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_j_index(:)
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_jbegin
-      INTEGER  , OPTIONAL, INTENT(OUT) :: data_n_index
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_ni
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_nj
@@ -425,8 +416,8 @@
       CALL xios(get_domaingroup_attr_hdl_)  &
       ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  &
-      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref  &
-      , domain_ref, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name  &
-      , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name  &
-      , type )
+      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref  &
+      , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  &
+      , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  &
+       )
 
   END SUBROUTINE xios(get_domaingroup_attr_hdl)
@@ -434,8 +425,8 @@
   SUBROUTINE xios(get_domaingroup_attr_hdl_)   &
     ( domaingroup_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_  &
-    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_n_index_, data_ni_, data_nj_  &
-    , domain_group_ref_, domain_ref_, group_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_  &
-    , latvalue_2d_, long_name_, lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_  &
-    , nj_, nj_glo_, nvertex_, standard_name_, type_ )
+    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_group_ref_  &
+    , domain_ref_, group_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_  &
+    , long_name_, lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_  &
+    , nvertex_, standard_name_, type_ )
 
     IMPLICIT NONE
@@ -451,5 +442,4 @@
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_j_index_(:)
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_jbegin_
-      INTEGER  , OPTIONAL, INTENT(OUT) :: data_n_index_
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_ni_
       INTEGER  , OPTIONAL, INTENT(OUT) :: data_nj_
@@ -519,8 +509,4 @@
       ENDIF
 
-      IF (PRESENT(data_n_index_)) THEN
-        CALL cxios_get_domaingroup_data_n_index(domaingroup_hdl%daddr, data_n_index_)
-      ENDIF
-
       IF (PRESENT(data_ni_)) THEN
         CALL cxios_get_domaingroup_data_ni(domaingroup_hdl%daddr, data_ni_)
@@ -627,8 +613,8 @@
   SUBROUTINE xios(is_defined_domaingroup_attr)  &
     ( domaingroup_id, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  &
-    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref  &
-    , domain_ref, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name  &
-    , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name  &
-    , type )
+    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref  &
+    , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  &
+    , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  &
+     )
 
     IMPLICIT NONE
@@ -655,6 +641,4 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: data_jbegin
       LOGICAL(KIND=C_BOOL) :: data_jbegin_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: data_n_index
-      LOGICAL(KIND=C_BOOL) :: data_n_index_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: data_ni
       LOGICAL(KIND=C_BOOL) :: data_ni_tmp
@@ -709,8 +693,8 @@
       CALL xios(is_defined_domaingroup_attr_hdl_)   &
       ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  &
-      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref  &
-      , domain_ref, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name  &
-      , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name  &
-      , type )
+      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref  &
+      , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  &
+      , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  &
+       )
 
   END SUBROUTINE xios(is_defined_domaingroup_attr)
@@ -718,8 +702,8 @@
   SUBROUTINE xios(is_defined_domaingroup_attr_hdl)  &
     ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  &
-    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref  &
-    , domain_ref, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name  &
-    , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name  &
-    , type )
+    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref  &
+    , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  &
+    , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  &
+     )
 
     IMPLICIT NONE
@@ -745,6 +729,4 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: data_jbegin
       LOGICAL(KIND=C_BOOL) :: data_jbegin_tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: data_n_index
-      LOGICAL(KIND=C_BOOL) :: data_n_index_tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: data_ni
       LOGICAL(KIND=C_BOOL) :: data_ni_tmp
@@ -798,8 +780,8 @@
       CALL xios(is_defined_domaingroup_attr_hdl_)  &
       ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  &
-      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_n_index, data_ni, data_nj, domain_group_ref  &
-      , domain_ref, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name  &
-      , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name  &
-      , type )
+      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref  &
+      , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  &
+      , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  &
+       )
 
   END SUBROUTINE xios(is_defined_domaingroup_attr_hdl)
@@ -807,8 +789,8 @@
   SUBROUTINE xios(is_defined_domaingroup_attr_hdl_)   &
     ( domaingroup_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_  &
-    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_n_index_, data_ni_, data_nj_  &
-    , domain_group_ref_, domain_ref_, group_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_  &
-    , latvalue_2d_, long_name_, lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_  &
-    , nj_, nj_glo_, nvertex_, standard_name_, type_ )
+    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_group_ref_  &
+    , domain_ref_, group_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_  &
+    , long_name_, lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_  &
+    , nvertex_, standard_name_, type_ )
 
     IMPLICIT NONE
@@ -834,6 +816,4 @@
       LOGICAL, OPTIONAL, INTENT(OUT) :: data_jbegin_
       LOGICAL(KIND=C_BOOL) :: data_jbegin__tmp
-      LOGICAL, OPTIONAL, INTENT(OUT) :: data_n_index_
-      LOGICAL(KIND=C_BOOL) :: data_n_index__tmp
       LOGICAL, OPTIONAL, INTENT(OUT) :: data_ni_
       LOGICAL(KIND=C_BOOL) :: data_ni__tmp
@@ -935,9 +915,4 @@
       ENDIF
 
-      IF (PRESENT(data_n_index_)) THEN
-        data_n_index__tmp = cxios_is_defined_domaingroup_data_n_index(domaingroup_hdl%daddr)
-        data_n_index_ = data_n_index__tmp
-      ENDIF
-
       IF (PRESENT(data_ni_)) THEN
         data_ni__tmp = cxios_is_defined_domaingroup_data_ni(domaingroup_hdl%daddr)
