Index: /XIOS/trunk/src/attribute_map.cpp
===================================================================
--- /XIOS/trunk/src/attribute_map.cpp	(revision 965)
+++ /XIOS/trunk/src/attribute_map.cpp	(revision 966)
@@ -629,5 +629,6 @@
 
          oss << std::endl << iendl;
-         oss << "CALL xios(get_" << className << "_handle)(" << className << "_id," << className << "_hdl)" << iendl;
+         oss << "CALL xios(get_" << className << "_handle) &" << iendl;
+         oss << "(" << className << "_id," << className << "_hdl)" << iendl;
          oss << "CALL xios(set_" << className << "_attr_hdl_)   &" << iendl;
 
@@ -693,5 +694,6 @@
 
          oss << std::endl << iendl;
-         oss << "CALL xios(get_" << className << "_handle)(" << className << "_id," << className << "_hdl)" << iendl;
+         oss << "CALL xios(get_" << className << "_handle) &" << iendl;
+         oss << "(" << className << "_id," << className << "_hdl)" << iendl;
          oss << "CALL xios(get_" << className << "_attr_hdl_)   &" << iendl;
 
@@ -757,5 +759,6 @@
 
          oss << std::endl << iendl;
-         oss << "CALL xios(get_" << className << "_handle)(" << className << "_id," << className << "_hdl)" << iendl;
+         oss << "CALL xios(get_" << className << "_handle) &" << iendl;
+         oss << "(" << className << "_id," << className << "_hdl)" << iendl;
          oss << "CALL xios(is_defined_" << className << "_attr_hdl_)   &" << iendl;
 
Index: /XIOS/trunk/src/generate_interface_impl.hpp
===================================================================
--- /XIOS/trunk/src/generate_interface_impl.hpp	(revision 965)
+++ /XIOS/trunk/src/generate_interface_impl.hpp	(revision 966)
@@ -323,7 +323,9 @@
     {
       oss << "  " << name_tmp << " = " << name << "_" << iendl;
-      oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ")" << iendl;
+      oss << "  CALL cxios_set_" << className << "_" << name << " &" << iendl;
+      oss << "(" << className << "_hdl%daddr, " << name_tmp << ")" << iendl;
     }
-    else oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_)" << iendl;
+    else { oss << "  CALL cxios_set_" << className << "_" << name << " &" << iendl;
+           oss << "(" << className << "_hdl%daddr, " << name << "_)" << iendl; }
     oss << "ENDIF";
   }
@@ -337,8 +339,10 @@
     if (!matchingTypeCFortran<T>())
     {
-      oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ")" << iendl;
+      oss << "  CALL cxios_get_" << className << "_" << name << " &" << iendl;
+      oss << "(" << className << "_hdl%daddr, " << name_tmp << ")" << iendl;
       oss << "  " << name << "_ = " << name_tmp << iendl;
     }
-    else oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_)" << iendl;
+    else { oss << "  CALL cxios_get_" << className << "_" << name << " &" << iendl;
+           oss << "(" << className << "_hdl%daddr, " << name << "_)" << iendl; }
     oss << "ENDIF";
   }
@@ -349,5 +353,6 @@
 
     oss << "IF (PRESENT(" << name << "_)) THEN" << iendl;
-    oss << "  " << name << "__tmp = cxios_is_defined_" << className << "_" << name << "(" << className << "_hdl%daddr)" << iendl;
+    oss << "  " << name << "__tmp = cxios_is_defined_" << className << "_" << name << " &" << iendl;
+    oss << "(" << className << "_hdl%daddr)" << iendl;
     oss << "  " << name << "_ = " << name_tmp << iendl;
     oss << "ENDIF";
@@ -358,5 +363,6 @@
   {
     oss << "IF (PRESENT(" << name << "_)) THEN" << iendl;
-    oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, len(" << name << "_))" << iendl;
+    oss << "  CALL cxios_set_" << className << "_" << name << " &" << iendl;
+    oss << "(" << className << "_hdl%daddr, " << name << "_, len(" << name << "_))" << iendl;
     oss << "ENDIF";
   }
@@ -366,5 +372,6 @@
   {
     oss << "IF (PRESENT(" << name << "_)) THEN" << iendl;
-    oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, len(" << name << "_))" << iendl;
+    oss << "  CALL cxios_get_" << className << "_" << name << " &" << iendl;
+    oss << "(" << className << "_hdl%daddr, " << name << "_, len(" << name << "_))" << iendl;
     oss << "ENDIF";
   }
@@ -813,7 +820,9 @@
       oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1)))" << iendl; \
       oss << "  " << name_tmp << " = " << name << "_" << iendl; \
-      oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
+      oss << "  CALL cxios_set_" << className << "_" << name << " &" << iendl; \
+      oss << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
     } \
-    else oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \
+    else { oss << "  CALL cxios_set_" << className << "_" << name << " &" << iendl; \
+           oss << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; } \
     oss << "ENDIF"; \
   } \
@@ -829,7 +838,9 @@
       oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2)))" << iendl; \
       oss << "  " << name_tmp << " = " << name << "_" << iendl; \
-      oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
+      oss << "  CALL cxios_set_" << className << "_" << name << " &" << iendl; \
+      oss << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
     } \
-    else oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \
+    else { oss << "  CALL cxios_set_" << className << "_" << name << " &" << iendl; \
+           oss << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; } \
     oss << "ENDIF"; \
   } \
@@ -845,7 +856,9 @@
       oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3)))" << iendl; \
       oss << "  " << name_tmp << " = " << name << "_" << iendl; \
-      oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
+      oss << "  CALL cxios_set_" << className << "_" << name << " &" << iendl; \
+      oss << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
     } \
-    else oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \
+    else { oss << "  CALL cxios_set_" << className << "_" << name << " &" << iendl; \
+           oss << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; } \
     oss << "ENDIF"; \
   }\
@@ -859,9 +872,12 @@
     if (!matchingTypeCFortran<T>())  \
     { \
-      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3), SIZE(" << name << "_,4)))" << iendl; \
+      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3), &" << iendl; \
+      oss << " SIZE(" << name << "_,4)))" << iendl; \
       oss << "  " << name_tmp << " = " << name << "_" << iendl; \
-      oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
+      oss << "  CALL cxios_set_" << className << "_" << name << " &" << iendl; \
+      oss << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
     } \
-    else oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \
+    else { oss << "  CALL cxios_set_" << className << "_" << name << " &" << iendl; \
+           oss << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; } \
     oss << "ENDIF"; \
   }\
@@ -875,9 +891,12 @@
     if (!matchingTypeCFortran<T>())  \
     { \
-      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3), SIZE(" << name << "_,4), SIZE(" << name << "_,5)))" << iendl; \
+      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3), &" << iendl; \
+      oss << " SIZE(" << name << "_,4), SIZE(" << name << "_,5)))" << iendl; \
       oss << "  " << name_tmp << " = " << name << "_" << iendl; \
-      oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
+      oss << "  CALL cxios_set_" << className << "_" << name << " &" << iendl; \
+      oss << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
     } \
-    else oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \
+    else { oss << "  CALL cxios_set_" << className << "_" << name << " &" << iendl; \
+           oss << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; } \
     oss << "ENDIF"; \
   }\
@@ -891,9 +910,12 @@
     if (!matchingTypeCFortran<T>())  \
     { \
-      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3), SIZE(" << name << "_,4), SIZE(" << name << "_,5), SIZE(" << name << "_,6)))" << iendl; \
+      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3), &" << iendl; \
+      oss << " SIZE(" << name << "_,4), SIZE(" << name << "_,5), SIZE(" << name << "_,6)))" << iendl; \
       oss << "  " << name_tmp << " = " << name << "_" << iendl; \
-      oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
+      oss << "  CALL cxios_set_" << className << "_" << name << " &" << iendl; \
+      oss << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
     } \
-    else oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \
+    else { oss << "  CALL cxios_set_" << className << "_" << name << " &" << iendl; \
+           oss << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; } \
     oss << "ENDIF"; \
   }\
@@ -907,9 +929,13 @@
     if (!matchingTypeCFortran<T>())  \
     { \
-      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3), SIZE(" << name << "_,4), SIZE(" << name << "_,5), SIZE(" << name << "_,6), SIZE(" << name << "_,7)))" << iendl; \
+      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3), &" << iendl; \
+      oss << " SIZE(" << name << "_,4), SIZE(" << name << "_,5), SIZE(" << name << "_,6), &" << iendl; \
+      oss << " SIZE(" << name << "_,7)))" << iendl; \
       oss << "  " << name_tmp << " = " << name << "_" << iendl; \
-      oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
+      oss << "  CALL cxios_set_" << className << "_" << name << " &" << iendl; \
+      oss << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
     } \
-    else oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \
+    else { oss << "  CALL cxios_set_" << className << "_" << name << " &" << iendl; \
+           oss << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; } \
     oss << "ENDIF"; \
   }
@@ -931,8 +957,10 @@
     { \
       oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1)))" << iendl; \
-      oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
+      oss << "  CALL cxios_get_" << className << "_" << name << " &" << iendl; \
+      oss << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
       oss << "  " << name << "_ = " << name_tmp << iendl; \
     } \
-    else oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \
+    else { oss << "  CALL cxios_get_" << className << "_" << name << " &" << iendl; \
+           oss << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; } \
     oss << "ENDIF"; \
   } \
@@ -947,8 +975,10 @@
     { \
       oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2)))" << iendl; \
-      oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
+      oss << "  CALL cxios_get_" << className << "_" << name << " &" << iendl; \
+      oss << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
       oss << "  " << name << "_ = " << name_tmp << iendl; \
     } \
-    else oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \
+    else { oss << "  CALL cxios_get_" << className << "_" << name << " &" << iendl; \
+           oss << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; } \
     oss << "ENDIF"; \
   } \
@@ -963,8 +993,10 @@
     { \
       oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3)))" << iendl; \
-      oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
+      oss << "  CALL cxios_get_" << className << "_" << name << " &" << iendl; \
+      oss << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
       oss << "  " << name << "_ = " << name_tmp << iendl; \
       } \
-    else oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \
+    else { oss << "  CALL cxios_get_" << className << "_" << name << " &" << iendl; \
+           oss << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; } \
     oss << "ENDIF"; \
   } \
@@ -978,9 +1010,12 @@
     if (!matchingTypeCFortran<T>())  \
     { \
-      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3), SIZE(" << name << "_,4)))" << iendl; \
-      oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
+      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3), &" << iendl; \
+      oss << " SIZE(" << name << "_,4)))" << iendl; \
+      oss << "  CALL cxios_get_" << className << "_" << name << " &" << iendl; \
+      oss << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
       oss << "  " << name << "_ = " << name_tmp << iendl; \
       } \
-    else oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \
+    else { oss << "  CALL cxios_get_" << className << "_" << name << " &" << iendl; \
+           oss << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; }\
     oss << "ENDIF"; \
   } \
@@ -994,9 +1029,12 @@
     if (!matchingTypeCFortran<T>())  \
     { \
-      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3), SIZE(" << name << "_,4), SIZE(" << name << "_,5)))" << iendl; \
-      oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
+      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3), &" << iendl; \
+      oss << " SIZE(" << name << "_,4), SIZE(" << name << "_,5)))" << iendl; \
+      oss << "  CALL cxios_get_" << className << "_" << name << " &" << iendl; \
+      oss << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
       oss << "  " << name << "_ = " << name_tmp << iendl; \
       } \
-    else oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \
+    else { oss << "  CALL cxios_get_" << className << "_" << name << " &" << iendl; \
+           oss << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; } \
     oss << "ENDIF"; \
   }\
@@ -1010,9 +1048,12 @@
     if (!matchingTypeCFortran<T>())  \
     { \
-      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3), SIZE(" << name << "_,4), SIZE(" << name << "_,5), SIZE(" << name << "_,6)))" << iendl; \
-      oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
+      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3), &" << iendl; \
+      oss << " SIZE(" << name << "_,4), SIZE(" << name << "_,5), SIZE(" << name << "_,6)))" << iendl; \
+      oss << "  CALL cxios_get_" << className << "_" << name << " &" << iendl; \
+      oss << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
       oss << "  " << name << "_ = " << name_tmp << iendl; \
       } \
-    else oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \
+    else { oss << "  CALL cxios_get_" << className << "_" << name << " &" << iendl; \
+           oss << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; } \
     oss << "ENDIF"; \
   } \
@@ -1026,9 +1067,13 @@
     if (!matchingTypeCFortran<T>())  \
     { \
-      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3), SIZE(" << name << "_,4), SIZE(" << name << "_,5), SIZE(" << name << "_,6), SIZE(" << name << "_,7)))" << iendl; \
-      oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
+      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3), &" << iendl; \
+      oss << " SIZE(" << name << "_,4), SIZE(" << name << "_,5), SIZE(" << name << "_,6), &" << iendl; \
+      oss << " SIZE(" << name << "_,7)))" << iendl; \
+      oss << "  CALL cxios_get_" << className << "_" << name << " &" << iendl; \
+      oss << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \
       oss << "  " << name << "_ = " << name_tmp << iendl; \
       } \
-    else oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \
+    else { oss << "  CALL cxios_get_" << className << "_" << name << " &" << iendl; \
+           oss << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; } \
     oss << "ENDIF"; \
   }
Index: /XIOS/trunk/src/interface/fortran_attr/iaxis_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/iaxis_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/iaxis_attr.F90	(revision 966)
@@ -37,5 +37,6 @@
       REAL (KIND=8) , OPTIONAL, INTENT(IN) :: value(:)
 
-      CALL xios(get_axis_handle)(axis_id,axis_hdl)
+      CALL xios(get_axis_handle) &
+      (axis_id,axis_hdl)
       CALL xios(set_axis_attr_hdl_)   &
       ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, long_name, mask  &
@@ -102,33 +103,41 @@
 
       IF (PRESENT(axis_ref_)) THEN
-        CALL cxios_set_axis_axis_ref(axis_hdl%daddr, axis_ref_, len(axis_ref_))
+        CALL cxios_set_axis_axis_ref &
+      (axis_hdl%daddr, axis_ref_, len(axis_ref_))
       ENDIF
 
       IF (PRESENT(begin_)) THEN
-        CALL cxios_set_axis_begin(axis_hdl%daddr, begin_)
+        CALL cxios_set_axis_begin &
+      (axis_hdl%daddr, begin_)
       ENDIF
 
       IF (PRESENT(bounds_)) THEN
-        CALL cxios_set_axis_bounds(axis_hdl%daddr, bounds_, SHAPE(bounds_))
+        CALL cxios_set_axis_bounds &
+      (axis_hdl%daddr, bounds_, SHAPE(bounds_))
       ENDIF
 
       IF (PRESENT(data_begin_)) THEN
-        CALL cxios_set_axis_data_begin(axis_hdl%daddr, data_begin_)
+        CALL cxios_set_axis_data_begin &
+      (axis_hdl%daddr, data_begin_)
       ENDIF
 
       IF (PRESENT(data_index_)) THEN
-        CALL cxios_set_axis_data_index(axis_hdl%daddr, data_index_, SHAPE(data_index_))
+        CALL cxios_set_axis_data_index &
+      (axis_hdl%daddr, data_index_, SHAPE(data_index_))
       ENDIF
 
       IF (PRESENT(data_n_)) THEN
-        CALL cxios_set_axis_data_n(axis_hdl%daddr, data_n_)
+        CALL cxios_set_axis_data_n &
+      (axis_hdl%daddr, data_n_)
       ENDIF
 
       IF (PRESENT(index_)) THEN
-        CALL cxios_set_axis_index(axis_hdl%daddr, index_, SHAPE(index_))
+        CALL cxios_set_axis_index &
+      (axis_hdl%daddr, index_, SHAPE(index_))
       ENDIF
 
       IF (PRESENT(long_name_)) THEN
-        CALL cxios_set_axis_long_name(axis_hdl%daddr, long_name_, len(long_name_))
+        CALL cxios_set_axis_long_name &
+      (axis_hdl%daddr, long_name_, len(long_name_))
       ENDIF
 
@@ -136,37 +145,46 @@
         ALLOCATE(mask__tmp(SIZE(mask_,1)))
         mask__tmp = mask_
-        CALL cxios_set_axis_mask(axis_hdl%daddr, mask__tmp, SHAPE(mask_))
+        CALL cxios_set_axis_mask &
+      (axis_hdl%daddr, mask__tmp, SHAPE(mask_))
       ENDIF
 
       IF (PRESENT(n_)) THEN
-        CALL cxios_set_axis_n(axis_hdl%daddr, n_)
+        CALL cxios_set_axis_n &
+      (axis_hdl%daddr, n_)
       ENDIF
 
       IF (PRESENT(n_distributed_partition_)) THEN
-        CALL cxios_set_axis_n_distributed_partition(axis_hdl%daddr, n_distributed_partition_)
+        CALL cxios_set_axis_n_distributed_partition &
+      (axis_hdl%daddr, n_distributed_partition_)
       ENDIF
 
       IF (PRESENT(n_glo_)) THEN
-        CALL cxios_set_axis_n_glo(axis_hdl%daddr, n_glo_)
+        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_))
+        CALL cxios_set_axis_name &
+      (axis_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(positive_)) THEN
-        CALL cxios_set_axis_positive(axis_hdl%daddr, positive_, len(positive_))
+        CALL cxios_set_axis_positive &
+      (axis_hdl%daddr, positive_, len(positive_))
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        CALL cxios_set_axis_standard_name(axis_hdl%daddr, standard_name_, len(standard_name_))
+        CALL cxios_set_axis_standard_name &
+      (axis_hdl%daddr, standard_name_, len(standard_name_))
       ENDIF
 
       IF (PRESENT(unit_)) THEN
-        CALL cxios_set_axis_unit(axis_hdl%daddr, unit_, len(unit_))
+        CALL cxios_set_axis_unit &
+      (axis_hdl%daddr, unit_, len(unit_))
       ENDIF
 
       IF (PRESENT(value_)) THEN
-        CALL cxios_set_axis_value(axis_hdl%daddr, value_, SHAPE(value_))
+        CALL cxios_set_axis_value &
+      (axis_hdl%daddr, value_, SHAPE(value_))
       ENDIF
 
@@ -199,5 +217,6 @@
       REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: value(:)
 
-      CALL xios(get_axis_handle)(axis_id,axis_hdl)
+      CALL xios(get_axis_handle) &
+      (axis_id,axis_hdl)
       CALL xios(get_axis_attr_hdl_)   &
       ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, long_name, mask  &
@@ -264,71 +283,88 @@
 
       IF (PRESENT(axis_ref_)) THEN
-        CALL cxios_get_axis_axis_ref(axis_hdl%daddr, axis_ref_, len(axis_ref_))
+        CALL cxios_get_axis_axis_ref &
+      (axis_hdl%daddr, axis_ref_, len(axis_ref_))
       ENDIF
 
       IF (PRESENT(begin_)) THEN
-        CALL cxios_get_axis_begin(axis_hdl%daddr, begin_)
+        CALL cxios_get_axis_begin &
+      (axis_hdl%daddr, begin_)
       ENDIF
 
       IF (PRESENT(bounds_)) THEN
-        CALL cxios_get_axis_bounds(axis_hdl%daddr, bounds_, SHAPE(bounds_))
+        CALL cxios_get_axis_bounds &
+      (axis_hdl%daddr, bounds_, SHAPE(bounds_))
       ENDIF
 
       IF (PRESENT(data_begin_)) THEN
-        CALL cxios_get_axis_data_begin(axis_hdl%daddr, data_begin_)
+        CALL cxios_get_axis_data_begin &
+      (axis_hdl%daddr, data_begin_)
       ENDIF
 
       IF (PRESENT(data_index_)) THEN
-        CALL cxios_get_axis_data_index(axis_hdl%daddr, data_index_, SHAPE(data_index_))
+        CALL cxios_get_axis_data_index &
+      (axis_hdl%daddr, data_index_, SHAPE(data_index_))
       ENDIF
 
       IF (PRESENT(data_n_)) THEN
-        CALL cxios_get_axis_data_n(axis_hdl%daddr, data_n_)
+        CALL cxios_get_axis_data_n &
+      (axis_hdl%daddr, data_n_)
       ENDIF
 
       IF (PRESENT(index_)) THEN
-        CALL cxios_get_axis_index(axis_hdl%daddr, index_, SHAPE(index_))
+        CALL cxios_get_axis_index &
+      (axis_hdl%daddr, index_, SHAPE(index_))
       ENDIF
 
       IF (PRESENT(long_name_)) THEN
-        CALL cxios_get_axis_long_name(axis_hdl%daddr, long_name_, len(long_name_))
+        CALL cxios_get_axis_long_name &
+      (axis_hdl%daddr, long_name_, len(long_name_))
       ENDIF
 
       IF (PRESENT(mask_)) THEN
         ALLOCATE(mask__tmp(SIZE(mask_,1)))
-        CALL cxios_get_axis_mask(axis_hdl%daddr, mask__tmp, SHAPE(mask_))
+        CALL cxios_get_axis_mask &
+      (axis_hdl%daddr, mask__tmp, SHAPE(mask_))
         mask_ = mask__tmp
       ENDIF
 
       IF (PRESENT(n_)) THEN
-        CALL cxios_get_axis_n(axis_hdl%daddr, n_)
+        CALL cxios_get_axis_n &
+      (axis_hdl%daddr, n_)
       ENDIF
 
       IF (PRESENT(n_distributed_partition_)) THEN
-        CALL cxios_get_axis_n_distributed_partition(axis_hdl%daddr, n_distributed_partition_)
+        CALL cxios_get_axis_n_distributed_partition &
+      (axis_hdl%daddr, n_distributed_partition_)
       ENDIF
 
       IF (PRESENT(n_glo_)) THEN
-        CALL cxios_get_axis_n_glo(axis_hdl%daddr, n_glo_)
+        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_))
+        CALL cxios_get_axis_name &
+      (axis_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(positive_)) THEN
-        CALL cxios_get_axis_positive(axis_hdl%daddr, positive_, len(positive_))
+        CALL cxios_get_axis_positive &
+      (axis_hdl%daddr, positive_, len(positive_))
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        CALL cxios_get_axis_standard_name(axis_hdl%daddr, standard_name_, len(standard_name_))
+        CALL cxios_get_axis_standard_name &
+      (axis_hdl%daddr, standard_name_, len(standard_name_))
       ENDIF
 
       IF (PRESENT(unit_)) THEN
-        CALL cxios_get_axis_unit(axis_hdl%daddr, unit_, len(unit_))
+        CALL cxios_get_axis_unit &
+      (axis_hdl%daddr, unit_, len(unit_))
       ENDIF
 
       IF (PRESENT(value_)) THEN
-        CALL cxios_get_axis_value(axis_hdl%daddr, value_, SHAPE(value_))
+        CALL cxios_get_axis_value &
+      (axis_hdl%daddr, value_, SHAPE(value_))
       ENDIF
 
@@ -377,5 +413,6 @@
       LOGICAL(KIND=C_BOOL) :: value_tmp
 
-      CALL xios(get_axis_handle)(axis_id,axis_hdl)
+      CALL xios(get_axis_handle) &
+      (axis_id,axis_hdl)
       CALL xios(is_defined_axis_attr_hdl_)   &
       ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, long_name, mask  &
@@ -474,85 +511,102 @@
 
       IF (PRESENT(axis_ref_)) THEN
-        axis_ref__tmp = cxios_is_defined_axis_axis_ref(axis_hdl%daddr)
+        axis_ref__tmp = cxios_is_defined_axis_axis_ref &
+      (axis_hdl%daddr)
         axis_ref_ = axis_ref__tmp
       ENDIF
 
       IF (PRESENT(begin_)) THEN
-        begin__tmp = cxios_is_defined_axis_begin(axis_hdl%daddr)
+        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)
+        bounds__tmp = cxios_is_defined_axis_bounds &
+      (axis_hdl%daddr)
         bounds_ = bounds__tmp
       ENDIF
 
       IF (PRESENT(data_begin_)) THEN
-        data_begin__tmp = cxios_is_defined_axis_data_begin(axis_hdl%daddr)
+        data_begin__tmp = cxios_is_defined_axis_data_begin &
+      (axis_hdl%daddr)
         data_begin_ = data_begin__tmp
       ENDIF
 
       IF (PRESENT(data_index_)) THEN
-        data_index__tmp = cxios_is_defined_axis_data_index(axis_hdl%daddr)
+        data_index__tmp = cxios_is_defined_axis_data_index &
+      (axis_hdl%daddr)
         data_index_ = data_index__tmp
       ENDIF
 
       IF (PRESENT(data_n_)) THEN
-        data_n__tmp = cxios_is_defined_axis_data_n(axis_hdl%daddr)
+        data_n__tmp = cxios_is_defined_axis_data_n &
+      (axis_hdl%daddr)
         data_n_ = data_n__tmp
       ENDIF
 
       IF (PRESENT(index_)) THEN
-        index__tmp = cxios_is_defined_axis_index(axis_hdl%daddr)
+        index__tmp = cxios_is_defined_axis_index &
+      (axis_hdl%daddr)
         index_ = index__tmp
       ENDIF
 
       IF (PRESENT(long_name_)) THEN
-        long_name__tmp = cxios_is_defined_axis_long_name(axis_hdl%daddr)
+        long_name__tmp = cxios_is_defined_axis_long_name &
+      (axis_hdl%daddr)
         long_name_ = long_name__tmp
       ENDIF
 
       IF (PRESENT(mask_)) THEN
-        mask__tmp = cxios_is_defined_axis_mask(axis_hdl%daddr)
+        mask__tmp = cxios_is_defined_axis_mask &
+      (axis_hdl%daddr)
         mask_ = mask__tmp
       ENDIF
 
       IF (PRESENT(n_)) THEN
-        n__tmp = cxios_is_defined_axis_n(axis_hdl%daddr)
+        n__tmp = cxios_is_defined_axis_n &
+      (axis_hdl%daddr)
         n_ = n__tmp
       ENDIF
 
       IF (PRESENT(n_distributed_partition_)) THEN
-        n_distributed_partition__tmp = cxios_is_defined_axis_n_distributed_partition(axis_hdl%daddr)
+        n_distributed_partition__tmp = cxios_is_defined_axis_n_distributed_partition &
+      (axis_hdl%daddr)
         n_distributed_partition_ = n_distributed_partition__tmp
       ENDIF
 
       IF (PRESENT(n_glo_)) THEN
-        n_glo__tmp = cxios_is_defined_axis_n_glo(axis_hdl%daddr)
+        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)
+        name__tmp = cxios_is_defined_axis_name &
+      (axis_hdl%daddr)
         name_ = name__tmp
       ENDIF
 
       IF (PRESENT(positive_)) THEN
-        positive__tmp = cxios_is_defined_axis_positive(axis_hdl%daddr)
+        positive__tmp = cxios_is_defined_axis_positive &
+      (axis_hdl%daddr)
         positive_ = positive__tmp
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        standard_name__tmp = cxios_is_defined_axis_standard_name(axis_hdl%daddr)
+        standard_name__tmp = cxios_is_defined_axis_standard_name &
+      (axis_hdl%daddr)
         standard_name_ = standard_name__tmp
       ENDIF
 
       IF (PRESENT(unit_)) THEN
-        unit__tmp = cxios_is_defined_axis_unit(axis_hdl%daddr)
+        unit__tmp = cxios_is_defined_axis_unit &
+      (axis_hdl%daddr)
         unit_ = unit__tmp
       ENDIF
 
       IF (PRESENT(value_)) THEN
-        value__tmp = cxios_is_defined_axis_value(axis_hdl%daddr)
+        value__tmp = cxios_is_defined_axis_value &
+      (axis_hdl%daddr)
         value_ = value__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/iaxisgroup_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/iaxisgroup_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/iaxisgroup_attr.F90	(revision 966)
@@ -38,5 +38,6 @@
       REAL (KIND=8) , OPTIONAL, INTENT(IN) :: value(:)
 
-      CALL xios(get_axisgroup_handle)(axisgroup_id,axisgroup_hdl)
+      CALL xios(get_axisgroup_handle) &
+      (axisgroup_id,axisgroup_hdl)
       CALL xios(set_axisgroup_attr_hdl_)   &
       ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, long_name  &
@@ -105,37 +106,46 @@
 
       IF (PRESENT(axis_ref_)) THEN
-        CALL cxios_set_axisgroup_axis_ref(axisgroup_hdl%daddr, axis_ref_, len(axis_ref_))
+        CALL cxios_set_axisgroup_axis_ref &
+      (axisgroup_hdl%daddr, axis_ref_, len(axis_ref_))
       ENDIF
 
       IF (PRESENT(begin_)) THEN
-        CALL cxios_set_axisgroup_begin(axisgroup_hdl%daddr, begin_)
+        CALL cxios_set_axisgroup_begin &
+      (axisgroup_hdl%daddr, begin_)
       ENDIF
 
       IF (PRESENT(bounds_)) THEN
-        CALL cxios_set_axisgroup_bounds(axisgroup_hdl%daddr, bounds_, SHAPE(bounds_))
+        CALL cxios_set_axisgroup_bounds &
+      (axisgroup_hdl%daddr, bounds_, SHAPE(bounds_))
       ENDIF
 
       IF (PRESENT(data_begin_)) THEN
-        CALL cxios_set_axisgroup_data_begin(axisgroup_hdl%daddr, data_begin_)
+        CALL cxios_set_axisgroup_data_begin &
+      (axisgroup_hdl%daddr, data_begin_)
       ENDIF
 
       IF (PRESENT(data_index_)) THEN
-        CALL cxios_set_axisgroup_data_index(axisgroup_hdl%daddr, data_index_, SHAPE(data_index_))
+        CALL cxios_set_axisgroup_data_index &
+      (axisgroup_hdl%daddr, data_index_, SHAPE(data_index_))
       ENDIF
 
       IF (PRESENT(data_n_)) THEN
-        CALL cxios_set_axisgroup_data_n(axisgroup_hdl%daddr, data_n_)
+        CALL cxios_set_axisgroup_data_n &
+      (axisgroup_hdl%daddr, data_n_)
       ENDIF
 
       IF (PRESENT(group_ref_)) THEN
-        CALL cxios_set_axisgroup_group_ref(axisgroup_hdl%daddr, group_ref_, len(group_ref_))
+        CALL cxios_set_axisgroup_group_ref &
+      (axisgroup_hdl%daddr, group_ref_, len(group_ref_))
       ENDIF
 
       IF (PRESENT(index_)) THEN
-        CALL cxios_set_axisgroup_index(axisgroup_hdl%daddr, index_, SHAPE(index_))
+        CALL cxios_set_axisgroup_index &
+      (axisgroup_hdl%daddr, index_, SHAPE(index_))
       ENDIF
 
       IF (PRESENT(long_name_)) THEN
-        CALL cxios_set_axisgroup_long_name(axisgroup_hdl%daddr, long_name_, len(long_name_))
+        CALL cxios_set_axisgroup_long_name &
+      (axisgroup_hdl%daddr, long_name_, len(long_name_))
       ENDIF
 
@@ -143,37 +153,46 @@
         ALLOCATE(mask__tmp(SIZE(mask_,1)))
         mask__tmp = mask_
-        CALL cxios_set_axisgroup_mask(axisgroup_hdl%daddr, mask__tmp, SHAPE(mask_))
+        CALL cxios_set_axisgroup_mask &
+      (axisgroup_hdl%daddr, mask__tmp, SHAPE(mask_))
       ENDIF
 
       IF (PRESENT(n_)) THEN
-        CALL cxios_set_axisgroup_n(axisgroup_hdl%daddr, n_)
+        CALL cxios_set_axisgroup_n &
+      (axisgroup_hdl%daddr, n_)
       ENDIF
 
       IF (PRESENT(n_distributed_partition_)) THEN
-        CALL cxios_set_axisgroup_n_distributed_partition(axisgroup_hdl%daddr, n_distributed_partition_)
+        CALL cxios_set_axisgroup_n_distributed_partition &
+      (axisgroup_hdl%daddr, n_distributed_partition_)
       ENDIF
 
       IF (PRESENT(n_glo_)) THEN
-        CALL cxios_set_axisgroup_n_glo(axisgroup_hdl%daddr, n_glo_)
+        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_))
+        CALL cxios_set_axisgroup_name &
+      (axisgroup_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(positive_)) THEN
-        CALL cxios_set_axisgroup_positive(axisgroup_hdl%daddr, positive_, len(positive_))
+        CALL cxios_set_axisgroup_positive &
+      (axisgroup_hdl%daddr, positive_, len(positive_))
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        CALL cxios_set_axisgroup_standard_name(axisgroup_hdl%daddr, standard_name_, len(standard_name_))
+        CALL cxios_set_axisgroup_standard_name &
+      (axisgroup_hdl%daddr, standard_name_, len(standard_name_))
       ENDIF
 
       IF (PRESENT(unit_)) THEN
-        CALL cxios_set_axisgroup_unit(axisgroup_hdl%daddr, unit_, len(unit_))
+        CALL cxios_set_axisgroup_unit &
+      (axisgroup_hdl%daddr, unit_, len(unit_))
       ENDIF
 
       IF (PRESENT(value_)) THEN
-        CALL cxios_set_axisgroup_value(axisgroup_hdl%daddr, value_, SHAPE(value_))
+        CALL cxios_set_axisgroup_value &
+      (axisgroup_hdl%daddr, value_, SHAPE(value_))
       ENDIF
 
@@ -207,5 +226,6 @@
       REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: value(:)
 
-      CALL xios(get_axisgroup_handle)(axisgroup_id,axisgroup_hdl)
+      CALL xios(get_axisgroup_handle) &
+      (axisgroup_id,axisgroup_hdl)
       CALL xios(get_axisgroup_attr_hdl_)   &
       ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, long_name  &
@@ -274,75 +294,93 @@
 
       IF (PRESENT(axis_ref_)) THEN
-        CALL cxios_get_axisgroup_axis_ref(axisgroup_hdl%daddr, axis_ref_, len(axis_ref_))
+        CALL cxios_get_axisgroup_axis_ref &
+      (axisgroup_hdl%daddr, axis_ref_, len(axis_ref_))
       ENDIF
 
       IF (PRESENT(begin_)) THEN
-        CALL cxios_get_axisgroup_begin(axisgroup_hdl%daddr, begin_)
+        CALL cxios_get_axisgroup_begin &
+      (axisgroup_hdl%daddr, begin_)
       ENDIF
 
       IF (PRESENT(bounds_)) THEN
-        CALL cxios_get_axisgroup_bounds(axisgroup_hdl%daddr, bounds_, SHAPE(bounds_))
+        CALL cxios_get_axisgroup_bounds &
+      (axisgroup_hdl%daddr, bounds_, SHAPE(bounds_))
       ENDIF
 
       IF (PRESENT(data_begin_)) THEN
-        CALL cxios_get_axisgroup_data_begin(axisgroup_hdl%daddr, data_begin_)
+        CALL cxios_get_axisgroup_data_begin &
+      (axisgroup_hdl%daddr, data_begin_)
       ENDIF
 
       IF (PRESENT(data_index_)) THEN
-        CALL cxios_get_axisgroup_data_index(axisgroup_hdl%daddr, data_index_, SHAPE(data_index_))
+        CALL cxios_get_axisgroup_data_index &
+      (axisgroup_hdl%daddr, data_index_, SHAPE(data_index_))
       ENDIF
 
       IF (PRESENT(data_n_)) THEN
-        CALL cxios_get_axisgroup_data_n(axisgroup_hdl%daddr, data_n_)
+        CALL cxios_get_axisgroup_data_n &
+      (axisgroup_hdl%daddr, data_n_)
       ENDIF
 
       IF (PRESENT(group_ref_)) THEN
-        CALL cxios_get_axisgroup_group_ref(axisgroup_hdl%daddr, group_ref_, len(group_ref_))
+        CALL cxios_get_axisgroup_group_ref &
+      (axisgroup_hdl%daddr, group_ref_, len(group_ref_))
       ENDIF
 
       IF (PRESENT(index_)) THEN
-        CALL cxios_get_axisgroup_index(axisgroup_hdl%daddr, index_, SHAPE(index_))
+        CALL cxios_get_axisgroup_index &
+      (axisgroup_hdl%daddr, index_, SHAPE(index_))
       ENDIF
 
       IF (PRESENT(long_name_)) THEN
-        CALL cxios_get_axisgroup_long_name(axisgroup_hdl%daddr, long_name_, len(long_name_))
+        CALL cxios_get_axisgroup_long_name &
+      (axisgroup_hdl%daddr, long_name_, len(long_name_))
       ENDIF
 
       IF (PRESENT(mask_)) THEN
         ALLOCATE(mask__tmp(SIZE(mask_,1)))
-        CALL cxios_get_axisgroup_mask(axisgroup_hdl%daddr, mask__tmp, SHAPE(mask_))
+        CALL cxios_get_axisgroup_mask &
+      (axisgroup_hdl%daddr, mask__tmp, SHAPE(mask_))
         mask_ = mask__tmp
       ENDIF
 
       IF (PRESENT(n_)) THEN
-        CALL cxios_get_axisgroup_n(axisgroup_hdl%daddr, n_)
+        CALL cxios_get_axisgroup_n &
+      (axisgroup_hdl%daddr, n_)
       ENDIF
 
       IF (PRESENT(n_distributed_partition_)) THEN
-        CALL cxios_get_axisgroup_n_distributed_partition(axisgroup_hdl%daddr, n_distributed_partition_)
+        CALL cxios_get_axisgroup_n_distributed_partition &
+      (axisgroup_hdl%daddr, n_distributed_partition_)
       ENDIF
 
       IF (PRESENT(n_glo_)) THEN
-        CALL cxios_get_axisgroup_n_glo(axisgroup_hdl%daddr, n_glo_)
+        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_))
+        CALL cxios_get_axisgroup_name &
+      (axisgroup_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(positive_)) THEN
-        CALL cxios_get_axisgroup_positive(axisgroup_hdl%daddr, positive_, len(positive_))
+        CALL cxios_get_axisgroup_positive &
+      (axisgroup_hdl%daddr, positive_, len(positive_))
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        CALL cxios_get_axisgroup_standard_name(axisgroup_hdl%daddr, standard_name_, len(standard_name_))
+        CALL cxios_get_axisgroup_standard_name &
+      (axisgroup_hdl%daddr, standard_name_, len(standard_name_))
       ENDIF
 
       IF (PRESENT(unit_)) THEN
-        CALL cxios_get_axisgroup_unit(axisgroup_hdl%daddr, unit_, len(unit_))
+        CALL cxios_get_axisgroup_unit &
+      (axisgroup_hdl%daddr, unit_, len(unit_))
       ENDIF
 
       IF (PRESENT(value_)) THEN
-        CALL cxios_get_axisgroup_value(axisgroup_hdl%daddr, value_, SHAPE(value_))
+        CALL cxios_get_axisgroup_value &
+      (axisgroup_hdl%daddr, value_, SHAPE(value_))
       ENDIF
 
@@ -393,5 +431,6 @@
       LOGICAL(KIND=C_BOOL) :: value_tmp
 
-      CALL xios(get_axisgroup_handle)(axisgroup_id,axisgroup_hdl)
+      CALL xios(get_axisgroup_handle) &
+      (axisgroup_id,axisgroup_hdl)
       CALL xios(is_defined_axisgroup_attr_hdl_)   &
       ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, long_name  &
@@ -494,90 +533,108 @@
 
       IF (PRESENT(axis_ref_)) THEN
-        axis_ref__tmp = cxios_is_defined_axisgroup_axis_ref(axisgroup_hdl%daddr)
+        axis_ref__tmp = cxios_is_defined_axisgroup_axis_ref &
+      (axisgroup_hdl%daddr)
         axis_ref_ = axis_ref__tmp
       ENDIF
 
       IF (PRESENT(begin_)) THEN
-        begin__tmp = cxios_is_defined_axisgroup_begin(axisgroup_hdl%daddr)
+        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)
+        bounds__tmp = cxios_is_defined_axisgroup_bounds &
+      (axisgroup_hdl%daddr)
         bounds_ = bounds__tmp
       ENDIF
 
       IF (PRESENT(data_begin_)) THEN
-        data_begin__tmp = cxios_is_defined_axisgroup_data_begin(axisgroup_hdl%daddr)
+        data_begin__tmp = cxios_is_defined_axisgroup_data_begin &
+      (axisgroup_hdl%daddr)
         data_begin_ = data_begin__tmp
       ENDIF
 
       IF (PRESENT(data_index_)) THEN
-        data_index__tmp = cxios_is_defined_axisgroup_data_index(axisgroup_hdl%daddr)
+        data_index__tmp = cxios_is_defined_axisgroup_data_index &
+      (axisgroup_hdl%daddr)
         data_index_ = data_index__tmp
       ENDIF
 
       IF (PRESENT(data_n_)) THEN
-        data_n__tmp = cxios_is_defined_axisgroup_data_n(axisgroup_hdl%daddr)
+        data_n__tmp = cxios_is_defined_axisgroup_data_n &
+      (axisgroup_hdl%daddr)
         data_n_ = data_n__tmp
       ENDIF
 
       IF (PRESENT(group_ref_)) THEN
-        group_ref__tmp = cxios_is_defined_axisgroup_group_ref(axisgroup_hdl%daddr)
+        group_ref__tmp = cxios_is_defined_axisgroup_group_ref &
+      (axisgroup_hdl%daddr)
         group_ref_ = group_ref__tmp
       ENDIF
 
       IF (PRESENT(index_)) THEN
-        index__tmp = cxios_is_defined_axisgroup_index(axisgroup_hdl%daddr)
+        index__tmp = cxios_is_defined_axisgroup_index &
+      (axisgroup_hdl%daddr)
         index_ = index__tmp
       ENDIF
 
       IF (PRESENT(long_name_)) THEN
-        long_name__tmp = cxios_is_defined_axisgroup_long_name(axisgroup_hdl%daddr)
+        long_name__tmp = cxios_is_defined_axisgroup_long_name &
+      (axisgroup_hdl%daddr)
         long_name_ = long_name__tmp
       ENDIF
 
       IF (PRESENT(mask_)) THEN
-        mask__tmp = cxios_is_defined_axisgroup_mask(axisgroup_hdl%daddr)
+        mask__tmp = cxios_is_defined_axisgroup_mask &
+      (axisgroup_hdl%daddr)
         mask_ = mask__tmp
       ENDIF
 
       IF (PRESENT(n_)) THEN
-        n__tmp = cxios_is_defined_axisgroup_n(axisgroup_hdl%daddr)
+        n__tmp = cxios_is_defined_axisgroup_n &
+      (axisgroup_hdl%daddr)
         n_ = n__tmp
       ENDIF
 
       IF (PRESENT(n_distributed_partition_)) THEN
-        n_distributed_partition__tmp = cxios_is_defined_axisgroup_n_distributed_partition(axisgroup_hdl%daddr)
+        n_distributed_partition__tmp = cxios_is_defined_axisgroup_n_distributed_partition &
+      (axisgroup_hdl%daddr)
         n_distributed_partition_ = n_distributed_partition__tmp
       ENDIF
 
       IF (PRESENT(n_glo_)) THEN
-        n_glo__tmp = cxios_is_defined_axisgroup_n_glo(axisgroup_hdl%daddr)
+        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)
+        name__tmp = cxios_is_defined_axisgroup_name &
+      (axisgroup_hdl%daddr)
         name_ = name__tmp
       ENDIF
 
       IF (PRESENT(positive_)) THEN
-        positive__tmp = cxios_is_defined_axisgroup_positive(axisgroup_hdl%daddr)
+        positive__tmp = cxios_is_defined_axisgroup_positive &
+      (axisgroup_hdl%daddr)
         positive_ = positive__tmp
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        standard_name__tmp = cxios_is_defined_axisgroup_standard_name(axisgroup_hdl%daddr)
+        standard_name__tmp = cxios_is_defined_axisgroup_standard_name &
+      (axisgroup_hdl%daddr)
         standard_name_ = standard_name__tmp
       ENDIF
 
       IF (PRESENT(unit_)) THEN
-        unit__tmp = cxios_is_defined_axisgroup_unit(axisgroup_hdl%daddr)
+        unit__tmp = cxios_is_defined_axisgroup_unit &
+      (axisgroup_hdl%daddr)
         unit_ = unit__tmp
       ENDIF
 
       IF (PRESENT(value_)) THEN
-        value__tmp = cxios_is_defined_axisgroup_value(axisgroup_hdl%daddr)
+        value__tmp = cxios_is_defined_axisgroup_value &
+      (axisgroup_hdl%daddr)
         value_ = value__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/icalendar_wrapper_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/icalendar_wrapper_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/icalendar_wrapper_attr.F90	(revision 966)
@@ -29,5 +29,6 @@
       INTEGER  , OPTIONAL, INTENT(IN) :: year_length
 
-      CALL xios(get_calendar_wrapper_handle)(calendar_wrapper_id,calendar_wrapper_hdl)
+      CALL xios(get_calendar_wrapper_handle) &
+      (calendar_wrapper_id,calendar_wrapper_hdl)
       CALL xios(set_calendar_wrapper_attr_hdl_)   &
       ( calendar_wrapper_hdl, day_length, leap_year_drift, leap_year_drift_offset, leap_year_month  &
@@ -77,41 +78,51 @@
 
       IF (PRESENT(day_length_)) THEN
-        CALL cxios_set_calendar_wrapper_day_length(calendar_wrapper_hdl%daddr, day_length_)
+        CALL cxios_set_calendar_wrapper_day_length &
+      (calendar_wrapper_hdl%daddr, day_length_)
       ENDIF
 
       IF (PRESENT(leap_year_drift_)) THEN
-        CALL cxios_set_calendar_wrapper_leap_year_drift(calendar_wrapper_hdl%daddr, leap_year_drift_)
+        CALL cxios_set_calendar_wrapper_leap_year_drift &
+      (calendar_wrapper_hdl%daddr, leap_year_drift_)
       ENDIF
 
       IF (PRESENT(leap_year_drift_offset_)) THEN
-        CALL cxios_set_calendar_wrapper_leap_year_drift_offset(calendar_wrapper_hdl%daddr, leap_year_drift_offset_)
+        CALL cxios_set_calendar_wrapper_leap_year_drift_offset &
+      (calendar_wrapper_hdl%daddr, leap_year_drift_offset_)
       ENDIF
 
       IF (PRESENT(leap_year_month_)) THEN
-        CALL cxios_set_calendar_wrapper_leap_year_month(calendar_wrapper_hdl%daddr, leap_year_month_)
+        CALL cxios_set_calendar_wrapper_leap_year_month &
+      (calendar_wrapper_hdl%daddr, leap_year_month_)
       ENDIF
 
       IF (PRESENT(month_lengths_)) THEN
-        CALL cxios_set_calendar_wrapper_month_lengths(calendar_wrapper_hdl%daddr, month_lengths_, SHAPE(month_lengths_))
+        CALL cxios_set_calendar_wrapper_month_lengths &
+      (calendar_wrapper_hdl%daddr, month_lengths_, SHAPE(month_lengths_))
       ENDIF
 
       IF (PRESENT(start_date_)) THEN
-        CALL cxios_set_calendar_wrapper_start_date(calendar_wrapper_hdl%daddr, start_date_, len(start_date_))
+        CALL cxios_set_calendar_wrapper_start_date &
+      (calendar_wrapper_hdl%daddr, start_date_, len(start_date_))
       ENDIF
 
       IF (PRESENT(time_origin_)) THEN
-        CALL cxios_set_calendar_wrapper_time_origin(calendar_wrapper_hdl%daddr, time_origin_, len(time_origin_))
+        CALL cxios_set_calendar_wrapper_time_origin &
+      (calendar_wrapper_hdl%daddr, time_origin_, len(time_origin_))
       ENDIF
 
       IF (PRESENT(timestep_)) THEN
-        CALL cxios_set_calendar_wrapper_timestep(calendar_wrapper_hdl%daddr, timestep_)
+        CALL cxios_set_calendar_wrapper_timestep &
+      (calendar_wrapper_hdl%daddr, timestep_)
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        CALL cxios_set_calendar_wrapper_type(calendar_wrapper_hdl%daddr, type_, len(type_))
+        CALL cxios_set_calendar_wrapper_type &
+      (calendar_wrapper_hdl%daddr, type_, len(type_))
       ENDIF
 
       IF (PRESENT(year_length_)) THEN
-        CALL cxios_set_calendar_wrapper_year_length(calendar_wrapper_hdl%daddr, year_length_)
+        CALL cxios_set_calendar_wrapper_year_length &
+      (calendar_wrapper_hdl%daddr, year_length_)
       ENDIF
 
@@ -136,5 +147,6 @@
       INTEGER  , OPTIONAL, INTENT(OUT) :: year_length
 
-      CALL xios(get_calendar_wrapper_handle)(calendar_wrapper_id,calendar_wrapper_hdl)
+      CALL xios(get_calendar_wrapper_handle) &
+      (calendar_wrapper_id,calendar_wrapper_hdl)
       CALL xios(get_calendar_wrapper_attr_hdl_)   &
       ( calendar_wrapper_hdl, day_length, leap_year_drift, leap_year_drift_offset, leap_year_month  &
@@ -184,41 +196,51 @@
 
       IF (PRESENT(day_length_)) THEN
-        CALL cxios_get_calendar_wrapper_day_length(calendar_wrapper_hdl%daddr, day_length_)
+        CALL cxios_get_calendar_wrapper_day_length &
+      (calendar_wrapper_hdl%daddr, day_length_)
       ENDIF
 
       IF (PRESENT(leap_year_drift_)) THEN
-        CALL cxios_get_calendar_wrapper_leap_year_drift(calendar_wrapper_hdl%daddr, leap_year_drift_)
+        CALL cxios_get_calendar_wrapper_leap_year_drift &
+      (calendar_wrapper_hdl%daddr, leap_year_drift_)
       ENDIF
 
       IF (PRESENT(leap_year_drift_offset_)) THEN
-        CALL cxios_get_calendar_wrapper_leap_year_drift_offset(calendar_wrapper_hdl%daddr, leap_year_drift_offset_)
+        CALL cxios_get_calendar_wrapper_leap_year_drift_offset &
+      (calendar_wrapper_hdl%daddr, leap_year_drift_offset_)
       ENDIF
 
       IF (PRESENT(leap_year_month_)) THEN
-        CALL cxios_get_calendar_wrapper_leap_year_month(calendar_wrapper_hdl%daddr, leap_year_month_)
+        CALL cxios_get_calendar_wrapper_leap_year_month &
+      (calendar_wrapper_hdl%daddr, leap_year_month_)
       ENDIF
 
       IF (PRESENT(month_lengths_)) THEN
-        CALL cxios_get_calendar_wrapper_month_lengths(calendar_wrapper_hdl%daddr, month_lengths_, SHAPE(month_lengths_))
+        CALL cxios_get_calendar_wrapper_month_lengths &
+      (calendar_wrapper_hdl%daddr, month_lengths_, SHAPE(month_lengths_))
       ENDIF
 
       IF (PRESENT(start_date_)) THEN
-        CALL cxios_get_calendar_wrapper_start_date(calendar_wrapper_hdl%daddr, start_date_, len(start_date_))
+        CALL cxios_get_calendar_wrapper_start_date &
+      (calendar_wrapper_hdl%daddr, start_date_, len(start_date_))
       ENDIF
 
       IF (PRESENT(time_origin_)) THEN
-        CALL cxios_get_calendar_wrapper_time_origin(calendar_wrapper_hdl%daddr, time_origin_, len(time_origin_))
+        CALL cxios_get_calendar_wrapper_time_origin &
+      (calendar_wrapper_hdl%daddr, time_origin_, len(time_origin_))
       ENDIF
 
       IF (PRESENT(timestep_)) THEN
-        CALL cxios_get_calendar_wrapper_timestep(calendar_wrapper_hdl%daddr, timestep_)
+        CALL cxios_get_calendar_wrapper_timestep &
+      (calendar_wrapper_hdl%daddr, timestep_)
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        CALL cxios_get_calendar_wrapper_type(calendar_wrapper_hdl%daddr, type_, len(type_))
+        CALL cxios_get_calendar_wrapper_type &
+      (calendar_wrapper_hdl%daddr, type_, len(type_))
       ENDIF
 
       IF (PRESENT(year_length_)) THEN
-        CALL cxios_get_calendar_wrapper_year_length(calendar_wrapper_hdl%daddr, year_length_)
+        CALL cxios_get_calendar_wrapper_year_length &
+      (calendar_wrapper_hdl%daddr, year_length_)
       ENDIF
 
@@ -253,5 +275,6 @@
       LOGICAL(KIND=C_BOOL) :: year_length_tmp
 
-      CALL xios(get_calendar_wrapper_handle)(calendar_wrapper_id,calendar_wrapper_hdl)
+      CALL xios(get_calendar_wrapper_handle) &
+      (calendar_wrapper_id,calendar_wrapper_hdl)
       CALL xios(is_defined_calendar_wrapper_attr_hdl_)   &
       ( calendar_wrapper_hdl, day_length, leap_year_drift, leap_year_drift_offset, leap_year_month  &
@@ -321,50 +344,60 @@
 
       IF (PRESENT(day_length_)) THEN
-        day_length__tmp = cxios_is_defined_calendar_wrapper_day_length(calendar_wrapper_hdl%daddr)
+        day_length__tmp = cxios_is_defined_calendar_wrapper_day_length &
+      (calendar_wrapper_hdl%daddr)
         day_length_ = day_length__tmp
       ENDIF
 
       IF (PRESENT(leap_year_drift_)) THEN
-        leap_year_drift__tmp = cxios_is_defined_calendar_wrapper_leap_year_drift(calendar_wrapper_hdl%daddr)
+        leap_year_drift__tmp = cxios_is_defined_calendar_wrapper_leap_year_drift &
+      (calendar_wrapper_hdl%daddr)
         leap_year_drift_ = leap_year_drift__tmp
       ENDIF
 
       IF (PRESENT(leap_year_drift_offset_)) THEN
-        leap_year_drift_offset__tmp = cxios_is_defined_calendar_wrapper_leap_year_drift_offset(calendar_wrapper_hdl%daddr)
+        leap_year_drift_offset__tmp = cxios_is_defined_calendar_wrapper_leap_year_drift_offset &
+      (calendar_wrapper_hdl%daddr)
         leap_year_drift_offset_ = leap_year_drift_offset__tmp
       ENDIF
 
       IF (PRESENT(leap_year_month_)) THEN
-        leap_year_month__tmp = cxios_is_defined_calendar_wrapper_leap_year_month(calendar_wrapper_hdl%daddr)
+        leap_year_month__tmp = cxios_is_defined_calendar_wrapper_leap_year_month &
+      (calendar_wrapper_hdl%daddr)
         leap_year_month_ = leap_year_month__tmp
       ENDIF
 
       IF (PRESENT(month_lengths_)) THEN
-        month_lengths__tmp = cxios_is_defined_calendar_wrapper_month_lengths(calendar_wrapper_hdl%daddr)
+        month_lengths__tmp = cxios_is_defined_calendar_wrapper_month_lengths &
+      (calendar_wrapper_hdl%daddr)
         month_lengths_ = month_lengths__tmp
       ENDIF
 
       IF (PRESENT(start_date_)) THEN
-        start_date__tmp = cxios_is_defined_calendar_wrapper_start_date(calendar_wrapper_hdl%daddr)
+        start_date__tmp = cxios_is_defined_calendar_wrapper_start_date &
+      (calendar_wrapper_hdl%daddr)
         start_date_ = start_date__tmp
       ENDIF
 
       IF (PRESENT(time_origin_)) THEN
-        time_origin__tmp = cxios_is_defined_calendar_wrapper_time_origin(calendar_wrapper_hdl%daddr)
+        time_origin__tmp = cxios_is_defined_calendar_wrapper_time_origin &
+      (calendar_wrapper_hdl%daddr)
         time_origin_ = time_origin__tmp
       ENDIF
 
       IF (PRESENT(timestep_)) THEN
-        timestep__tmp = cxios_is_defined_calendar_wrapper_timestep(calendar_wrapper_hdl%daddr)
+        timestep__tmp = cxios_is_defined_calendar_wrapper_timestep &
+      (calendar_wrapper_hdl%daddr)
         timestep_ = timestep__tmp
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        type__tmp = cxios_is_defined_calendar_wrapper_type(calendar_wrapper_hdl%daddr)
+        type__tmp = cxios_is_defined_calendar_wrapper_type &
+      (calendar_wrapper_hdl%daddr)
         type_ = type__tmp
       ENDIF
 
       IF (PRESENT(year_length_)) THEN
-        year_length__tmp = cxios_is_defined_calendar_wrapper_year_length(calendar_wrapper_hdl%daddr)
+        year_length__tmp = cxios_is_defined_calendar_wrapper_year_length &
+      (calendar_wrapper_hdl%daddr)
         year_length_ = year_length__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/icompute_connectivity_domain_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/icompute_connectivity_domain_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/icompute_connectivity_domain_attr.F90	(revision 966)
@@ -22,5 +22,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type
 
-      CALL xios(get_compute_connectivity_domain_handle)(compute_connectivity_domain_id,compute_connectivity_domain_hdl)
+      CALL xios(get_compute_connectivity_domain_handle) &
+      (compute_connectivity_domain_id,compute_connectivity_domain_hdl)
       CALL xios(set_compute_connectivity_domain_attr_hdl_)   &
       ( compute_connectivity_domain_hdl, local_neighbor, n_neighbor, n_neighbor_max, type )
@@ -54,17 +55,21 @@
 
       IF (PRESENT(local_neighbor_)) THEN
-        CALL cxios_set_compute_connectivity_domain_local_neighbor(compute_connectivity_domain_hdl%daddr, local_neighbor_, SHAPE(local_neighbor_))
+        CALL cxios_set_compute_connectivity_domain_local_neighbor &
+      (compute_connectivity_domain_hdl%daddr, local_neighbor_, SHAPE(local_neighbor_))
       ENDIF
 
       IF (PRESENT(n_neighbor_)) THEN
-        CALL cxios_set_compute_connectivity_domain_n_neighbor(compute_connectivity_domain_hdl%daddr, n_neighbor_, SHAPE(n_neighbor_))
+        CALL cxios_set_compute_connectivity_domain_n_neighbor &
+      (compute_connectivity_domain_hdl%daddr, n_neighbor_, SHAPE(n_neighbor_))
       ENDIF
 
       IF (PRESENT(n_neighbor_max_)) THEN
-        CALL cxios_set_compute_connectivity_domain_n_neighbor_max(compute_connectivity_domain_hdl%daddr, n_neighbor_max_)
+        CALL cxios_set_compute_connectivity_domain_n_neighbor_max &
+      (compute_connectivity_domain_hdl%daddr, n_neighbor_max_)
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        CALL cxios_set_compute_connectivity_domain_type(compute_connectivity_domain_hdl%daddr, type_, len(type_))
+        CALL cxios_set_compute_connectivity_domain_type &
+      (compute_connectivity_domain_hdl%daddr, type_, len(type_))
       ENDIF
 
@@ -82,5 +87,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type
 
-      CALL xios(get_compute_connectivity_domain_handle)(compute_connectivity_domain_id,compute_connectivity_domain_hdl)
+      CALL xios(get_compute_connectivity_domain_handle) &
+      (compute_connectivity_domain_id,compute_connectivity_domain_hdl)
       CALL xios(get_compute_connectivity_domain_attr_hdl_)   &
       ( compute_connectivity_domain_hdl, local_neighbor, n_neighbor, n_neighbor_max, type )
@@ -114,17 +120,21 @@
 
       IF (PRESENT(local_neighbor_)) THEN
-        CALL cxios_get_compute_connectivity_domain_local_neighbor(compute_connectivity_domain_hdl%daddr, local_neighbor_, SHAPE(local_neighbor_))
+        CALL cxios_get_compute_connectivity_domain_local_neighbor &
+      (compute_connectivity_domain_hdl%daddr, local_neighbor_, SHAPE(local_neighbor_))
       ENDIF
 
       IF (PRESENT(n_neighbor_)) THEN
-        CALL cxios_get_compute_connectivity_domain_n_neighbor(compute_connectivity_domain_hdl%daddr, n_neighbor_, SHAPE(n_neighbor_))
+        CALL cxios_get_compute_connectivity_domain_n_neighbor &
+      (compute_connectivity_domain_hdl%daddr, n_neighbor_, SHAPE(n_neighbor_))
       ENDIF
 
       IF (PRESENT(n_neighbor_max_)) THEN
-        CALL cxios_get_compute_connectivity_domain_n_neighbor_max(compute_connectivity_domain_hdl%daddr, n_neighbor_max_)
+        CALL cxios_get_compute_connectivity_domain_n_neighbor_max &
+      (compute_connectivity_domain_hdl%daddr, n_neighbor_max_)
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        CALL cxios_get_compute_connectivity_domain_type(compute_connectivity_domain_hdl%daddr, type_, len(type_))
+        CALL cxios_get_compute_connectivity_domain_type &
+      (compute_connectivity_domain_hdl%daddr, type_, len(type_))
       ENDIF
 
@@ -146,5 +156,6 @@
       LOGICAL(KIND=C_BOOL) :: type_tmp
 
-      CALL xios(get_compute_connectivity_domain_handle)(compute_connectivity_domain_id,compute_connectivity_domain_hdl)
+      CALL xios(get_compute_connectivity_domain_handle) &
+      (compute_connectivity_domain_id,compute_connectivity_domain_hdl)
       CALL xios(is_defined_compute_connectivity_domain_attr_hdl_)   &
       ( compute_connectivity_domain_hdl, local_neighbor, n_neighbor, n_neighbor_max, type )
@@ -186,20 +197,24 @@
 
       IF (PRESENT(local_neighbor_)) THEN
-        local_neighbor__tmp = cxios_is_defined_compute_connectivity_domain_local_neighbor(compute_connectivity_domain_hdl%daddr)
+        local_neighbor__tmp = cxios_is_defined_compute_connectivity_domain_local_neighbor &
+      (compute_connectivity_domain_hdl%daddr)
         local_neighbor_ = local_neighbor__tmp
       ENDIF
 
       IF (PRESENT(n_neighbor_)) THEN
-        n_neighbor__tmp = cxios_is_defined_compute_connectivity_domain_n_neighbor(compute_connectivity_domain_hdl%daddr)
+        n_neighbor__tmp = cxios_is_defined_compute_connectivity_domain_n_neighbor &
+      (compute_connectivity_domain_hdl%daddr)
         n_neighbor_ = n_neighbor__tmp
       ENDIF
 
       IF (PRESENT(n_neighbor_max_)) THEN
-        n_neighbor_max__tmp = cxios_is_defined_compute_connectivity_domain_n_neighbor_max(compute_connectivity_domain_hdl%daddr)
+        n_neighbor_max__tmp = cxios_is_defined_compute_connectivity_domain_n_neighbor_max &
+      (compute_connectivity_domain_hdl%daddr)
         n_neighbor_max_ = n_neighbor_max__tmp
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        type__tmp = cxios_is_defined_compute_connectivity_domain_type(compute_connectivity_domain_hdl%daddr)
+        type__tmp = cxios_is_defined_compute_connectivity_domain_type &
+      (compute_connectivity_domain_hdl%daddr)
         type_ = type__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/icontext_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/icontext_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/icontext_attr.F90	(revision 966)
@@ -19,5 +19,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: output_dir
 
-      CALL xios(get_context_handle)(context_id,context_hdl)
+      CALL xios(get_context_handle) &
+      (context_id,context_hdl)
       CALL xios(set_context_attr_hdl_)   &
       ( context_hdl, output_dir )
@@ -45,5 +46,6 @@
 
       IF (PRESENT(output_dir_)) THEN
-        CALL cxios_set_context_output_dir(context_hdl%daddr, output_dir_, len(output_dir_))
+        CALL cxios_set_context_output_dir &
+      (context_hdl%daddr, output_dir_, len(output_dir_))
       ENDIF
 
@@ -58,5 +60,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: output_dir
 
-      CALL xios(get_context_handle)(context_id,context_hdl)
+      CALL xios(get_context_handle) &
+      (context_id,context_hdl)
       CALL xios(get_context_attr_hdl_)   &
       ( context_hdl, output_dir )
@@ -84,5 +87,6 @@
 
       IF (PRESENT(output_dir_)) THEN
-        CALL cxios_get_context_output_dir(context_hdl%daddr, output_dir_, len(output_dir_))
+        CALL cxios_get_context_output_dir &
+      (context_hdl%daddr, output_dir_, len(output_dir_))
       ENDIF
 
@@ -98,5 +102,6 @@
       LOGICAL(KIND=C_BOOL) :: output_dir_tmp
 
-      CALL xios(get_context_handle)(context_id,context_hdl)
+      CALL xios(get_context_handle) &
+      (context_id,context_hdl)
       CALL xios(is_defined_context_attr_hdl_)   &
       ( context_hdl, output_dir )
@@ -126,5 +131,6 @@
 
       IF (PRESENT(output_dir_)) THEN
-        output_dir__tmp = cxios_is_defined_context_output_dir(context_hdl%daddr)
+        output_dir__tmp = cxios_is_defined_context_output_dir &
+      (context_hdl%daddr)
         output_dir_ = output_dir__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/idomain_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/idomain_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/idomain_attr.F90	(revision 966)
@@ -55,5 +55,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type
 
-      CALL xios(get_domain_handle)(domain_id,domain_hdl)
+      CALL xios(get_domain_handle) &
+      (domain_id,domain_hdl)
       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  &
@@ -160,89 +161,111 @@
 
       IF (PRESENT(area_)) THEN
-        CALL cxios_set_domain_area(domain_hdl%daddr, area_, SHAPE(area_))
+        CALL cxios_set_domain_area &
+      (domain_hdl%daddr, area_, SHAPE(area_))
       ENDIF
 
       IF (PRESENT(bounds_lat_1d_)) THEN
-        CALL cxios_set_domain_bounds_lat_1d(domain_hdl%daddr, bounds_lat_1d_, SHAPE(bounds_lat_1d_))
+        CALL cxios_set_domain_bounds_lat_1d &
+      (domain_hdl%daddr, bounds_lat_1d_, SHAPE(bounds_lat_1d_))
       ENDIF
 
       IF (PRESENT(bounds_lat_2d_)) THEN
-        CALL cxios_set_domain_bounds_lat_2d(domain_hdl%daddr, bounds_lat_2d_, SHAPE(bounds_lat_2d_))
+        CALL cxios_set_domain_bounds_lat_2d &
+      (domain_hdl%daddr, bounds_lat_2d_, SHAPE(bounds_lat_2d_))
       ENDIF
 
       IF (PRESENT(bounds_lon_1d_)) THEN
-        CALL cxios_set_domain_bounds_lon_1d(domain_hdl%daddr, bounds_lon_1d_, SHAPE(bounds_lon_1d_))
+        CALL cxios_set_domain_bounds_lon_1d &
+      (domain_hdl%daddr, bounds_lon_1d_, SHAPE(bounds_lon_1d_))
       ENDIF
 
       IF (PRESENT(bounds_lon_2d_)) THEN
-        CALL cxios_set_domain_bounds_lon_2d(domain_hdl%daddr, bounds_lon_2d_, SHAPE(bounds_lon_2d_))
+        CALL cxios_set_domain_bounds_lon_2d &
+      (domain_hdl%daddr, bounds_lon_2d_, SHAPE(bounds_lon_2d_))
       ENDIF
 
       IF (PRESENT(data_dim_)) THEN
-        CALL cxios_set_domain_data_dim(domain_hdl%daddr, data_dim_)
+        CALL cxios_set_domain_data_dim &
+      (domain_hdl%daddr, data_dim_)
       ENDIF
 
       IF (PRESENT(data_i_index_)) THEN
-        CALL cxios_set_domain_data_i_index(domain_hdl%daddr, data_i_index_, SHAPE(data_i_index_))
+        CALL cxios_set_domain_data_i_index &
+      (domain_hdl%daddr, data_i_index_, SHAPE(data_i_index_))
       ENDIF
 
       IF (PRESENT(data_ibegin_)) THEN
-        CALL cxios_set_domain_data_ibegin(domain_hdl%daddr, data_ibegin_)
+        CALL cxios_set_domain_data_ibegin &
+      (domain_hdl%daddr, data_ibegin_)
       ENDIF
 
       IF (PRESENT(data_j_index_)) THEN
-        CALL cxios_set_domain_data_j_index(domain_hdl%daddr, data_j_index_, SHAPE(data_j_index_))
+        CALL cxios_set_domain_data_j_index &
+      (domain_hdl%daddr, data_j_index_, SHAPE(data_j_index_))
       ENDIF
 
       IF (PRESENT(data_jbegin_)) THEN
-        CALL cxios_set_domain_data_jbegin(domain_hdl%daddr, data_jbegin_)
+        CALL cxios_set_domain_data_jbegin &
+      (domain_hdl%daddr, data_jbegin_)
       ENDIF
 
       IF (PRESENT(data_ni_)) THEN
-        CALL cxios_set_domain_data_ni(domain_hdl%daddr, data_ni_)
+        CALL cxios_set_domain_data_ni &
+      (domain_hdl%daddr, data_ni_)
       ENDIF
 
       IF (PRESENT(data_nj_)) THEN
-        CALL cxios_set_domain_data_nj(domain_hdl%daddr, data_nj_)
+        CALL cxios_set_domain_data_nj &
+      (domain_hdl%daddr, data_nj_)
       ENDIF
 
       IF (PRESENT(domain_ref_)) THEN
-        CALL cxios_set_domain_domain_ref(domain_hdl%daddr, domain_ref_, len(domain_ref_))
+        CALL cxios_set_domain_domain_ref &
+      (domain_hdl%daddr, domain_ref_, len(domain_ref_))
       ENDIF
 
       IF (PRESENT(i_index_)) THEN
-        CALL cxios_set_domain_i_index(domain_hdl%daddr, i_index_, SHAPE(i_index_))
+        CALL cxios_set_domain_i_index &
+      (domain_hdl%daddr, i_index_, SHAPE(i_index_))
       ENDIF
 
       IF (PRESENT(ibegin_)) THEN
-        CALL cxios_set_domain_ibegin(domain_hdl%daddr, ibegin_)
+        CALL cxios_set_domain_ibegin &
+      (domain_hdl%daddr, ibegin_)
       ENDIF
 
       IF (PRESENT(j_index_)) THEN
-        CALL cxios_set_domain_j_index(domain_hdl%daddr, j_index_, SHAPE(j_index_))
+        CALL cxios_set_domain_j_index &
+      (domain_hdl%daddr, j_index_, SHAPE(j_index_))
       ENDIF
 
       IF (PRESENT(jbegin_)) THEN
-        CALL cxios_set_domain_jbegin(domain_hdl%daddr, jbegin_)
+        CALL cxios_set_domain_jbegin &
+      (domain_hdl%daddr, jbegin_)
       ENDIF
 
       IF (PRESENT(latvalue_1d_)) THEN
-        CALL cxios_set_domain_latvalue_1d(domain_hdl%daddr, latvalue_1d_, SHAPE(latvalue_1d_))
+        CALL cxios_set_domain_latvalue_1d &
+      (domain_hdl%daddr, latvalue_1d_, SHAPE(latvalue_1d_))
       ENDIF
 
       IF (PRESENT(latvalue_2d_)) THEN
-        CALL cxios_set_domain_latvalue_2d(domain_hdl%daddr, latvalue_2d_, SHAPE(latvalue_2d_))
+        CALL cxios_set_domain_latvalue_2d &
+      (domain_hdl%daddr, latvalue_2d_, SHAPE(latvalue_2d_))
       ENDIF
 
       IF (PRESENT(long_name_)) THEN
-        CALL cxios_set_domain_long_name(domain_hdl%daddr, long_name_, len(long_name_))
+        CALL cxios_set_domain_long_name &
+      (domain_hdl%daddr, long_name_, len(long_name_))
       ENDIF
 
       IF (PRESENT(lonvalue_1d_)) THEN
-        CALL cxios_set_domain_lonvalue_1d(domain_hdl%daddr, lonvalue_1d_, SHAPE(lonvalue_1d_))
+        CALL cxios_set_domain_lonvalue_1d &
+      (domain_hdl%daddr, lonvalue_1d_, SHAPE(lonvalue_1d_))
       ENDIF
 
       IF (PRESENT(lonvalue_2d_)) THEN
-        CALL cxios_set_domain_lonvalue_2d(domain_hdl%daddr, lonvalue_2d_, SHAPE(lonvalue_2d_))
+        CALL cxios_set_domain_lonvalue_2d &
+      (domain_hdl%daddr, lonvalue_2d_, SHAPE(lonvalue_2d_))
       ENDIF
 
@@ -250,5 +273,6 @@
         ALLOCATE(mask_1d__tmp(SIZE(mask_1d_,1)))
         mask_1d__tmp = mask_1d_
-        CALL cxios_set_domain_mask_1d(domain_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_))
+        CALL cxios_set_domain_mask_1d &
+      (domain_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_))
       ENDIF
 
@@ -256,37 +280,46 @@
         ALLOCATE(mask_2d__tmp(SIZE(mask_2d_,1), SIZE(mask_2d_,2)))
         mask_2d__tmp = mask_2d_
-        CALL cxios_set_domain_mask_2d(domain_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_))
+        CALL cxios_set_domain_mask_2d &
+      (domain_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_))
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_set_domain_name(domain_hdl%daddr, name_, len(name_))
+        CALL cxios_set_domain_name &
+      (domain_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(ni_)) THEN
-        CALL cxios_set_domain_ni(domain_hdl%daddr, ni_)
+        CALL cxios_set_domain_ni &
+      (domain_hdl%daddr, ni_)
       ENDIF
 
       IF (PRESENT(ni_glo_)) THEN
-        CALL cxios_set_domain_ni_glo(domain_hdl%daddr, ni_glo_)
+        CALL cxios_set_domain_ni_glo &
+      (domain_hdl%daddr, ni_glo_)
       ENDIF
 
       IF (PRESENT(nj_)) THEN
-        CALL cxios_set_domain_nj(domain_hdl%daddr, nj_)
+        CALL cxios_set_domain_nj &
+      (domain_hdl%daddr, nj_)
       ENDIF
 
       IF (PRESENT(nj_glo_)) THEN
-        CALL cxios_set_domain_nj_glo(domain_hdl%daddr, nj_glo_)
+        CALL cxios_set_domain_nj_glo &
+      (domain_hdl%daddr, nj_glo_)
       ENDIF
 
       IF (PRESENT(nvertex_)) THEN
-        CALL cxios_set_domain_nvertex(domain_hdl%daddr, nvertex_)
+        CALL cxios_set_domain_nvertex &
+      (domain_hdl%daddr, nvertex_)
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        CALL cxios_set_domain_standard_name(domain_hdl%daddr, standard_name_, len(standard_name_))
+        CALL cxios_set_domain_standard_name &
+      (domain_hdl%daddr, standard_name_, len(standard_name_))
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        CALL cxios_set_domain_type(domain_hdl%daddr, type_, len(type_))
+        CALL cxios_set_domain_type &
+      (domain_hdl%daddr, type_, len(type_))
       ENDIF
 
@@ -337,5 +370,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type
 
-      CALL xios(get_domain_handle)(domain_id,domain_hdl)
+      CALL xios(get_domain_handle) &
+      (domain_id,domain_hdl)
       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  &
@@ -442,94 +476,117 @@
 
       IF (PRESENT(area_)) THEN
-        CALL cxios_get_domain_area(domain_hdl%daddr, area_, SHAPE(area_))
+        CALL cxios_get_domain_area &
+      (domain_hdl%daddr, area_, SHAPE(area_))
       ENDIF
 
       IF (PRESENT(bounds_lat_1d_)) THEN
-        CALL cxios_get_domain_bounds_lat_1d(domain_hdl%daddr, bounds_lat_1d_, SHAPE(bounds_lat_1d_))
+        CALL cxios_get_domain_bounds_lat_1d &
+      (domain_hdl%daddr, bounds_lat_1d_, SHAPE(bounds_lat_1d_))
       ENDIF
 
       IF (PRESENT(bounds_lat_2d_)) THEN
-        CALL cxios_get_domain_bounds_lat_2d(domain_hdl%daddr, bounds_lat_2d_, SHAPE(bounds_lat_2d_))
+        CALL cxios_get_domain_bounds_lat_2d &
+      (domain_hdl%daddr, bounds_lat_2d_, SHAPE(bounds_lat_2d_))
       ENDIF
 
       IF (PRESENT(bounds_lon_1d_)) THEN
-        CALL cxios_get_domain_bounds_lon_1d(domain_hdl%daddr, bounds_lon_1d_, SHAPE(bounds_lon_1d_))
+        CALL cxios_get_domain_bounds_lon_1d &
+      (domain_hdl%daddr, bounds_lon_1d_, SHAPE(bounds_lon_1d_))
       ENDIF
 
       IF (PRESENT(bounds_lon_2d_)) THEN
-        CALL cxios_get_domain_bounds_lon_2d(domain_hdl%daddr, bounds_lon_2d_, SHAPE(bounds_lon_2d_))
+        CALL cxios_get_domain_bounds_lon_2d &
+      (domain_hdl%daddr, bounds_lon_2d_, SHAPE(bounds_lon_2d_))
       ENDIF
 
       IF (PRESENT(data_dim_)) THEN
-        CALL cxios_get_domain_data_dim(domain_hdl%daddr, data_dim_)
+        CALL cxios_get_domain_data_dim &
+      (domain_hdl%daddr, data_dim_)
       ENDIF
 
       IF (PRESENT(data_i_index_)) THEN
-        CALL cxios_get_domain_data_i_index(domain_hdl%daddr, data_i_index_, SHAPE(data_i_index_))
+        CALL cxios_get_domain_data_i_index &
+      (domain_hdl%daddr, data_i_index_, SHAPE(data_i_index_))
       ENDIF
 
       IF (PRESENT(data_ibegin_)) THEN
-        CALL cxios_get_domain_data_ibegin(domain_hdl%daddr, data_ibegin_)
+        CALL cxios_get_domain_data_ibegin &
+      (domain_hdl%daddr, data_ibegin_)
       ENDIF
 
       IF (PRESENT(data_j_index_)) THEN
-        CALL cxios_get_domain_data_j_index(domain_hdl%daddr, data_j_index_, SHAPE(data_j_index_))
+        CALL cxios_get_domain_data_j_index &
+      (domain_hdl%daddr, data_j_index_, SHAPE(data_j_index_))
       ENDIF
 
       IF (PRESENT(data_jbegin_)) THEN
-        CALL cxios_get_domain_data_jbegin(domain_hdl%daddr, data_jbegin_)
+        CALL cxios_get_domain_data_jbegin &
+      (domain_hdl%daddr, data_jbegin_)
       ENDIF
 
       IF (PRESENT(data_ni_)) THEN
-        CALL cxios_get_domain_data_ni(domain_hdl%daddr, data_ni_)
+        CALL cxios_get_domain_data_ni &
+      (domain_hdl%daddr, data_ni_)
       ENDIF
 
       IF (PRESENT(data_nj_)) THEN
-        CALL cxios_get_domain_data_nj(domain_hdl%daddr, data_nj_)
+        CALL cxios_get_domain_data_nj &
+      (domain_hdl%daddr, data_nj_)
       ENDIF
 
       IF (PRESENT(domain_ref_)) THEN
-        CALL cxios_get_domain_domain_ref(domain_hdl%daddr, domain_ref_, len(domain_ref_))
+        CALL cxios_get_domain_domain_ref &
+      (domain_hdl%daddr, domain_ref_, len(domain_ref_))
       ENDIF
 
       IF (PRESENT(i_index_)) THEN
-        CALL cxios_get_domain_i_index(domain_hdl%daddr, i_index_, SHAPE(i_index_))
+        CALL cxios_get_domain_i_index &
+      (domain_hdl%daddr, i_index_, SHAPE(i_index_))
       ENDIF
 
       IF (PRESENT(ibegin_)) THEN
-        CALL cxios_get_domain_ibegin(domain_hdl%daddr, ibegin_)
+        CALL cxios_get_domain_ibegin &
+      (domain_hdl%daddr, ibegin_)
       ENDIF
 
       IF (PRESENT(j_index_)) THEN
-        CALL cxios_get_domain_j_index(domain_hdl%daddr, j_index_, SHAPE(j_index_))
+        CALL cxios_get_domain_j_index &
+      (domain_hdl%daddr, j_index_, SHAPE(j_index_))
       ENDIF
 
       IF (PRESENT(jbegin_)) THEN
-        CALL cxios_get_domain_jbegin(domain_hdl%daddr, jbegin_)
+        CALL cxios_get_domain_jbegin &
+      (domain_hdl%daddr, jbegin_)
       ENDIF
 
       IF (PRESENT(latvalue_1d_)) THEN
-        CALL cxios_get_domain_latvalue_1d(domain_hdl%daddr, latvalue_1d_, SHAPE(latvalue_1d_))
+        CALL cxios_get_domain_latvalue_1d &
+      (domain_hdl%daddr, latvalue_1d_, SHAPE(latvalue_1d_))
       ENDIF
 
       IF (PRESENT(latvalue_2d_)) THEN
-        CALL cxios_get_domain_latvalue_2d(domain_hdl%daddr, latvalue_2d_, SHAPE(latvalue_2d_))
+        CALL cxios_get_domain_latvalue_2d &
+      (domain_hdl%daddr, latvalue_2d_, SHAPE(latvalue_2d_))
       ENDIF
 
       IF (PRESENT(long_name_)) THEN
-        CALL cxios_get_domain_long_name(domain_hdl%daddr, long_name_, len(long_name_))
+        CALL cxios_get_domain_long_name &
+      (domain_hdl%daddr, long_name_, len(long_name_))
       ENDIF
 
       IF (PRESENT(lonvalue_1d_)) THEN
-        CALL cxios_get_domain_lonvalue_1d(domain_hdl%daddr, lonvalue_1d_, SHAPE(lonvalue_1d_))
+        CALL cxios_get_domain_lonvalue_1d &
+      (domain_hdl%daddr, lonvalue_1d_, SHAPE(lonvalue_1d_))
       ENDIF
 
       IF (PRESENT(lonvalue_2d_)) THEN
-        CALL cxios_get_domain_lonvalue_2d(domain_hdl%daddr, lonvalue_2d_, SHAPE(lonvalue_2d_))
+        CALL cxios_get_domain_lonvalue_2d &
+      (domain_hdl%daddr, lonvalue_2d_, SHAPE(lonvalue_2d_))
       ENDIF
 
       IF (PRESENT(mask_1d_)) THEN
         ALLOCATE(mask_1d__tmp(SIZE(mask_1d_,1)))
-        CALL cxios_get_domain_mask_1d(domain_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_))
+        CALL cxios_get_domain_mask_1d &
+      (domain_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_))
         mask_1d_ = mask_1d__tmp
       ENDIF
@@ -537,38 +594,47 @@
       IF (PRESENT(mask_2d_)) THEN
         ALLOCATE(mask_2d__tmp(SIZE(mask_2d_,1), SIZE(mask_2d_,2)))
-        CALL cxios_get_domain_mask_2d(domain_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_))
+        CALL cxios_get_domain_mask_2d &
+      (domain_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_))
         mask_2d_ = mask_2d__tmp
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_get_domain_name(domain_hdl%daddr, name_, len(name_))
+        CALL cxios_get_domain_name &
+      (domain_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(ni_)) THEN
-        CALL cxios_get_domain_ni(domain_hdl%daddr, ni_)
+        CALL cxios_get_domain_ni &
+      (domain_hdl%daddr, ni_)
       ENDIF
 
       IF (PRESENT(ni_glo_)) THEN
-        CALL cxios_get_domain_ni_glo(domain_hdl%daddr, ni_glo_)
+        CALL cxios_get_domain_ni_glo &
+      (domain_hdl%daddr, ni_glo_)
       ENDIF
 
       IF (PRESENT(nj_)) THEN
-        CALL cxios_get_domain_nj(domain_hdl%daddr, nj_)
+        CALL cxios_get_domain_nj &
+      (domain_hdl%daddr, nj_)
       ENDIF
 
       IF (PRESENT(nj_glo_)) THEN
-        CALL cxios_get_domain_nj_glo(domain_hdl%daddr, nj_glo_)
+        CALL cxios_get_domain_nj_glo &
+      (domain_hdl%daddr, nj_glo_)
       ENDIF
 
       IF (PRESENT(nvertex_)) THEN
-        CALL cxios_get_domain_nvertex(domain_hdl%daddr, nvertex_)
+        CALL cxios_get_domain_nvertex &
+      (domain_hdl%daddr, nvertex_)
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        CALL cxios_get_domain_standard_name(domain_hdl%daddr, standard_name_, len(standard_name_))
+        CALL cxios_get_domain_standard_name &
+      (domain_hdl%daddr, standard_name_, len(standard_name_))
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        CALL cxios_get_domain_type(domain_hdl%daddr, type_, len(type_))
+        CALL cxios_get_domain_type &
+      (domain_hdl%daddr, type_, len(type_))
       ENDIF
 
@@ -649,5 +715,6 @@
       LOGICAL(KIND=C_BOOL) :: type_tmp
 
-      CALL xios(get_domain_handle)(domain_id,domain_hdl)
+      CALL xios(get_domain_handle) &
+      (domain_id,domain_hdl)
       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  &
@@ -814,160 +881,192 @@
 
       IF (PRESENT(area_)) THEN
-        area__tmp = cxios_is_defined_domain_area(domain_hdl%daddr)
+        area__tmp = cxios_is_defined_domain_area &
+      (domain_hdl%daddr)
         area_ = area__tmp
       ENDIF
 
       IF (PRESENT(bounds_lat_1d_)) THEN
-        bounds_lat_1d__tmp = cxios_is_defined_domain_bounds_lat_1d(domain_hdl%daddr)
+        bounds_lat_1d__tmp = cxios_is_defined_domain_bounds_lat_1d &
+      (domain_hdl%daddr)
         bounds_lat_1d_ = bounds_lat_1d__tmp
       ENDIF
 
       IF (PRESENT(bounds_lat_2d_)) THEN
-        bounds_lat_2d__tmp = cxios_is_defined_domain_bounds_lat_2d(domain_hdl%daddr)
+        bounds_lat_2d__tmp = cxios_is_defined_domain_bounds_lat_2d &
+      (domain_hdl%daddr)
         bounds_lat_2d_ = bounds_lat_2d__tmp
       ENDIF
 
       IF (PRESENT(bounds_lon_1d_)) THEN
-        bounds_lon_1d__tmp = cxios_is_defined_domain_bounds_lon_1d(domain_hdl%daddr)
+        bounds_lon_1d__tmp = cxios_is_defined_domain_bounds_lon_1d &
+      (domain_hdl%daddr)
         bounds_lon_1d_ = bounds_lon_1d__tmp
       ENDIF
 
       IF (PRESENT(bounds_lon_2d_)) THEN
-        bounds_lon_2d__tmp = cxios_is_defined_domain_bounds_lon_2d(domain_hdl%daddr)
+        bounds_lon_2d__tmp = cxios_is_defined_domain_bounds_lon_2d &
+      (domain_hdl%daddr)
         bounds_lon_2d_ = bounds_lon_2d__tmp
       ENDIF
 
       IF (PRESENT(data_dim_)) THEN
-        data_dim__tmp = cxios_is_defined_domain_data_dim(domain_hdl%daddr)
+        data_dim__tmp = cxios_is_defined_domain_data_dim &
+      (domain_hdl%daddr)
         data_dim_ = data_dim__tmp
       ENDIF
 
       IF (PRESENT(data_i_index_)) THEN
-        data_i_index__tmp = cxios_is_defined_domain_data_i_index(domain_hdl%daddr)
+        data_i_index__tmp = cxios_is_defined_domain_data_i_index &
+      (domain_hdl%daddr)
         data_i_index_ = data_i_index__tmp
       ENDIF
 
       IF (PRESENT(data_ibegin_)) THEN
-        data_ibegin__tmp = cxios_is_defined_domain_data_ibegin(domain_hdl%daddr)
+        data_ibegin__tmp = cxios_is_defined_domain_data_ibegin &
+      (domain_hdl%daddr)
         data_ibegin_ = data_ibegin__tmp
       ENDIF
 
       IF (PRESENT(data_j_index_)) THEN
-        data_j_index__tmp = cxios_is_defined_domain_data_j_index(domain_hdl%daddr)
+        data_j_index__tmp = cxios_is_defined_domain_data_j_index &
+      (domain_hdl%daddr)
         data_j_index_ = data_j_index__tmp
       ENDIF
 
       IF (PRESENT(data_jbegin_)) THEN
-        data_jbegin__tmp = cxios_is_defined_domain_data_jbegin(domain_hdl%daddr)
+        data_jbegin__tmp = cxios_is_defined_domain_data_jbegin &
+      (domain_hdl%daddr)
         data_jbegin_ = data_jbegin__tmp
       ENDIF
 
       IF (PRESENT(data_ni_)) THEN
-        data_ni__tmp = cxios_is_defined_domain_data_ni(domain_hdl%daddr)
+        data_ni__tmp = cxios_is_defined_domain_data_ni &
+      (domain_hdl%daddr)
         data_ni_ = data_ni__tmp
       ENDIF
 
       IF (PRESENT(data_nj_)) THEN
-        data_nj__tmp = cxios_is_defined_domain_data_nj(domain_hdl%daddr)
+        data_nj__tmp = cxios_is_defined_domain_data_nj &
+      (domain_hdl%daddr)
         data_nj_ = data_nj__tmp
       ENDIF
 
       IF (PRESENT(domain_ref_)) THEN
-        domain_ref__tmp = cxios_is_defined_domain_domain_ref(domain_hdl%daddr)
+        domain_ref__tmp = cxios_is_defined_domain_domain_ref &
+      (domain_hdl%daddr)
         domain_ref_ = domain_ref__tmp
       ENDIF
 
       IF (PRESENT(i_index_)) THEN
-        i_index__tmp = cxios_is_defined_domain_i_index(domain_hdl%daddr)
+        i_index__tmp = cxios_is_defined_domain_i_index &
+      (domain_hdl%daddr)
         i_index_ = i_index__tmp
       ENDIF
 
       IF (PRESENT(ibegin_)) THEN
-        ibegin__tmp = cxios_is_defined_domain_ibegin(domain_hdl%daddr)
+        ibegin__tmp = cxios_is_defined_domain_ibegin &
+      (domain_hdl%daddr)
         ibegin_ = ibegin__tmp
       ENDIF
 
       IF (PRESENT(j_index_)) THEN
-        j_index__tmp = cxios_is_defined_domain_j_index(domain_hdl%daddr)
+        j_index__tmp = cxios_is_defined_domain_j_index &
+      (domain_hdl%daddr)
         j_index_ = j_index__tmp
       ENDIF
 
       IF (PRESENT(jbegin_)) THEN
-        jbegin__tmp = cxios_is_defined_domain_jbegin(domain_hdl%daddr)
+        jbegin__tmp = cxios_is_defined_domain_jbegin &
+      (domain_hdl%daddr)
         jbegin_ = jbegin__tmp
       ENDIF
 
       IF (PRESENT(latvalue_1d_)) THEN
-        latvalue_1d__tmp = cxios_is_defined_domain_latvalue_1d(domain_hdl%daddr)
+        latvalue_1d__tmp = cxios_is_defined_domain_latvalue_1d &
+      (domain_hdl%daddr)
         latvalue_1d_ = latvalue_1d__tmp
       ENDIF
 
       IF (PRESENT(latvalue_2d_)) THEN
-        latvalue_2d__tmp = cxios_is_defined_domain_latvalue_2d(domain_hdl%daddr)
+        latvalue_2d__tmp = cxios_is_defined_domain_latvalue_2d &
+      (domain_hdl%daddr)
         latvalue_2d_ = latvalue_2d__tmp
       ENDIF
 
       IF (PRESENT(long_name_)) THEN
-        long_name__tmp = cxios_is_defined_domain_long_name(domain_hdl%daddr)
+        long_name__tmp = cxios_is_defined_domain_long_name &
+      (domain_hdl%daddr)
         long_name_ = long_name__tmp
       ENDIF
 
       IF (PRESENT(lonvalue_1d_)) THEN
-        lonvalue_1d__tmp = cxios_is_defined_domain_lonvalue_1d(domain_hdl%daddr)
+        lonvalue_1d__tmp = cxios_is_defined_domain_lonvalue_1d &
+      (domain_hdl%daddr)
         lonvalue_1d_ = lonvalue_1d__tmp
       ENDIF
 
       IF (PRESENT(lonvalue_2d_)) THEN
-        lonvalue_2d__tmp = cxios_is_defined_domain_lonvalue_2d(domain_hdl%daddr)
+        lonvalue_2d__tmp = cxios_is_defined_domain_lonvalue_2d &
+      (domain_hdl%daddr)
         lonvalue_2d_ = lonvalue_2d__tmp
       ENDIF
 
       IF (PRESENT(mask_1d_)) THEN
-        mask_1d__tmp = cxios_is_defined_domain_mask_1d(domain_hdl%daddr)
+        mask_1d__tmp = cxios_is_defined_domain_mask_1d &
+      (domain_hdl%daddr)
         mask_1d_ = mask_1d__tmp
       ENDIF
 
       IF (PRESENT(mask_2d_)) THEN
-        mask_2d__tmp = cxios_is_defined_domain_mask_2d(domain_hdl%daddr)
+        mask_2d__tmp = cxios_is_defined_domain_mask_2d &
+      (domain_hdl%daddr)
         mask_2d_ = mask_2d__tmp
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        name__tmp = cxios_is_defined_domain_name(domain_hdl%daddr)
+        name__tmp = cxios_is_defined_domain_name &
+      (domain_hdl%daddr)
         name_ = name__tmp
       ENDIF
 
       IF (PRESENT(ni_)) THEN
-        ni__tmp = cxios_is_defined_domain_ni(domain_hdl%daddr)
+        ni__tmp = cxios_is_defined_domain_ni &
+      (domain_hdl%daddr)
         ni_ = ni__tmp
       ENDIF
 
       IF (PRESENT(ni_glo_)) THEN
-        ni_glo__tmp = cxios_is_defined_domain_ni_glo(domain_hdl%daddr)
+        ni_glo__tmp = cxios_is_defined_domain_ni_glo &
+      (domain_hdl%daddr)
         ni_glo_ = ni_glo__tmp
       ENDIF
 
       IF (PRESENT(nj_)) THEN
-        nj__tmp = cxios_is_defined_domain_nj(domain_hdl%daddr)
+        nj__tmp = cxios_is_defined_domain_nj &
+      (domain_hdl%daddr)
         nj_ = nj__tmp
       ENDIF
 
       IF (PRESENT(nj_glo_)) THEN
-        nj_glo__tmp = cxios_is_defined_domain_nj_glo(domain_hdl%daddr)
+        nj_glo__tmp = cxios_is_defined_domain_nj_glo &
+      (domain_hdl%daddr)
         nj_glo_ = nj_glo__tmp
       ENDIF
 
       IF (PRESENT(nvertex_)) THEN
-        nvertex__tmp = cxios_is_defined_domain_nvertex(domain_hdl%daddr)
+        nvertex__tmp = cxios_is_defined_domain_nvertex &
+      (domain_hdl%daddr)
         nvertex_ = nvertex__tmp
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        standard_name__tmp = cxios_is_defined_domain_standard_name(domain_hdl%daddr)
+        standard_name__tmp = cxios_is_defined_domain_standard_name &
+      (domain_hdl%daddr)
         standard_name_ = standard_name__tmp
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        type__tmp = cxios_is_defined_domain_type(domain_hdl%daddr)
+        type__tmp = cxios_is_defined_domain_type &
+      (domain_hdl%daddr)
         type_ = type__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/idomaingroup_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/idomaingroup_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/idomaingroup_attr.F90	(revision 966)
@@ -56,5 +56,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type
 
-      CALL xios(get_domaingroup_handle)(domaingroup_id,domaingroup_hdl)
+      CALL xios(get_domaingroup_handle) &
+      (domaingroup_id,domaingroup_hdl)
       CALL xios(set_domaingroup_attr_hdl_)   &
       ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  &
@@ -163,93 +164,116 @@
 
       IF (PRESENT(area_)) THEN
-        CALL cxios_set_domaingroup_area(domaingroup_hdl%daddr, area_, SHAPE(area_))
+        CALL cxios_set_domaingroup_area &
+      (domaingroup_hdl%daddr, area_, SHAPE(area_))
       ENDIF
 
       IF (PRESENT(bounds_lat_1d_)) THEN
-        CALL cxios_set_domaingroup_bounds_lat_1d(domaingroup_hdl%daddr, bounds_lat_1d_, SHAPE(bounds_lat_1d_))
+        CALL cxios_set_domaingroup_bounds_lat_1d &
+      (domaingroup_hdl%daddr, bounds_lat_1d_, SHAPE(bounds_lat_1d_))
       ENDIF
 
       IF (PRESENT(bounds_lat_2d_)) THEN
-        CALL cxios_set_domaingroup_bounds_lat_2d(domaingroup_hdl%daddr, bounds_lat_2d_, SHAPE(bounds_lat_2d_))
+        CALL cxios_set_domaingroup_bounds_lat_2d &
+      (domaingroup_hdl%daddr, bounds_lat_2d_, SHAPE(bounds_lat_2d_))
       ENDIF
 
       IF (PRESENT(bounds_lon_1d_)) THEN
-        CALL cxios_set_domaingroup_bounds_lon_1d(domaingroup_hdl%daddr, bounds_lon_1d_, SHAPE(bounds_lon_1d_))
+        CALL cxios_set_domaingroup_bounds_lon_1d &
+      (domaingroup_hdl%daddr, bounds_lon_1d_, SHAPE(bounds_lon_1d_))
       ENDIF
 
       IF (PRESENT(bounds_lon_2d_)) THEN
-        CALL cxios_set_domaingroup_bounds_lon_2d(domaingroup_hdl%daddr, bounds_lon_2d_, SHAPE(bounds_lon_2d_))
+        CALL cxios_set_domaingroup_bounds_lon_2d &
+      (domaingroup_hdl%daddr, bounds_lon_2d_, SHAPE(bounds_lon_2d_))
       ENDIF
 
       IF (PRESENT(data_dim_)) THEN
-        CALL cxios_set_domaingroup_data_dim(domaingroup_hdl%daddr, data_dim_)
+        CALL cxios_set_domaingroup_data_dim &
+      (domaingroup_hdl%daddr, data_dim_)
       ENDIF
 
       IF (PRESENT(data_i_index_)) THEN
-        CALL cxios_set_domaingroup_data_i_index(domaingroup_hdl%daddr, data_i_index_, SHAPE(data_i_index_))
+        CALL cxios_set_domaingroup_data_i_index &
+      (domaingroup_hdl%daddr, data_i_index_, SHAPE(data_i_index_))
       ENDIF
 
       IF (PRESENT(data_ibegin_)) THEN
-        CALL cxios_set_domaingroup_data_ibegin(domaingroup_hdl%daddr, data_ibegin_)
+        CALL cxios_set_domaingroup_data_ibegin &
+      (domaingroup_hdl%daddr, data_ibegin_)
       ENDIF
 
       IF (PRESENT(data_j_index_)) THEN
-        CALL cxios_set_domaingroup_data_j_index(domaingroup_hdl%daddr, data_j_index_, SHAPE(data_j_index_))
+        CALL cxios_set_domaingroup_data_j_index &
+      (domaingroup_hdl%daddr, data_j_index_, SHAPE(data_j_index_))
       ENDIF
 
       IF (PRESENT(data_jbegin_)) THEN
-        CALL cxios_set_domaingroup_data_jbegin(domaingroup_hdl%daddr, data_jbegin_)
+        CALL cxios_set_domaingroup_data_jbegin &
+      (domaingroup_hdl%daddr, data_jbegin_)
       ENDIF
 
       IF (PRESENT(data_ni_)) THEN
-        CALL cxios_set_domaingroup_data_ni(domaingroup_hdl%daddr, data_ni_)
+        CALL cxios_set_domaingroup_data_ni &
+      (domaingroup_hdl%daddr, data_ni_)
       ENDIF
 
       IF (PRESENT(data_nj_)) THEN
-        CALL cxios_set_domaingroup_data_nj(domaingroup_hdl%daddr, data_nj_)
+        CALL cxios_set_domaingroup_data_nj &
+      (domaingroup_hdl%daddr, data_nj_)
       ENDIF
 
       IF (PRESENT(domain_ref_)) THEN
-        CALL cxios_set_domaingroup_domain_ref(domaingroup_hdl%daddr, domain_ref_, len(domain_ref_))
+        CALL cxios_set_domaingroup_domain_ref &
+      (domaingroup_hdl%daddr, domain_ref_, len(domain_ref_))
       ENDIF
 
       IF (PRESENT(group_ref_)) THEN
-        CALL cxios_set_domaingroup_group_ref(domaingroup_hdl%daddr, group_ref_, len(group_ref_))
+        CALL cxios_set_domaingroup_group_ref &
+      (domaingroup_hdl%daddr, group_ref_, len(group_ref_))
       ENDIF
 
       IF (PRESENT(i_index_)) THEN
-        CALL cxios_set_domaingroup_i_index(domaingroup_hdl%daddr, i_index_, SHAPE(i_index_))
+        CALL cxios_set_domaingroup_i_index &
+      (domaingroup_hdl%daddr, i_index_, SHAPE(i_index_))
       ENDIF
 
       IF (PRESENT(ibegin_)) THEN
-        CALL cxios_set_domaingroup_ibegin(domaingroup_hdl%daddr, ibegin_)
+        CALL cxios_set_domaingroup_ibegin &
+      (domaingroup_hdl%daddr, ibegin_)
       ENDIF
 
       IF (PRESENT(j_index_)) THEN
-        CALL cxios_set_domaingroup_j_index(domaingroup_hdl%daddr, j_index_, SHAPE(j_index_))
+        CALL cxios_set_domaingroup_j_index &
+      (domaingroup_hdl%daddr, j_index_, SHAPE(j_index_))
       ENDIF
 
       IF (PRESENT(jbegin_)) THEN
-        CALL cxios_set_domaingroup_jbegin(domaingroup_hdl%daddr, jbegin_)
+        CALL cxios_set_domaingroup_jbegin &
+      (domaingroup_hdl%daddr, jbegin_)
       ENDIF
 
       IF (PRESENT(latvalue_1d_)) THEN
-        CALL cxios_set_domaingroup_latvalue_1d(domaingroup_hdl%daddr, latvalue_1d_, SHAPE(latvalue_1d_))
+        CALL cxios_set_domaingroup_latvalue_1d &
+      (domaingroup_hdl%daddr, latvalue_1d_, SHAPE(latvalue_1d_))
       ENDIF
 
       IF (PRESENT(latvalue_2d_)) THEN
-        CALL cxios_set_domaingroup_latvalue_2d(domaingroup_hdl%daddr, latvalue_2d_, SHAPE(latvalue_2d_))
+        CALL cxios_set_domaingroup_latvalue_2d &
+      (domaingroup_hdl%daddr, latvalue_2d_, SHAPE(latvalue_2d_))
       ENDIF
 
       IF (PRESENT(long_name_)) THEN
-        CALL cxios_set_domaingroup_long_name(domaingroup_hdl%daddr, long_name_, len(long_name_))
+        CALL cxios_set_domaingroup_long_name &
+      (domaingroup_hdl%daddr, long_name_, len(long_name_))
       ENDIF
 
       IF (PRESENT(lonvalue_1d_)) THEN
-        CALL cxios_set_domaingroup_lonvalue_1d(domaingroup_hdl%daddr, lonvalue_1d_, SHAPE(lonvalue_1d_))
+        CALL cxios_set_domaingroup_lonvalue_1d &
+      (domaingroup_hdl%daddr, lonvalue_1d_, SHAPE(lonvalue_1d_))
       ENDIF
 
       IF (PRESENT(lonvalue_2d_)) THEN
-        CALL cxios_set_domaingroup_lonvalue_2d(domaingroup_hdl%daddr, lonvalue_2d_, SHAPE(lonvalue_2d_))
+        CALL cxios_set_domaingroup_lonvalue_2d &
+      (domaingroup_hdl%daddr, lonvalue_2d_, SHAPE(lonvalue_2d_))
       ENDIF
 
@@ -257,5 +281,6 @@
         ALLOCATE(mask_1d__tmp(SIZE(mask_1d_,1)))
         mask_1d__tmp = mask_1d_
-        CALL cxios_set_domaingroup_mask_1d(domaingroup_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_))
+        CALL cxios_set_domaingroup_mask_1d &
+      (domaingroup_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_))
       ENDIF
 
@@ -263,37 +288,46 @@
         ALLOCATE(mask_2d__tmp(SIZE(mask_2d_,1), SIZE(mask_2d_,2)))
         mask_2d__tmp = mask_2d_
-        CALL cxios_set_domaingroup_mask_2d(domaingroup_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_))
+        CALL cxios_set_domaingroup_mask_2d &
+      (domaingroup_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_))
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_set_domaingroup_name(domaingroup_hdl%daddr, name_, len(name_))
+        CALL cxios_set_domaingroup_name &
+      (domaingroup_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(ni_)) THEN
-        CALL cxios_set_domaingroup_ni(domaingroup_hdl%daddr, ni_)
+        CALL cxios_set_domaingroup_ni &
+      (domaingroup_hdl%daddr, ni_)
       ENDIF
 
       IF (PRESENT(ni_glo_)) THEN
-        CALL cxios_set_domaingroup_ni_glo(domaingroup_hdl%daddr, ni_glo_)
+        CALL cxios_set_domaingroup_ni_glo &
+      (domaingroup_hdl%daddr, ni_glo_)
       ENDIF
 
       IF (PRESENT(nj_)) THEN
-        CALL cxios_set_domaingroup_nj(domaingroup_hdl%daddr, nj_)
+        CALL cxios_set_domaingroup_nj &
+      (domaingroup_hdl%daddr, nj_)
       ENDIF
 
       IF (PRESENT(nj_glo_)) THEN
-        CALL cxios_set_domaingroup_nj_glo(domaingroup_hdl%daddr, nj_glo_)
+        CALL cxios_set_domaingroup_nj_glo &
+      (domaingroup_hdl%daddr, nj_glo_)
       ENDIF
 
       IF (PRESENT(nvertex_)) THEN
-        CALL cxios_set_domaingroup_nvertex(domaingroup_hdl%daddr, nvertex_)
+        CALL cxios_set_domaingroup_nvertex &
+      (domaingroup_hdl%daddr, nvertex_)
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        CALL cxios_set_domaingroup_standard_name(domaingroup_hdl%daddr, standard_name_, len(standard_name_))
+        CALL cxios_set_domaingroup_standard_name &
+      (domaingroup_hdl%daddr, standard_name_, len(standard_name_))
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        CALL cxios_set_domaingroup_type(domaingroup_hdl%daddr, type_, len(type_))
+        CALL cxios_set_domaingroup_type &
+      (domaingroup_hdl%daddr, type_, len(type_))
       ENDIF
 
@@ -345,5 +379,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type
 
-      CALL xios(get_domaingroup_handle)(domaingroup_id,domaingroup_hdl)
+      CALL xios(get_domaingroup_handle) &
+      (domaingroup_id,domaingroup_hdl)
       CALL xios(get_domaingroup_attr_hdl_)   &
       ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  &
@@ -452,98 +487,122 @@
 
       IF (PRESENT(area_)) THEN
-        CALL cxios_get_domaingroup_area(domaingroup_hdl%daddr, area_, SHAPE(area_))
+        CALL cxios_get_domaingroup_area &
+      (domaingroup_hdl%daddr, area_, SHAPE(area_))
       ENDIF
 
       IF (PRESENT(bounds_lat_1d_)) THEN
-        CALL cxios_get_domaingroup_bounds_lat_1d(domaingroup_hdl%daddr, bounds_lat_1d_, SHAPE(bounds_lat_1d_))
+        CALL cxios_get_domaingroup_bounds_lat_1d &
+      (domaingroup_hdl%daddr, bounds_lat_1d_, SHAPE(bounds_lat_1d_))
       ENDIF
 
       IF (PRESENT(bounds_lat_2d_)) THEN
-        CALL cxios_get_domaingroup_bounds_lat_2d(domaingroup_hdl%daddr, bounds_lat_2d_, SHAPE(bounds_lat_2d_))
+        CALL cxios_get_domaingroup_bounds_lat_2d &
+      (domaingroup_hdl%daddr, bounds_lat_2d_, SHAPE(bounds_lat_2d_))
       ENDIF
 
       IF (PRESENT(bounds_lon_1d_)) THEN
-        CALL cxios_get_domaingroup_bounds_lon_1d(domaingroup_hdl%daddr, bounds_lon_1d_, SHAPE(bounds_lon_1d_))
+        CALL cxios_get_domaingroup_bounds_lon_1d &
+      (domaingroup_hdl%daddr, bounds_lon_1d_, SHAPE(bounds_lon_1d_))
       ENDIF
 
       IF (PRESENT(bounds_lon_2d_)) THEN
-        CALL cxios_get_domaingroup_bounds_lon_2d(domaingroup_hdl%daddr, bounds_lon_2d_, SHAPE(bounds_lon_2d_))
+        CALL cxios_get_domaingroup_bounds_lon_2d &
+      (domaingroup_hdl%daddr, bounds_lon_2d_, SHAPE(bounds_lon_2d_))
       ENDIF
 
       IF (PRESENT(data_dim_)) THEN
-        CALL cxios_get_domaingroup_data_dim(domaingroup_hdl%daddr, data_dim_)
+        CALL cxios_get_domaingroup_data_dim &
+      (domaingroup_hdl%daddr, data_dim_)
       ENDIF
 
       IF (PRESENT(data_i_index_)) THEN
-        CALL cxios_get_domaingroup_data_i_index(domaingroup_hdl%daddr, data_i_index_, SHAPE(data_i_index_))
+        CALL cxios_get_domaingroup_data_i_index &
+      (domaingroup_hdl%daddr, data_i_index_, SHAPE(data_i_index_))
       ENDIF
 
       IF (PRESENT(data_ibegin_)) THEN
-        CALL cxios_get_domaingroup_data_ibegin(domaingroup_hdl%daddr, data_ibegin_)
+        CALL cxios_get_domaingroup_data_ibegin &
+      (domaingroup_hdl%daddr, data_ibegin_)
       ENDIF
 
       IF (PRESENT(data_j_index_)) THEN
-        CALL cxios_get_domaingroup_data_j_index(domaingroup_hdl%daddr, data_j_index_, SHAPE(data_j_index_))
+        CALL cxios_get_domaingroup_data_j_index &
+      (domaingroup_hdl%daddr, data_j_index_, SHAPE(data_j_index_))
       ENDIF
 
       IF (PRESENT(data_jbegin_)) THEN
-        CALL cxios_get_domaingroup_data_jbegin(domaingroup_hdl%daddr, data_jbegin_)
+        CALL cxios_get_domaingroup_data_jbegin &
+      (domaingroup_hdl%daddr, data_jbegin_)
       ENDIF
 
       IF (PRESENT(data_ni_)) THEN
-        CALL cxios_get_domaingroup_data_ni(domaingroup_hdl%daddr, data_ni_)
+        CALL cxios_get_domaingroup_data_ni &
+      (domaingroup_hdl%daddr, data_ni_)
       ENDIF
 
       IF (PRESENT(data_nj_)) THEN
-        CALL cxios_get_domaingroup_data_nj(domaingroup_hdl%daddr, data_nj_)
+        CALL cxios_get_domaingroup_data_nj &
+      (domaingroup_hdl%daddr, data_nj_)
       ENDIF
 
       IF (PRESENT(domain_ref_)) THEN
-        CALL cxios_get_domaingroup_domain_ref(domaingroup_hdl%daddr, domain_ref_, len(domain_ref_))
+        CALL cxios_get_domaingroup_domain_ref &
+      (domaingroup_hdl%daddr, domain_ref_, len(domain_ref_))
       ENDIF
 
       IF (PRESENT(group_ref_)) THEN
-        CALL cxios_get_domaingroup_group_ref(domaingroup_hdl%daddr, group_ref_, len(group_ref_))
+        CALL cxios_get_domaingroup_group_ref &
+      (domaingroup_hdl%daddr, group_ref_, len(group_ref_))
       ENDIF
 
       IF (PRESENT(i_index_)) THEN
-        CALL cxios_get_domaingroup_i_index(domaingroup_hdl%daddr, i_index_, SHAPE(i_index_))
+        CALL cxios_get_domaingroup_i_index &
+      (domaingroup_hdl%daddr, i_index_, SHAPE(i_index_))
       ENDIF
 
       IF (PRESENT(ibegin_)) THEN
-        CALL cxios_get_domaingroup_ibegin(domaingroup_hdl%daddr, ibegin_)
+        CALL cxios_get_domaingroup_ibegin &
+      (domaingroup_hdl%daddr, ibegin_)
       ENDIF
 
       IF (PRESENT(j_index_)) THEN
-        CALL cxios_get_domaingroup_j_index(domaingroup_hdl%daddr, j_index_, SHAPE(j_index_))
+        CALL cxios_get_domaingroup_j_index &
+      (domaingroup_hdl%daddr, j_index_, SHAPE(j_index_))
       ENDIF
 
       IF (PRESENT(jbegin_)) THEN
-        CALL cxios_get_domaingroup_jbegin(domaingroup_hdl%daddr, jbegin_)
+        CALL cxios_get_domaingroup_jbegin &
+      (domaingroup_hdl%daddr, jbegin_)
       ENDIF
 
       IF (PRESENT(latvalue_1d_)) THEN
-        CALL cxios_get_domaingroup_latvalue_1d(domaingroup_hdl%daddr, latvalue_1d_, SHAPE(latvalue_1d_))
+        CALL cxios_get_domaingroup_latvalue_1d &
+      (domaingroup_hdl%daddr, latvalue_1d_, SHAPE(latvalue_1d_))
       ENDIF
 
       IF (PRESENT(latvalue_2d_)) THEN
-        CALL cxios_get_domaingroup_latvalue_2d(domaingroup_hdl%daddr, latvalue_2d_, SHAPE(latvalue_2d_))
+        CALL cxios_get_domaingroup_latvalue_2d &
+      (domaingroup_hdl%daddr, latvalue_2d_, SHAPE(latvalue_2d_))
       ENDIF
 
       IF (PRESENT(long_name_)) THEN
-        CALL cxios_get_domaingroup_long_name(domaingroup_hdl%daddr, long_name_, len(long_name_))
+        CALL cxios_get_domaingroup_long_name &
+      (domaingroup_hdl%daddr, long_name_, len(long_name_))
       ENDIF
 
       IF (PRESENT(lonvalue_1d_)) THEN
-        CALL cxios_get_domaingroup_lonvalue_1d(domaingroup_hdl%daddr, lonvalue_1d_, SHAPE(lonvalue_1d_))
+        CALL cxios_get_domaingroup_lonvalue_1d &
+      (domaingroup_hdl%daddr, lonvalue_1d_, SHAPE(lonvalue_1d_))
       ENDIF
 
       IF (PRESENT(lonvalue_2d_)) THEN
-        CALL cxios_get_domaingroup_lonvalue_2d(domaingroup_hdl%daddr, lonvalue_2d_, SHAPE(lonvalue_2d_))
+        CALL cxios_get_domaingroup_lonvalue_2d &
+      (domaingroup_hdl%daddr, lonvalue_2d_, SHAPE(lonvalue_2d_))
       ENDIF
 
       IF (PRESENT(mask_1d_)) THEN
         ALLOCATE(mask_1d__tmp(SIZE(mask_1d_,1)))
-        CALL cxios_get_domaingroup_mask_1d(domaingroup_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_))
+        CALL cxios_get_domaingroup_mask_1d &
+      (domaingroup_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_))
         mask_1d_ = mask_1d__tmp
       ENDIF
@@ -551,38 +610,47 @@
       IF (PRESENT(mask_2d_)) THEN
         ALLOCATE(mask_2d__tmp(SIZE(mask_2d_,1), SIZE(mask_2d_,2)))
-        CALL cxios_get_domaingroup_mask_2d(domaingroup_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_))
+        CALL cxios_get_domaingroup_mask_2d &
+      (domaingroup_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_))
         mask_2d_ = mask_2d__tmp
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_get_domaingroup_name(domaingroup_hdl%daddr, name_, len(name_))
+        CALL cxios_get_domaingroup_name &
+      (domaingroup_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(ni_)) THEN
-        CALL cxios_get_domaingroup_ni(domaingroup_hdl%daddr, ni_)
+        CALL cxios_get_domaingroup_ni &
+      (domaingroup_hdl%daddr, ni_)
       ENDIF
 
       IF (PRESENT(ni_glo_)) THEN
-        CALL cxios_get_domaingroup_ni_glo(domaingroup_hdl%daddr, ni_glo_)
+        CALL cxios_get_domaingroup_ni_glo &
+      (domaingroup_hdl%daddr, ni_glo_)
       ENDIF
 
       IF (PRESENT(nj_)) THEN
-        CALL cxios_get_domaingroup_nj(domaingroup_hdl%daddr, nj_)
+        CALL cxios_get_domaingroup_nj &
+      (domaingroup_hdl%daddr, nj_)
       ENDIF
 
       IF (PRESENT(nj_glo_)) THEN
-        CALL cxios_get_domaingroup_nj_glo(domaingroup_hdl%daddr, nj_glo_)
+        CALL cxios_get_domaingroup_nj_glo &
+      (domaingroup_hdl%daddr, nj_glo_)
       ENDIF
 
       IF (PRESENT(nvertex_)) THEN
-        CALL cxios_get_domaingroup_nvertex(domaingroup_hdl%daddr, nvertex_)
+        CALL cxios_get_domaingroup_nvertex &
+      (domaingroup_hdl%daddr, nvertex_)
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        CALL cxios_get_domaingroup_standard_name(domaingroup_hdl%daddr, standard_name_, len(standard_name_))
+        CALL cxios_get_domaingroup_standard_name &
+      (domaingroup_hdl%daddr, standard_name_, len(standard_name_))
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        CALL cxios_get_domaingroup_type(domaingroup_hdl%daddr, type_, len(type_))
+        CALL cxios_get_domaingroup_type &
+      (domaingroup_hdl%daddr, type_, len(type_))
       ENDIF
 
@@ -665,5 +733,6 @@
       LOGICAL(KIND=C_BOOL) :: type_tmp
 
-      CALL xios(get_domaingroup_handle)(domaingroup_id,domaingroup_hdl)
+      CALL xios(get_domaingroup_handle) &
+      (domaingroup_id,domaingroup_hdl)
       CALL xios(is_defined_domaingroup_attr_hdl_)   &
       ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  &
@@ -834,165 +903,198 @@
 
       IF (PRESENT(area_)) THEN
-        area__tmp = cxios_is_defined_domaingroup_area(domaingroup_hdl%daddr)
+        area__tmp = cxios_is_defined_domaingroup_area &
+      (domaingroup_hdl%daddr)
         area_ = area__tmp
       ENDIF
 
       IF (PRESENT(bounds_lat_1d_)) THEN
-        bounds_lat_1d__tmp = cxios_is_defined_domaingroup_bounds_lat_1d(domaingroup_hdl%daddr)
+        bounds_lat_1d__tmp = cxios_is_defined_domaingroup_bounds_lat_1d &
+      (domaingroup_hdl%daddr)
         bounds_lat_1d_ = bounds_lat_1d__tmp
       ENDIF
 
       IF (PRESENT(bounds_lat_2d_)) THEN
-        bounds_lat_2d__tmp = cxios_is_defined_domaingroup_bounds_lat_2d(domaingroup_hdl%daddr)
+        bounds_lat_2d__tmp = cxios_is_defined_domaingroup_bounds_lat_2d &
+      (domaingroup_hdl%daddr)
         bounds_lat_2d_ = bounds_lat_2d__tmp
       ENDIF
 
       IF (PRESENT(bounds_lon_1d_)) THEN
-        bounds_lon_1d__tmp = cxios_is_defined_domaingroup_bounds_lon_1d(domaingroup_hdl%daddr)
+        bounds_lon_1d__tmp = cxios_is_defined_domaingroup_bounds_lon_1d &
+      (domaingroup_hdl%daddr)
         bounds_lon_1d_ = bounds_lon_1d__tmp
       ENDIF
 
       IF (PRESENT(bounds_lon_2d_)) THEN
-        bounds_lon_2d__tmp = cxios_is_defined_domaingroup_bounds_lon_2d(domaingroup_hdl%daddr)
+        bounds_lon_2d__tmp = cxios_is_defined_domaingroup_bounds_lon_2d &
+      (domaingroup_hdl%daddr)
         bounds_lon_2d_ = bounds_lon_2d__tmp
       ENDIF
 
       IF (PRESENT(data_dim_)) THEN
-        data_dim__tmp = cxios_is_defined_domaingroup_data_dim(domaingroup_hdl%daddr)
+        data_dim__tmp = cxios_is_defined_domaingroup_data_dim &
+      (domaingroup_hdl%daddr)
         data_dim_ = data_dim__tmp
       ENDIF
 
       IF (PRESENT(data_i_index_)) THEN
-        data_i_index__tmp = cxios_is_defined_domaingroup_data_i_index(domaingroup_hdl%daddr)
+        data_i_index__tmp = cxios_is_defined_domaingroup_data_i_index &
+      (domaingroup_hdl%daddr)
         data_i_index_ = data_i_index__tmp
       ENDIF
 
       IF (PRESENT(data_ibegin_)) THEN
-        data_ibegin__tmp = cxios_is_defined_domaingroup_data_ibegin(domaingroup_hdl%daddr)
+        data_ibegin__tmp = cxios_is_defined_domaingroup_data_ibegin &
+      (domaingroup_hdl%daddr)
         data_ibegin_ = data_ibegin__tmp
       ENDIF
 
       IF (PRESENT(data_j_index_)) THEN
-        data_j_index__tmp = cxios_is_defined_domaingroup_data_j_index(domaingroup_hdl%daddr)
+        data_j_index__tmp = cxios_is_defined_domaingroup_data_j_index &
+      (domaingroup_hdl%daddr)
         data_j_index_ = data_j_index__tmp
       ENDIF
 
       IF (PRESENT(data_jbegin_)) THEN
-        data_jbegin__tmp = cxios_is_defined_domaingroup_data_jbegin(domaingroup_hdl%daddr)
+        data_jbegin__tmp = cxios_is_defined_domaingroup_data_jbegin &
+      (domaingroup_hdl%daddr)
         data_jbegin_ = data_jbegin__tmp
       ENDIF
 
       IF (PRESENT(data_ni_)) THEN
-        data_ni__tmp = cxios_is_defined_domaingroup_data_ni(domaingroup_hdl%daddr)
+        data_ni__tmp = cxios_is_defined_domaingroup_data_ni &
+      (domaingroup_hdl%daddr)
         data_ni_ = data_ni__tmp
       ENDIF
 
       IF (PRESENT(data_nj_)) THEN
-        data_nj__tmp = cxios_is_defined_domaingroup_data_nj(domaingroup_hdl%daddr)
+        data_nj__tmp = cxios_is_defined_domaingroup_data_nj &
+      (domaingroup_hdl%daddr)
         data_nj_ = data_nj__tmp
       ENDIF
 
       IF (PRESENT(domain_ref_)) THEN
-        domain_ref__tmp = cxios_is_defined_domaingroup_domain_ref(domaingroup_hdl%daddr)
+        domain_ref__tmp = cxios_is_defined_domaingroup_domain_ref &
+      (domaingroup_hdl%daddr)
         domain_ref_ = domain_ref__tmp
       ENDIF
 
       IF (PRESENT(group_ref_)) THEN
-        group_ref__tmp = cxios_is_defined_domaingroup_group_ref(domaingroup_hdl%daddr)
+        group_ref__tmp = cxios_is_defined_domaingroup_group_ref &
+      (domaingroup_hdl%daddr)
         group_ref_ = group_ref__tmp
       ENDIF
 
       IF (PRESENT(i_index_)) THEN
-        i_index__tmp = cxios_is_defined_domaingroup_i_index(domaingroup_hdl%daddr)
+        i_index__tmp = cxios_is_defined_domaingroup_i_index &
+      (domaingroup_hdl%daddr)
         i_index_ = i_index__tmp
       ENDIF
 
       IF (PRESENT(ibegin_)) THEN
-        ibegin__tmp = cxios_is_defined_domaingroup_ibegin(domaingroup_hdl%daddr)
+        ibegin__tmp = cxios_is_defined_domaingroup_ibegin &
+      (domaingroup_hdl%daddr)
         ibegin_ = ibegin__tmp
       ENDIF
 
       IF (PRESENT(j_index_)) THEN
-        j_index__tmp = cxios_is_defined_domaingroup_j_index(domaingroup_hdl%daddr)
+        j_index__tmp = cxios_is_defined_domaingroup_j_index &
+      (domaingroup_hdl%daddr)
         j_index_ = j_index__tmp
       ENDIF
 
       IF (PRESENT(jbegin_)) THEN
-        jbegin__tmp = cxios_is_defined_domaingroup_jbegin(domaingroup_hdl%daddr)
+        jbegin__tmp = cxios_is_defined_domaingroup_jbegin &
+      (domaingroup_hdl%daddr)
         jbegin_ = jbegin__tmp
       ENDIF
 
       IF (PRESENT(latvalue_1d_)) THEN
-        latvalue_1d__tmp = cxios_is_defined_domaingroup_latvalue_1d(domaingroup_hdl%daddr)
+        latvalue_1d__tmp = cxios_is_defined_domaingroup_latvalue_1d &
+      (domaingroup_hdl%daddr)
         latvalue_1d_ = latvalue_1d__tmp
       ENDIF
 
       IF (PRESENT(latvalue_2d_)) THEN
-        latvalue_2d__tmp = cxios_is_defined_domaingroup_latvalue_2d(domaingroup_hdl%daddr)
+        latvalue_2d__tmp = cxios_is_defined_domaingroup_latvalue_2d &
+      (domaingroup_hdl%daddr)
         latvalue_2d_ = latvalue_2d__tmp
       ENDIF
 
       IF (PRESENT(long_name_)) THEN
-        long_name__tmp = cxios_is_defined_domaingroup_long_name(domaingroup_hdl%daddr)
+        long_name__tmp = cxios_is_defined_domaingroup_long_name &
+      (domaingroup_hdl%daddr)
         long_name_ = long_name__tmp
       ENDIF
 
       IF (PRESENT(lonvalue_1d_)) THEN
-        lonvalue_1d__tmp = cxios_is_defined_domaingroup_lonvalue_1d(domaingroup_hdl%daddr)
+        lonvalue_1d__tmp = cxios_is_defined_domaingroup_lonvalue_1d &
+      (domaingroup_hdl%daddr)
         lonvalue_1d_ = lonvalue_1d__tmp
       ENDIF
 
       IF (PRESENT(lonvalue_2d_)) THEN
-        lonvalue_2d__tmp = cxios_is_defined_domaingroup_lonvalue_2d(domaingroup_hdl%daddr)
+        lonvalue_2d__tmp = cxios_is_defined_domaingroup_lonvalue_2d &
+      (domaingroup_hdl%daddr)
         lonvalue_2d_ = lonvalue_2d__tmp
       ENDIF
 
       IF (PRESENT(mask_1d_)) THEN
-        mask_1d__tmp = cxios_is_defined_domaingroup_mask_1d(domaingroup_hdl%daddr)
+        mask_1d__tmp = cxios_is_defined_domaingroup_mask_1d &
+      (domaingroup_hdl%daddr)
         mask_1d_ = mask_1d__tmp
       ENDIF
 
       IF (PRESENT(mask_2d_)) THEN
-        mask_2d__tmp = cxios_is_defined_domaingroup_mask_2d(domaingroup_hdl%daddr)
+        mask_2d__tmp = cxios_is_defined_domaingroup_mask_2d &
+      (domaingroup_hdl%daddr)
         mask_2d_ = mask_2d__tmp
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        name__tmp = cxios_is_defined_domaingroup_name(domaingroup_hdl%daddr)
+        name__tmp = cxios_is_defined_domaingroup_name &
+      (domaingroup_hdl%daddr)
         name_ = name__tmp
       ENDIF
 
       IF (PRESENT(ni_)) THEN
-        ni__tmp = cxios_is_defined_domaingroup_ni(domaingroup_hdl%daddr)
+        ni__tmp = cxios_is_defined_domaingroup_ni &
+      (domaingroup_hdl%daddr)
         ni_ = ni__tmp
       ENDIF
 
       IF (PRESENT(ni_glo_)) THEN
-        ni_glo__tmp = cxios_is_defined_domaingroup_ni_glo(domaingroup_hdl%daddr)
+        ni_glo__tmp = cxios_is_defined_domaingroup_ni_glo &
+      (domaingroup_hdl%daddr)
         ni_glo_ = ni_glo__tmp
       ENDIF
 
       IF (PRESENT(nj_)) THEN
-        nj__tmp = cxios_is_defined_domaingroup_nj(domaingroup_hdl%daddr)
+        nj__tmp = cxios_is_defined_domaingroup_nj &
+      (domaingroup_hdl%daddr)
         nj_ = nj__tmp
       ENDIF
 
       IF (PRESENT(nj_glo_)) THEN
-        nj_glo__tmp = cxios_is_defined_domaingroup_nj_glo(domaingroup_hdl%daddr)
+        nj_glo__tmp = cxios_is_defined_domaingroup_nj_glo &
+      (domaingroup_hdl%daddr)
         nj_glo_ = nj_glo__tmp
       ENDIF
 
       IF (PRESENT(nvertex_)) THEN
-        nvertex__tmp = cxios_is_defined_domaingroup_nvertex(domaingroup_hdl%daddr)
+        nvertex__tmp = cxios_is_defined_domaingroup_nvertex &
+      (domaingroup_hdl%daddr)
         nvertex_ = nvertex__tmp
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        standard_name__tmp = cxios_is_defined_domaingroup_standard_name(domaingroup_hdl%daddr)
+        standard_name__tmp = cxios_is_defined_domaingroup_standard_name &
+      (domaingroup_hdl%daddr)
         standard_name_ = standard_name__tmp
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        type__tmp = cxios_is_defined_domaingroup_type(domaingroup_hdl%daddr)
+        type__tmp = cxios_is_defined_domaingroup_type &
+      (domaingroup_hdl%daddr)
         type_ = type__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/ifield_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/ifield_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/ifield_attr.F90	(revision 966)
@@ -53,5 +53,6 @@
       REAL (KIND=8) , OPTIONAL, INTENT(IN) :: valid_min
 
-      CALL xios(get_field_handle)(field_id,field_hdl)
+      CALL xios(get_field_handle) &
+      (field_id,field_hdl)
       CALL xios(set_field_attr_hdl_)   &
       ( field_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value, domain_ref  &
@@ -153,114 +154,141 @@
 
       IF (PRESENT(add_offset_)) THEN
-        CALL cxios_set_field_add_offset(field_hdl%daddr, add_offset_)
+        CALL cxios_set_field_add_offset &
+      (field_hdl%daddr, add_offset_)
       ENDIF
 
       IF (PRESENT(axis_ref_)) THEN
-        CALL cxios_set_field_axis_ref(field_hdl%daddr, axis_ref_, len(axis_ref_))
+        CALL cxios_set_field_axis_ref &
+      (field_hdl%daddr, axis_ref_, len(axis_ref_))
       ENDIF
 
       IF (PRESENT(compression_level_)) THEN
-        CALL cxios_set_field_compression_level(field_hdl%daddr, compression_level_)
+        CALL cxios_set_field_compression_level &
+      (field_hdl%daddr, compression_level_)
       ENDIF
 
       IF (PRESENT(default_value_)) THEN
-        CALL cxios_set_field_default_value(field_hdl%daddr, default_value_)
+        CALL cxios_set_field_default_value &
+      (field_hdl%daddr, default_value_)
       ENDIF
 
       IF (PRESENT(detect_missing_value_)) THEN
         detect_missing_value__tmp = detect_missing_value_
-        CALL cxios_set_field_detect_missing_value(field_hdl%daddr, detect_missing_value__tmp)
+        CALL cxios_set_field_detect_missing_value &
+      (field_hdl%daddr, detect_missing_value__tmp)
       ENDIF
 
       IF (PRESENT(domain_ref_)) THEN
-        CALL cxios_set_field_domain_ref(field_hdl%daddr, domain_ref_, len(domain_ref_))
+        CALL cxios_set_field_domain_ref &
+      (field_hdl%daddr, domain_ref_, len(domain_ref_))
       ENDIF
 
       IF (PRESENT(enabled_)) THEN
         enabled__tmp = enabled_
-        CALL cxios_set_field_enabled(field_hdl%daddr, enabled__tmp)
+        CALL cxios_set_field_enabled &
+      (field_hdl%daddr, enabled__tmp)
       ENDIF
 
       IF (PRESENT(field_ref_)) THEN
-        CALL cxios_set_field_field_ref(field_hdl%daddr, field_ref_, len(field_ref_))
+        CALL cxios_set_field_field_ref &
+      (field_hdl%daddr, field_ref_, len(field_ref_))
       ENDIF
 
       IF (PRESENT(freq_offset_)) THEN
-        CALL cxios_set_field_freq_offset(field_hdl%daddr, freq_offset_)
+        CALL cxios_set_field_freq_offset &
+      (field_hdl%daddr, freq_offset_)
       ENDIF
 
       IF (PRESENT(freq_op_)) THEN
-        CALL cxios_set_field_freq_op(field_hdl%daddr, freq_op_)
+        CALL cxios_set_field_freq_op &
+      (field_hdl%daddr, freq_op_)
       ENDIF
 
       IF (PRESENT(grid_path_)) THEN
-        CALL cxios_set_field_grid_path(field_hdl%daddr, grid_path_, len(grid_path_))
+        CALL cxios_set_field_grid_path &
+      (field_hdl%daddr, grid_path_, len(grid_path_))
       ENDIF
 
       IF (PRESENT(grid_ref_)) THEN
-        CALL cxios_set_field_grid_ref(field_hdl%daddr, grid_ref_, len(grid_ref_))
+        CALL cxios_set_field_grid_ref &
+      (field_hdl%daddr, grid_ref_, len(grid_ref_))
       ENDIF
 
       IF (PRESENT(indexed_output_)) THEN
         indexed_output__tmp = indexed_output_
-        CALL cxios_set_field_indexed_output(field_hdl%daddr, indexed_output__tmp)
+        CALL cxios_set_field_indexed_output &
+      (field_hdl%daddr, indexed_output__tmp)
       ENDIF
 
       IF (PRESENT(level_)) THEN
-        CALL cxios_set_field_level(field_hdl%daddr, level_)
+        CALL cxios_set_field_level &
+      (field_hdl%daddr, level_)
       ENDIF
 
       IF (PRESENT(long_name_)) THEN
-        CALL cxios_set_field_long_name(field_hdl%daddr, long_name_, len(long_name_))
+        CALL cxios_set_field_long_name &
+      (field_hdl%daddr, long_name_, len(long_name_))
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_set_field_name(field_hdl%daddr, name_, len(name_))
+        CALL cxios_set_field_name &
+      (field_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(operation_)) THEN
-        CALL cxios_set_field_operation(field_hdl%daddr, operation_, len(operation_))
+        CALL cxios_set_field_operation &
+      (field_hdl%daddr, operation_, len(operation_))
       ENDIF
 
       IF (PRESENT(prec_)) THEN
-        CALL cxios_set_field_prec(field_hdl%daddr, prec_)
+        CALL cxios_set_field_prec &
+      (field_hdl%daddr, prec_)
       ENDIF
 
       IF (PRESENT(read_access_)) THEN
         read_access__tmp = read_access_
-        CALL cxios_set_field_read_access(field_hdl%daddr, read_access__tmp)
+        CALL cxios_set_field_read_access &
+      (field_hdl%daddr, read_access__tmp)
       ENDIF
 
       IF (PRESENT(scalar_ref_)) THEN
-        CALL cxios_set_field_scalar_ref(field_hdl%daddr, scalar_ref_, len(scalar_ref_))
+        CALL cxios_set_field_scalar_ref &
+      (field_hdl%daddr, scalar_ref_, len(scalar_ref_))
       ENDIF
 
       IF (PRESENT(scale_factor_)) THEN
-        CALL cxios_set_field_scale_factor(field_hdl%daddr, scale_factor_)
+        CALL cxios_set_field_scale_factor &
+      (field_hdl%daddr, scale_factor_)
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        CALL cxios_set_field_standard_name(field_hdl%daddr, standard_name_, len(standard_name_))
+        CALL cxios_set_field_standard_name &
+      (field_hdl%daddr, standard_name_, len(standard_name_))
       ENDIF
 
       IF (PRESENT(ts_enabled_)) THEN
         ts_enabled__tmp = ts_enabled_
-        CALL cxios_set_field_ts_enabled(field_hdl%daddr, ts_enabled__tmp)
+        CALL cxios_set_field_ts_enabled &
+      (field_hdl%daddr, ts_enabled__tmp)
       ENDIF
 
       IF (PRESENT(ts_split_freq_)) THEN
-        CALL cxios_set_field_ts_split_freq(field_hdl%daddr, ts_split_freq_)
+        CALL cxios_set_field_ts_split_freq &
+      (field_hdl%daddr, ts_split_freq_)
       ENDIF
 
       IF (PRESENT(unit_)) THEN
-        CALL cxios_set_field_unit(field_hdl%daddr, unit_, len(unit_))
+        CALL cxios_set_field_unit &
+      (field_hdl%daddr, unit_, len(unit_))
       ENDIF
 
       IF (PRESENT(valid_max_)) THEN
-        CALL cxios_set_field_valid_max(field_hdl%daddr, valid_max_)
+        CALL cxios_set_field_valid_max &
+      (field_hdl%daddr, valid_max_)
       ENDIF
 
       IF (PRESENT(valid_min_)) THEN
-        CALL cxios_set_field_valid_min(field_hdl%daddr, valid_min_)
+        CALL cxios_set_field_valid_min &
+      (field_hdl%daddr, valid_min_)
       ENDIF
 
@@ -309,5 +337,6 @@
       REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: valid_min
 
-      CALL xios(get_field_handle)(field_id,field_hdl)
+      CALL xios(get_field_handle) &
+      (field_id,field_hdl)
       CALL xios(get_field_attr_hdl_)   &
       ( field_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value, domain_ref  &
@@ -409,114 +438,141 @@
 
       IF (PRESENT(add_offset_)) THEN
-        CALL cxios_get_field_add_offset(field_hdl%daddr, add_offset_)
+        CALL cxios_get_field_add_offset &
+      (field_hdl%daddr, add_offset_)
       ENDIF
 
       IF (PRESENT(axis_ref_)) THEN
-        CALL cxios_get_field_axis_ref(field_hdl%daddr, axis_ref_, len(axis_ref_))
+        CALL cxios_get_field_axis_ref &
+      (field_hdl%daddr, axis_ref_, len(axis_ref_))
       ENDIF
 
       IF (PRESENT(compression_level_)) THEN
-        CALL cxios_get_field_compression_level(field_hdl%daddr, compression_level_)
+        CALL cxios_get_field_compression_level &
+      (field_hdl%daddr, compression_level_)
       ENDIF
 
       IF (PRESENT(default_value_)) THEN
-        CALL cxios_get_field_default_value(field_hdl%daddr, default_value_)
+        CALL cxios_get_field_default_value &
+      (field_hdl%daddr, default_value_)
       ENDIF
 
       IF (PRESENT(detect_missing_value_)) THEN
-        CALL cxios_get_field_detect_missing_value(field_hdl%daddr, detect_missing_value__tmp)
+        CALL cxios_get_field_detect_missing_value &
+      (field_hdl%daddr, detect_missing_value__tmp)
         detect_missing_value_ = detect_missing_value__tmp
       ENDIF
 
       IF (PRESENT(domain_ref_)) THEN
-        CALL cxios_get_field_domain_ref(field_hdl%daddr, domain_ref_, len(domain_ref_))
+        CALL cxios_get_field_domain_ref &
+      (field_hdl%daddr, domain_ref_, len(domain_ref_))
       ENDIF
 
       IF (PRESENT(enabled_)) THEN
-        CALL cxios_get_field_enabled(field_hdl%daddr, enabled__tmp)
+        CALL cxios_get_field_enabled &
+      (field_hdl%daddr, enabled__tmp)
         enabled_ = enabled__tmp
       ENDIF
 
       IF (PRESENT(field_ref_)) THEN
-        CALL cxios_get_field_field_ref(field_hdl%daddr, field_ref_, len(field_ref_))
+        CALL cxios_get_field_field_ref &
+      (field_hdl%daddr, field_ref_, len(field_ref_))
       ENDIF
 
       IF (PRESENT(freq_offset_)) THEN
-        CALL cxios_get_field_freq_offset(field_hdl%daddr, freq_offset_)
+        CALL cxios_get_field_freq_offset &
+      (field_hdl%daddr, freq_offset_)
       ENDIF
 
       IF (PRESENT(freq_op_)) THEN
-        CALL cxios_get_field_freq_op(field_hdl%daddr, freq_op_)
+        CALL cxios_get_field_freq_op &
+      (field_hdl%daddr, freq_op_)
       ENDIF
 
       IF (PRESENT(grid_path_)) THEN
-        CALL cxios_get_field_grid_path(field_hdl%daddr, grid_path_, len(grid_path_))
+        CALL cxios_get_field_grid_path &
+      (field_hdl%daddr, grid_path_, len(grid_path_))
       ENDIF
 
       IF (PRESENT(grid_ref_)) THEN
-        CALL cxios_get_field_grid_ref(field_hdl%daddr, grid_ref_, len(grid_ref_))
+        CALL cxios_get_field_grid_ref &
+      (field_hdl%daddr, grid_ref_, len(grid_ref_))
       ENDIF
 
       IF (PRESENT(indexed_output_)) THEN
-        CALL cxios_get_field_indexed_output(field_hdl%daddr, indexed_output__tmp)
+        CALL cxios_get_field_indexed_output &
+      (field_hdl%daddr, indexed_output__tmp)
         indexed_output_ = indexed_output__tmp
       ENDIF
 
       IF (PRESENT(level_)) THEN
-        CALL cxios_get_field_level(field_hdl%daddr, level_)
+        CALL cxios_get_field_level &
+      (field_hdl%daddr, level_)
       ENDIF
 
       IF (PRESENT(long_name_)) THEN
-        CALL cxios_get_field_long_name(field_hdl%daddr, long_name_, len(long_name_))
+        CALL cxios_get_field_long_name &
+      (field_hdl%daddr, long_name_, len(long_name_))
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_get_field_name(field_hdl%daddr, name_, len(name_))
+        CALL cxios_get_field_name &
+      (field_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(operation_)) THEN
-        CALL cxios_get_field_operation(field_hdl%daddr, operation_, len(operation_))
+        CALL cxios_get_field_operation &
+      (field_hdl%daddr, operation_, len(operation_))
       ENDIF
 
       IF (PRESENT(prec_)) THEN
-        CALL cxios_get_field_prec(field_hdl%daddr, prec_)
+        CALL cxios_get_field_prec &
+      (field_hdl%daddr, prec_)
       ENDIF
 
       IF (PRESENT(read_access_)) THEN
-        CALL cxios_get_field_read_access(field_hdl%daddr, read_access__tmp)
+        CALL cxios_get_field_read_access &
+      (field_hdl%daddr, read_access__tmp)
         read_access_ = read_access__tmp
       ENDIF
 
       IF (PRESENT(scalar_ref_)) THEN
-        CALL cxios_get_field_scalar_ref(field_hdl%daddr, scalar_ref_, len(scalar_ref_))
+        CALL cxios_get_field_scalar_ref &
+      (field_hdl%daddr, scalar_ref_, len(scalar_ref_))
       ENDIF
 
       IF (PRESENT(scale_factor_)) THEN
-        CALL cxios_get_field_scale_factor(field_hdl%daddr, scale_factor_)
+        CALL cxios_get_field_scale_factor &
+      (field_hdl%daddr, scale_factor_)
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        CALL cxios_get_field_standard_name(field_hdl%daddr, standard_name_, len(standard_name_))
+        CALL cxios_get_field_standard_name &
+      (field_hdl%daddr, standard_name_, len(standard_name_))
       ENDIF
 
       IF (PRESENT(ts_enabled_)) THEN
-        CALL cxios_get_field_ts_enabled(field_hdl%daddr, ts_enabled__tmp)
+        CALL cxios_get_field_ts_enabled &
+      (field_hdl%daddr, ts_enabled__tmp)
         ts_enabled_ = ts_enabled__tmp
       ENDIF
 
       IF (PRESENT(ts_split_freq_)) THEN
-        CALL cxios_get_field_ts_split_freq(field_hdl%daddr, ts_split_freq_)
+        CALL cxios_get_field_ts_split_freq &
+      (field_hdl%daddr, ts_split_freq_)
       ENDIF
 
       IF (PRESENT(unit_)) THEN
-        CALL cxios_get_field_unit(field_hdl%daddr, unit_, len(unit_))
+        CALL cxios_get_field_unit &
+      (field_hdl%daddr, unit_, len(unit_))
       ENDIF
 
       IF (PRESENT(valid_max_)) THEN
-        CALL cxios_get_field_valid_max(field_hdl%daddr, valid_max_)
+        CALL cxios_get_field_valid_max &
+      (field_hdl%daddr, valid_max_)
       ENDIF
 
       IF (PRESENT(valid_min_)) THEN
-        CALL cxios_get_field_valid_min(field_hdl%daddr, valid_min_)
+        CALL cxios_get_field_valid_min &
+      (field_hdl%daddr, valid_min_)
       ENDIF
 
@@ -587,5 +643,6 @@
       LOGICAL(KIND=C_BOOL) :: valid_min_tmp
 
-      CALL xios(get_field_handle)(field_id,field_hdl)
+      CALL xios(get_field_handle) &
+      (field_id,field_hdl)
       CALL xios(is_defined_field_attr_hdl_)   &
       ( field_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value, domain_ref  &
@@ -731,135 +788,162 @@
 
       IF (PRESENT(add_offset_)) THEN
-        add_offset__tmp = cxios_is_defined_field_add_offset(field_hdl%daddr)
+        add_offset__tmp = cxios_is_defined_field_add_offset &
+      (field_hdl%daddr)
         add_offset_ = add_offset__tmp
       ENDIF
 
       IF (PRESENT(axis_ref_)) THEN
-        axis_ref__tmp = cxios_is_defined_field_axis_ref(field_hdl%daddr)
+        axis_ref__tmp = cxios_is_defined_field_axis_ref &
+      (field_hdl%daddr)
         axis_ref_ = axis_ref__tmp
       ENDIF
 
       IF (PRESENT(compression_level_)) THEN
-        compression_level__tmp = cxios_is_defined_field_compression_level(field_hdl%daddr)
+        compression_level__tmp = cxios_is_defined_field_compression_level &
+      (field_hdl%daddr)
         compression_level_ = compression_level__tmp
       ENDIF
 
       IF (PRESENT(default_value_)) THEN
-        default_value__tmp = cxios_is_defined_field_default_value(field_hdl%daddr)
+        default_value__tmp = cxios_is_defined_field_default_value &
+      (field_hdl%daddr)
         default_value_ = default_value__tmp
       ENDIF
 
       IF (PRESENT(detect_missing_value_)) THEN
-        detect_missing_value__tmp = cxios_is_defined_field_detect_missing_value(field_hdl%daddr)
+        detect_missing_value__tmp = cxios_is_defined_field_detect_missing_value &
+      (field_hdl%daddr)
         detect_missing_value_ = detect_missing_value__tmp
       ENDIF
 
       IF (PRESENT(domain_ref_)) THEN
-        domain_ref__tmp = cxios_is_defined_field_domain_ref(field_hdl%daddr)
+        domain_ref__tmp = cxios_is_defined_field_domain_ref &
+      (field_hdl%daddr)
         domain_ref_ = domain_ref__tmp
       ENDIF
 
       IF (PRESENT(enabled_)) THEN
-        enabled__tmp = cxios_is_defined_field_enabled(field_hdl%daddr)
+        enabled__tmp = cxios_is_defined_field_enabled &
+      (field_hdl%daddr)
         enabled_ = enabled__tmp
       ENDIF
 
       IF (PRESENT(field_ref_)) THEN
-        field_ref__tmp = cxios_is_defined_field_field_ref(field_hdl%daddr)
+        field_ref__tmp = cxios_is_defined_field_field_ref &
+      (field_hdl%daddr)
         field_ref_ = field_ref__tmp
       ENDIF
 
       IF (PRESENT(freq_offset_)) THEN
-        freq_offset__tmp = cxios_is_defined_field_freq_offset(field_hdl%daddr)
+        freq_offset__tmp = cxios_is_defined_field_freq_offset &
+      (field_hdl%daddr)
         freq_offset_ = freq_offset__tmp
       ENDIF
 
       IF (PRESENT(freq_op_)) THEN
-        freq_op__tmp = cxios_is_defined_field_freq_op(field_hdl%daddr)
+        freq_op__tmp = cxios_is_defined_field_freq_op &
+      (field_hdl%daddr)
         freq_op_ = freq_op__tmp
       ENDIF
 
       IF (PRESENT(grid_path_)) THEN
-        grid_path__tmp = cxios_is_defined_field_grid_path(field_hdl%daddr)
+        grid_path__tmp = cxios_is_defined_field_grid_path &
+      (field_hdl%daddr)
         grid_path_ = grid_path__tmp
       ENDIF
 
       IF (PRESENT(grid_ref_)) THEN
-        grid_ref__tmp = cxios_is_defined_field_grid_ref(field_hdl%daddr)
+        grid_ref__tmp = cxios_is_defined_field_grid_ref &
+      (field_hdl%daddr)
         grid_ref_ = grid_ref__tmp
       ENDIF
 
       IF (PRESENT(indexed_output_)) THEN
-        indexed_output__tmp = cxios_is_defined_field_indexed_output(field_hdl%daddr)
+        indexed_output__tmp = cxios_is_defined_field_indexed_output &
+      (field_hdl%daddr)
         indexed_output_ = indexed_output__tmp
       ENDIF
 
       IF (PRESENT(level_)) THEN
-        level__tmp = cxios_is_defined_field_level(field_hdl%daddr)
+        level__tmp = cxios_is_defined_field_level &
+      (field_hdl%daddr)
         level_ = level__tmp
       ENDIF
 
       IF (PRESENT(long_name_)) THEN
-        long_name__tmp = cxios_is_defined_field_long_name(field_hdl%daddr)
+        long_name__tmp = cxios_is_defined_field_long_name &
+      (field_hdl%daddr)
         long_name_ = long_name__tmp
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        name__tmp = cxios_is_defined_field_name(field_hdl%daddr)
+        name__tmp = cxios_is_defined_field_name &
+      (field_hdl%daddr)
         name_ = name__tmp
       ENDIF
 
       IF (PRESENT(operation_)) THEN
-        operation__tmp = cxios_is_defined_field_operation(field_hdl%daddr)
+        operation__tmp = cxios_is_defined_field_operation &
+      (field_hdl%daddr)
         operation_ = operation__tmp
       ENDIF
 
       IF (PRESENT(prec_)) THEN
-        prec__tmp = cxios_is_defined_field_prec(field_hdl%daddr)
+        prec__tmp = cxios_is_defined_field_prec &
+      (field_hdl%daddr)
         prec_ = prec__tmp
       ENDIF
 
       IF (PRESENT(read_access_)) THEN
-        read_access__tmp = cxios_is_defined_field_read_access(field_hdl%daddr)
+        read_access__tmp = cxios_is_defined_field_read_access &
+      (field_hdl%daddr)
         read_access_ = read_access__tmp
       ENDIF
 
       IF (PRESENT(scalar_ref_)) THEN
-        scalar_ref__tmp = cxios_is_defined_field_scalar_ref(field_hdl%daddr)
+        scalar_ref__tmp = cxios_is_defined_field_scalar_ref &
+      (field_hdl%daddr)
         scalar_ref_ = scalar_ref__tmp
       ENDIF
 
       IF (PRESENT(scale_factor_)) THEN
-        scale_factor__tmp = cxios_is_defined_field_scale_factor(field_hdl%daddr)
+        scale_factor__tmp = cxios_is_defined_field_scale_factor &
+      (field_hdl%daddr)
         scale_factor_ = scale_factor__tmp
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        standard_name__tmp = cxios_is_defined_field_standard_name(field_hdl%daddr)
+        standard_name__tmp = cxios_is_defined_field_standard_name &
+      (field_hdl%daddr)
         standard_name_ = standard_name__tmp
       ENDIF
 
       IF (PRESENT(ts_enabled_)) THEN
-        ts_enabled__tmp = cxios_is_defined_field_ts_enabled(field_hdl%daddr)
+        ts_enabled__tmp = cxios_is_defined_field_ts_enabled &
+      (field_hdl%daddr)
         ts_enabled_ = ts_enabled__tmp
       ENDIF
 
       IF (PRESENT(ts_split_freq_)) THEN
-        ts_split_freq__tmp = cxios_is_defined_field_ts_split_freq(field_hdl%daddr)
+        ts_split_freq__tmp = cxios_is_defined_field_ts_split_freq &
+      (field_hdl%daddr)
         ts_split_freq_ = ts_split_freq__tmp
       ENDIF
 
       IF (PRESENT(unit_)) THEN
-        unit__tmp = cxios_is_defined_field_unit(field_hdl%daddr)
+        unit__tmp = cxios_is_defined_field_unit &
+      (field_hdl%daddr)
         unit_ = unit__tmp
       ENDIF
 
       IF (PRESENT(valid_max_)) THEN
-        valid_max__tmp = cxios_is_defined_field_valid_max(field_hdl%daddr)
+        valid_max__tmp = cxios_is_defined_field_valid_max &
+      (field_hdl%daddr)
         valid_max_ = valid_max__tmp
       ENDIF
 
       IF (PRESENT(valid_min_)) THEN
-        valid_min__tmp = cxios_is_defined_field_valid_min(field_hdl%daddr)
+        valid_min__tmp = cxios_is_defined_field_valid_min &
+      (field_hdl%daddr)
         valid_min_ = valid_min__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/ifieldgroup_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/ifieldgroup_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/ifieldgroup_attr.F90	(revision 966)
@@ -54,5 +54,6 @@
       REAL (KIND=8) , OPTIONAL, INTENT(IN) :: valid_min
 
-      CALL xios(get_fieldgroup_handle)(fieldgroup_id,fieldgroup_hdl)
+      CALL xios(get_fieldgroup_handle) &
+      (fieldgroup_id,fieldgroup_hdl)
       CALL xios(set_fieldgroup_attr_hdl_)   &
       ( fieldgroup_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value  &
@@ -156,118 +157,146 @@
 
       IF (PRESENT(add_offset_)) THEN
-        CALL cxios_set_fieldgroup_add_offset(fieldgroup_hdl%daddr, add_offset_)
+        CALL cxios_set_fieldgroup_add_offset &
+      (fieldgroup_hdl%daddr, add_offset_)
       ENDIF
 
       IF (PRESENT(axis_ref_)) THEN
-        CALL cxios_set_fieldgroup_axis_ref(fieldgroup_hdl%daddr, axis_ref_, len(axis_ref_))
+        CALL cxios_set_fieldgroup_axis_ref &
+      (fieldgroup_hdl%daddr, axis_ref_, len(axis_ref_))
       ENDIF
 
       IF (PRESENT(compression_level_)) THEN
-        CALL cxios_set_fieldgroup_compression_level(fieldgroup_hdl%daddr, compression_level_)
+        CALL cxios_set_fieldgroup_compression_level &
+      (fieldgroup_hdl%daddr, compression_level_)
       ENDIF
 
       IF (PRESENT(default_value_)) THEN
-        CALL cxios_set_fieldgroup_default_value(fieldgroup_hdl%daddr, default_value_)
+        CALL cxios_set_fieldgroup_default_value &
+      (fieldgroup_hdl%daddr, default_value_)
       ENDIF
 
       IF (PRESENT(detect_missing_value_)) THEN
         detect_missing_value__tmp = detect_missing_value_
-        CALL cxios_set_fieldgroup_detect_missing_value(fieldgroup_hdl%daddr, detect_missing_value__tmp)
+        CALL cxios_set_fieldgroup_detect_missing_value &
+      (fieldgroup_hdl%daddr, detect_missing_value__tmp)
       ENDIF
 
       IF (PRESENT(domain_ref_)) THEN
-        CALL cxios_set_fieldgroup_domain_ref(fieldgroup_hdl%daddr, domain_ref_, len(domain_ref_))
+        CALL cxios_set_fieldgroup_domain_ref &
+      (fieldgroup_hdl%daddr, domain_ref_, len(domain_ref_))
       ENDIF
 
       IF (PRESENT(enabled_)) THEN
         enabled__tmp = enabled_
-        CALL cxios_set_fieldgroup_enabled(fieldgroup_hdl%daddr, enabled__tmp)
+        CALL cxios_set_fieldgroup_enabled &
+      (fieldgroup_hdl%daddr, enabled__tmp)
       ENDIF
 
       IF (PRESENT(field_ref_)) THEN
-        CALL cxios_set_fieldgroup_field_ref(fieldgroup_hdl%daddr, field_ref_, len(field_ref_))
+        CALL cxios_set_fieldgroup_field_ref &
+      (fieldgroup_hdl%daddr, field_ref_, len(field_ref_))
       ENDIF
 
       IF (PRESENT(freq_offset_)) THEN
-        CALL cxios_set_fieldgroup_freq_offset(fieldgroup_hdl%daddr, freq_offset_)
+        CALL cxios_set_fieldgroup_freq_offset &
+      (fieldgroup_hdl%daddr, freq_offset_)
       ENDIF
 
       IF (PRESENT(freq_op_)) THEN
-        CALL cxios_set_fieldgroup_freq_op(fieldgroup_hdl%daddr, freq_op_)
+        CALL cxios_set_fieldgroup_freq_op &
+      (fieldgroup_hdl%daddr, freq_op_)
       ENDIF
 
       IF (PRESENT(grid_path_)) THEN
-        CALL cxios_set_fieldgroup_grid_path(fieldgroup_hdl%daddr, grid_path_, len(grid_path_))
+        CALL cxios_set_fieldgroup_grid_path &
+      (fieldgroup_hdl%daddr, grid_path_, len(grid_path_))
       ENDIF
 
       IF (PRESENT(grid_ref_)) THEN
-        CALL cxios_set_fieldgroup_grid_ref(fieldgroup_hdl%daddr, grid_ref_, len(grid_ref_))
+        CALL cxios_set_fieldgroup_grid_ref &
+      (fieldgroup_hdl%daddr, grid_ref_, len(grid_ref_))
       ENDIF
 
       IF (PRESENT(group_ref_)) THEN
-        CALL cxios_set_fieldgroup_group_ref(fieldgroup_hdl%daddr, group_ref_, len(group_ref_))
+        CALL cxios_set_fieldgroup_group_ref &
+      (fieldgroup_hdl%daddr, group_ref_, len(group_ref_))
       ENDIF
 
       IF (PRESENT(indexed_output_)) THEN
         indexed_output__tmp = indexed_output_
-        CALL cxios_set_fieldgroup_indexed_output(fieldgroup_hdl%daddr, indexed_output__tmp)
+        CALL cxios_set_fieldgroup_indexed_output &
+      (fieldgroup_hdl%daddr, indexed_output__tmp)
       ENDIF
 
       IF (PRESENT(level_)) THEN
-        CALL cxios_set_fieldgroup_level(fieldgroup_hdl%daddr, level_)
+        CALL cxios_set_fieldgroup_level &
+      (fieldgroup_hdl%daddr, level_)
       ENDIF
 
       IF (PRESENT(long_name_)) THEN
-        CALL cxios_set_fieldgroup_long_name(fieldgroup_hdl%daddr, long_name_, len(long_name_))
+        CALL cxios_set_fieldgroup_long_name &
+      (fieldgroup_hdl%daddr, long_name_, len(long_name_))
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_set_fieldgroup_name(fieldgroup_hdl%daddr, name_, len(name_))
+        CALL cxios_set_fieldgroup_name &
+      (fieldgroup_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(operation_)) THEN
-        CALL cxios_set_fieldgroup_operation(fieldgroup_hdl%daddr, operation_, len(operation_))
+        CALL cxios_set_fieldgroup_operation &
+      (fieldgroup_hdl%daddr, operation_, len(operation_))
       ENDIF
 
       IF (PRESENT(prec_)) THEN
-        CALL cxios_set_fieldgroup_prec(fieldgroup_hdl%daddr, prec_)
+        CALL cxios_set_fieldgroup_prec &
+      (fieldgroup_hdl%daddr, prec_)
       ENDIF
 
       IF (PRESENT(read_access_)) THEN
         read_access__tmp = read_access_
-        CALL cxios_set_fieldgroup_read_access(fieldgroup_hdl%daddr, read_access__tmp)
+        CALL cxios_set_fieldgroup_read_access &
+      (fieldgroup_hdl%daddr, read_access__tmp)
       ENDIF
 
       IF (PRESENT(scalar_ref_)) THEN
-        CALL cxios_set_fieldgroup_scalar_ref(fieldgroup_hdl%daddr, scalar_ref_, len(scalar_ref_))
+        CALL cxios_set_fieldgroup_scalar_ref &
+      (fieldgroup_hdl%daddr, scalar_ref_, len(scalar_ref_))
       ENDIF
 
       IF (PRESENT(scale_factor_)) THEN
-        CALL cxios_set_fieldgroup_scale_factor(fieldgroup_hdl%daddr, scale_factor_)
+        CALL cxios_set_fieldgroup_scale_factor &
+      (fieldgroup_hdl%daddr, scale_factor_)
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        CALL cxios_set_fieldgroup_standard_name(fieldgroup_hdl%daddr, standard_name_, len(standard_name_))
+        CALL cxios_set_fieldgroup_standard_name &
+      (fieldgroup_hdl%daddr, standard_name_, len(standard_name_))
       ENDIF
 
       IF (PRESENT(ts_enabled_)) THEN
         ts_enabled__tmp = ts_enabled_
-        CALL cxios_set_fieldgroup_ts_enabled(fieldgroup_hdl%daddr, ts_enabled__tmp)
+        CALL cxios_set_fieldgroup_ts_enabled &
+      (fieldgroup_hdl%daddr, ts_enabled__tmp)
       ENDIF
 
       IF (PRESENT(ts_split_freq_)) THEN
-        CALL cxios_set_fieldgroup_ts_split_freq(fieldgroup_hdl%daddr, ts_split_freq_)
+        CALL cxios_set_fieldgroup_ts_split_freq &
+      (fieldgroup_hdl%daddr, ts_split_freq_)
       ENDIF
 
       IF (PRESENT(unit_)) THEN
-        CALL cxios_set_fieldgroup_unit(fieldgroup_hdl%daddr, unit_, len(unit_))
+        CALL cxios_set_fieldgroup_unit &
+      (fieldgroup_hdl%daddr, unit_, len(unit_))
       ENDIF
 
       IF (PRESENT(valid_max_)) THEN
-        CALL cxios_set_fieldgroup_valid_max(fieldgroup_hdl%daddr, valid_max_)
+        CALL cxios_set_fieldgroup_valid_max &
+      (fieldgroup_hdl%daddr, valid_max_)
       ENDIF
 
       IF (PRESENT(valid_min_)) THEN
-        CALL cxios_set_fieldgroup_valid_min(fieldgroup_hdl%daddr, valid_min_)
+        CALL cxios_set_fieldgroup_valid_min &
+      (fieldgroup_hdl%daddr, valid_min_)
       ENDIF
 
@@ -317,5 +346,6 @@
       REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: valid_min
 
-      CALL xios(get_fieldgroup_handle)(fieldgroup_id,fieldgroup_hdl)
+      CALL xios(get_fieldgroup_handle) &
+      (fieldgroup_id,fieldgroup_hdl)
       CALL xios(get_fieldgroup_attr_hdl_)   &
       ( fieldgroup_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value  &
@@ -419,118 +449,146 @@
 
       IF (PRESENT(add_offset_)) THEN
-        CALL cxios_get_fieldgroup_add_offset(fieldgroup_hdl%daddr, add_offset_)
+        CALL cxios_get_fieldgroup_add_offset &
+      (fieldgroup_hdl%daddr, add_offset_)
       ENDIF
 
       IF (PRESENT(axis_ref_)) THEN
-        CALL cxios_get_fieldgroup_axis_ref(fieldgroup_hdl%daddr, axis_ref_, len(axis_ref_))
+        CALL cxios_get_fieldgroup_axis_ref &
+      (fieldgroup_hdl%daddr, axis_ref_, len(axis_ref_))
       ENDIF
 
       IF (PRESENT(compression_level_)) THEN
-        CALL cxios_get_fieldgroup_compression_level(fieldgroup_hdl%daddr, compression_level_)
+        CALL cxios_get_fieldgroup_compression_level &
+      (fieldgroup_hdl%daddr, compression_level_)
       ENDIF
 
       IF (PRESENT(default_value_)) THEN
-        CALL cxios_get_fieldgroup_default_value(fieldgroup_hdl%daddr, default_value_)
+        CALL cxios_get_fieldgroup_default_value &
+      (fieldgroup_hdl%daddr, default_value_)
       ENDIF
 
       IF (PRESENT(detect_missing_value_)) THEN
-        CALL cxios_get_fieldgroup_detect_missing_value(fieldgroup_hdl%daddr, detect_missing_value__tmp)
+        CALL cxios_get_fieldgroup_detect_missing_value &
+      (fieldgroup_hdl%daddr, detect_missing_value__tmp)
         detect_missing_value_ = detect_missing_value__tmp
       ENDIF
 
       IF (PRESENT(domain_ref_)) THEN
-        CALL cxios_get_fieldgroup_domain_ref(fieldgroup_hdl%daddr, domain_ref_, len(domain_ref_))
+        CALL cxios_get_fieldgroup_domain_ref &
+      (fieldgroup_hdl%daddr, domain_ref_, len(domain_ref_))
       ENDIF
 
       IF (PRESENT(enabled_)) THEN
-        CALL cxios_get_fieldgroup_enabled(fieldgroup_hdl%daddr, enabled__tmp)
+        CALL cxios_get_fieldgroup_enabled &
+      (fieldgroup_hdl%daddr, enabled__tmp)
         enabled_ = enabled__tmp
       ENDIF
 
       IF (PRESENT(field_ref_)) THEN
-        CALL cxios_get_fieldgroup_field_ref(fieldgroup_hdl%daddr, field_ref_, len(field_ref_))
+        CALL cxios_get_fieldgroup_field_ref &
+      (fieldgroup_hdl%daddr, field_ref_, len(field_ref_))
       ENDIF
 
       IF (PRESENT(freq_offset_)) THEN
-        CALL cxios_get_fieldgroup_freq_offset(fieldgroup_hdl%daddr, freq_offset_)
+        CALL cxios_get_fieldgroup_freq_offset &
+      (fieldgroup_hdl%daddr, freq_offset_)
       ENDIF
 
       IF (PRESENT(freq_op_)) THEN
-        CALL cxios_get_fieldgroup_freq_op(fieldgroup_hdl%daddr, freq_op_)
+        CALL cxios_get_fieldgroup_freq_op &
+      (fieldgroup_hdl%daddr, freq_op_)
       ENDIF
 
       IF (PRESENT(grid_path_)) THEN
-        CALL cxios_get_fieldgroup_grid_path(fieldgroup_hdl%daddr, grid_path_, len(grid_path_))
+        CALL cxios_get_fieldgroup_grid_path &
+      (fieldgroup_hdl%daddr, grid_path_, len(grid_path_))
       ENDIF
 
       IF (PRESENT(grid_ref_)) THEN
-        CALL cxios_get_fieldgroup_grid_ref(fieldgroup_hdl%daddr, grid_ref_, len(grid_ref_))
+        CALL cxios_get_fieldgroup_grid_ref &
+      (fieldgroup_hdl%daddr, grid_ref_, len(grid_ref_))
       ENDIF
 
       IF (PRESENT(group_ref_)) THEN
-        CALL cxios_get_fieldgroup_group_ref(fieldgroup_hdl%daddr, group_ref_, len(group_ref_))
+        CALL cxios_get_fieldgroup_group_ref &
+      (fieldgroup_hdl%daddr, group_ref_, len(group_ref_))
       ENDIF
 
       IF (PRESENT(indexed_output_)) THEN
-        CALL cxios_get_fieldgroup_indexed_output(fieldgroup_hdl%daddr, indexed_output__tmp)
+        CALL cxios_get_fieldgroup_indexed_output &
+      (fieldgroup_hdl%daddr, indexed_output__tmp)
         indexed_output_ = indexed_output__tmp
       ENDIF
 
       IF (PRESENT(level_)) THEN
-        CALL cxios_get_fieldgroup_level(fieldgroup_hdl%daddr, level_)
+        CALL cxios_get_fieldgroup_level &
+      (fieldgroup_hdl%daddr, level_)
       ENDIF
 
       IF (PRESENT(long_name_)) THEN
-        CALL cxios_get_fieldgroup_long_name(fieldgroup_hdl%daddr, long_name_, len(long_name_))
+        CALL cxios_get_fieldgroup_long_name &
+      (fieldgroup_hdl%daddr, long_name_, len(long_name_))
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_get_fieldgroup_name(fieldgroup_hdl%daddr, name_, len(name_))
+        CALL cxios_get_fieldgroup_name &
+      (fieldgroup_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(operation_)) THEN
-        CALL cxios_get_fieldgroup_operation(fieldgroup_hdl%daddr, operation_, len(operation_))
+        CALL cxios_get_fieldgroup_operation &
+      (fieldgroup_hdl%daddr, operation_, len(operation_))
       ENDIF
 
       IF (PRESENT(prec_)) THEN
-        CALL cxios_get_fieldgroup_prec(fieldgroup_hdl%daddr, prec_)
+        CALL cxios_get_fieldgroup_prec &
+      (fieldgroup_hdl%daddr, prec_)
       ENDIF
 
       IF (PRESENT(read_access_)) THEN
-        CALL cxios_get_fieldgroup_read_access(fieldgroup_hdl%daddr, read_access__tmp)
+        CALL cxios_get_fieldgroup_read_access &
+      (fieldgroup_hdl%daddr, read_access__tmp)
         read_access_ = read_access__tmp
       ENDIF
 
       IF (PRESENT(scalar_ref_)) THEN
-        CALL cxios_get_fieldgroup_scalar_ref(fieldgroup_hdl%daddr, scalar_ref_, len(scalar_ref_))
+        CALL cxios_get_fieldgroup_scalar_ref &
+      (fieldgroup_hdl%daddr, scalar_ref_, len(scalar_ref_))
       ENDIF
 
       IF (PRESENT(scale_factor_)) THEN
-        CALL cxios_get_fieldgroup_scale_factor(fieldgroup_hdl%daddr, scale_factor_)
+        CALL cxios_get_fieldgroup_scale_factor &
+      (fieldgroup_hdl%daddr, scale_factor_)
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        CALL cxios_get_fieldgroup_standard_name(fieldgroup_hdl%daddr, standard_name_, len(standard_name_))
+        CALL cxios_get_fieldgroup_standard_name &
+      (fieldgroup_hdl%daddr, standard_name_, len(standard_name_))
       ENDIF
 
       IF (PRESENT(ts_enabled_)) THEN
-        CALL cxios_get_fieldgroup_ts_enabled(fieldgroup_hdl%daddr, ts_enabled__tmp)
+        CALL cxios_get_fieldgroup_ts_enabled &
+      (fieldgroup_hdl%daddr, ts_enabled__tmp)
         ts_enabled_ = ts_enabled__tmp
       ENDIF
 
       IF (PRESENT(ts_split_freq_)) THEN
-        CALL cxios_get_fieldgroup_ts_split_freq(fieldgroup_hdl%daddr, ts_split_freq_)
+        CALL cxios_get_fieldgroup_ts_split_freq &
+      (fieldgroup_hdl%daddr, ts_split_freq_)
       ENDIF
 
       IF (PRESENT(unit_)) THEN
-        CALL cxios_get_fieldgroup_unit(fieldgroup_hdl%daddr, unit_, len(unit_))
+        CALL cxios_get_fieldgroup_unit &
+      (fieldgroup_hdl%daddr, unit_, len(unit_))
       ENDIF
 
       IF (PRESENT(valid_max_)) THEN
-        CALL cxios_get_fieldgroup_valid_max(fieldgroup_hdl%daddr, valid_max_)
+        CALL cxios_get_fieldgroup_valid_max &
+      (fieldgroup_hdl%daddr, valid_max_)
       ENDIF
 
       IF (PRESENT(valid_min_)) THEN
-        CALL cxios_get_fieldgroup_valid_min(fieldgroup_hdl%daddr, valid_min_)
+        CALL cxios_get_fieldgroup_valid_min &
+      (fieldgroup_hdl%daddr, valid_min_)
       ENDIF
 
@@ -603,5 +661,6 @@
       LOGICAL(KIND=C_BOOL) :: valid_min_tmp
 
-      CALL xios(get_fieldgroup_handle)(fieldgroup_id,fieldgroup_hdl)
+      CALL xios(get_fieldgroup_handle) &
+      (fieldgroup_id,fieldgroup_hdl)
       CALL xios(is_defined_fieldgroup_attr_hdl_)   &
       ( fieldgroup_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value  &
@@ -751,140 +810,168 @@
 
       IF (PRESENT(add_offset_)) THEN
-        add_offset__tmp = cxios_is_defined_fieldgroup_add_offset(fieldgroup_hdl%daddr)
+        add_offset__tmp = cxios_is_defined_fieldgroup_add_offset &
+      (fieldgroup_hdl%daddr)
         add_offset_ = add_offset__tmp
       ENDIF
 
       IF (PRESENT(axis_ref_)) THEN
-        axis_ref__tmp = cxios_is_defined_fieldgroup_axis_ref(fieldgroup_hdl%daddr)
+        axis_ref__tmp = cxios_is_defined_fieldgroup_axis_ref &
+      (fieldgroup_hdl%daddr)
         axis_ref_ = axis_ref__tmp
       ENDIF
 
       IF (PRESENT(compression_level_)) THEN
-        compression_level__tmp = cxios_is_defined_fieldgroup_compression_level(fieldgroup_hdl%daddr)
+        compression_level__tmp = cxios_is_defined_fieldgroup_compression_level &
+      (fieldgroup_hdl%daddr)
         compression_level_ = compression_level__tmp
       ENDIF
 
       IF (PRESENT(default_value_)) THEN
-        default_value__tmp = cxios_is_defined_fieldgroup_default_value(fieldgroup_hdl%daddr)
+        default_value__tmp = cxios_is_defined_fieldgroup_default_value &
+      (fieldgroup_hdl%daddr)
         default_value_ = default_value__tmp
       ENDIF
 
       IF (PRESENT(detect_missing_value_)) THEN
-        detect_missing_value__tmp = cxios_is_defined_fieldgroup_detect_missing_value(fieldgroup_hdl%daddr)
+        detect_missing_value__tmp = cxios_is_defined_fieldgroup_detect_missing_value &
+      (fieldgroup_hdl%daddr)
         detect_missing_value_ = detect_missing_value__tmp
       ENDIF
 
       IF (PRESENT(domain_ref_)) THEN
-        domain_ref__tmp = cxios_is_defined_fieldgroup_domain_ref(fieldgroup_hdl%daddr)
+        domain_ref__tmp = cxios_is_defined_fieldgroup_domain_ref &
+      (fieldgroup_hdl%daddr)
         domain_ref_ = domain_ref__tmp
       ENDIF
 
       IF (PRESENT(enabled_)) THEN
-        enabled__tmp = cxios_is_defined_fieldgroup_enabled(fieldgroup_hdl%daddr)
+        enabled__tmp = cxios_is_defined_fieldgroup_enabled &
+      (fieldgroup_hdl%daddr)
         enabled_ = enabled__tmp
       ENDIF
 
       IF (PRESENT(field_ref_)) THEN
-        field_ref__tmp = cxios_is_defined_fieldgroup_field_ref(fieldgroup_hdl%daddr)
+        field_ref__tmp = cxios_is_defined_fieldgroup_field_ref &
+      (fieldgroup_hdl%daddr)
         field_ref_ = field_ref__tmp
       ENDIF
 
       IF (PRESENT(freq_offset_)) THEN
-        freq_offset__tmp = cxios_is_defined_fieldgroup_freq_offset(fieldgroup_hdl%daddr)
+        freq_offset__tmp = cxios_is_defined_fieldgroup_freq_offset &
+      (fieldgroup_hdl%daddr)
         freq_offset_ = freq_offset__tmp
       ENDIF
 
       IF (PRESENT(freq_op_)) THEN
-        freq_op__tmp = cxios_is_defined_fieldgroup_freq_op(fieldgroup_hdl%daddr)
+        freq_op__tmp = cxios_is_defined_fieldgroup_freq_op &
+      (fieldgroup_hdl%daddr)
         freq_op_ = freq_op__tmp
       ENDIF
 
       IF (PRESENT(grid_path_)) THEN
-        grid_path__tmp = cxios_is_defined_fieldgroup_grid_path(fieldgroup_hdl%daddr)
+        grid_path__tmp = cxios_is_defined_fieldgroup_grid_path &
+      (fieldgroup_hdl%daddr)
         grid_path_ = grid_path__tmp
       ENDIF
 
       IF (PRESENT(grid_ref_)) THEN
-        grid_ref__tmp = cxios_is_defined_fieldgroup_grid_ref(fieldgroup_hdl%daddr)
+        grid_ref__tmp = cxios_is_defined_fieldgroup_grid_ref &
+      (fieldgroup_hdl%daddr)
         grid_ref_ = grid_ref__tmp
       ENDIF
 
       IF (PRESENT(group_ref_)) THEN
-        group_ref__tmp = cxios_is_defined_fieldgroup_group_ref(fieldgroup_hdl%daddr)
+        group_ref__tmp = cxios_is_defined_fieldgroup_group_ref &
+      (fieldgroup_hdl%daddr)
         group_ref_ = group_ref__tmp
       ENDIF
 
       IF (PRESENT(indexed_output_)) THEN
-        indexed_output__tmp = cxios_is_defined_fieldgroup_indexed_output(fieldgroup_hdl%daddr)
+        indexed_output__tmp = cxios_is_defined_fieldgroup_indexed_output &
+      (fieldgroup_hdl%daddr)
         indexed_output_ = indexed_output__tmp
       ENDIF
 
       IF (PRESENT(level_)) THEN
-        level__tmp = cxios_is_defined_fieldgroup_level(fieldgroup_hdl%daddr)
+        level__tmp = cxios_is_defined_fieldgroup_level &
+      (fieldgroup_hdl%daddr)
         level_ = level__tmp
       ENDIF
 
       IF (PRESENT(long_name_)) THEN
-        long_name__tmp = cxios_is_defined_fieldgroup_long_name(fieldgroup_hdl%daddr)
+        long_name__tmp = cxios_is_defined_fieldgroup_long_name &
+      (fieldgroup_hdl%daddr)
         long_name_ = long_name__tmp
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        name__tmp = cxios_is_defined_fieldgroup_name(fieldgroup_hdl%daddr)
+        name__tmp = cxios_is_defined_fieldgroup_name &
+      (fieldgroup_hdl%daddr)
         name_ = name__tmp
       ENDIF
 
       IF (PRESENT(operation_)) THEN
-        operation__tmp = cxios_is_defined_fieldgroup_operation(fieldgroup_hdl%daddr)
+        operation__tmp = cxios_is_defined_fieldgroup_operation &
+      (fieldgroup_hdl%daddr)
         operation_ = operation__tmp
       ENDIF
 
       IF (PRESENT(prec_)) THEN
-        prec__tmp = cxios_is_defined_fieldgroup_prec(fieldgroup_hdl%daddr)
+        prec__tmp = cxios_is_defined_fieldgroup_prec &
+      (fieldgroup_hdl%daddr)
         prec_ = prec__tmp
       ENDIF
 
       IF (PRESENT(read_access_)) THEN
-        read_access__tmp = cxios_is_defined_fieldgroup_read_access(fieldgroup_hdl%daddr)
+        read_access__tmp = cxios_is_defined_fieldgroup_read_access &
+      (fieldgroup_hdl%daddr)
         read_access_ = read_access__tmp
       ENDIF
 
       IF (PRESENT(scalar_ref_)) THEN
-        scalar_ref__tmp = cxios_is_defined_fieldgroup_scalar_ref(fieldgroup_hdl%daddr)
+        scalar_ref__tmp = cxios_is_defined_fieldgroup_scalar_ref &
+      (fieldgroup_hdl%daddr)
         scalar_ref_ = scalar_ref__tmp
       ENDIF
 
       IF (PRESENT(scale_factor_)) THEN
-        scale_factor__tmp = cxios_is_defined_fieldgroup_scale_factor(fieldgroup_hdl%daddr)
+        scale_factor__tmp = cxios_is_defined_fieldgroup_scale_factor &
+      (fieldgroup_hdl%daddr)
         scale_factor_ = scale_factor__tmp
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        standard_name__tmp = cxios_is_defined_fieldgroup_standard_name(fieldgroup_hdl%daddr)
+        standard_name__tmp = cxios_is_defined_fieldgroup_standard_name &
+      (fieldgroup_hdl%daddr)
         standard_name_ = standard_name__tmp
       ENDIF
 
       IF (PRESENT(ts_enabled_)) THEN
-        ts_enabled__tmp = cxios_is_defined_fieldgroup_ts_enabled(fieldgroup_hdl%daddr)
+        ts_enabled__tmp = cxios_is_defined_fieldgroup_ts_enabled &
+      (fieldgroup_hdl%daddr)
         ts_enabled_ = ts_enabled__tmp
       ENDIF
 
       IF (PRESENT(ts_split_freq_)) THEN
-        ts_split_freq__tmp = cxios_is_defined_fieldgroup_ts_split_freq(fieldgroup_hdl%daddr)
+        ts_split_freq__tmp = cxios_is_defined_fieldgroup_ts_split_freq &
+      (fieldgroup_hdl%daddr)
         ts_split_freq_ = ts_split_freq__tmp
       ENDIF
 
       IF (PRESENT(unit_)) THEN
-        unit__tmp = cxios_is_defined_fieldgroup_unit(fieldgroup_hdl%daddr)
+        unit__tmp = cxios_is_defined_fieldgroup_unit &
+      (fieldgroup_hdl%daddr)
         unit_ = unit__tmp
       ENDIF
 
       IF (PRESENT(valid_max_)) THEN
-        valid_max__tmp = cxios_is_defined_fieldgroup_valid_max(fieldgroup_hdl%daddr)
+        valid_max__tmp = cxios_is_defined_fieldgroup_valid_max &
+      (fieldgroup_hdl%daddr)
         valid_max_ = valid_max__tmp
       ENDIF
 
       IF (PRESENT(valid_min_)) THEN
-        valid_min__tmp = cxios_is_defined_fieldgroup_valid_min(fieldgroup_hdl%daddr)
+        valid_min__tmp = cxios_is_defined_fieldgroup_valid_min &
+      (fieldgroup_hdl%daddr)
         valid_min_ = valid_min__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/ifile_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/ifile_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/ifile_attr.F90	(revision 966)
@@ -47,5 +47,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type
 
-      CALL xios(get_file_handle)(file_id,file_hdl)
+      CALL xios(get_file_handle) &
+      (file_id,file_hdl)
       CALL xios(set_file_attr_hdl_)   &
       ( file_hdl, append, compression_level, convention, cyclic, description, enabled, format, min_digits  &
@@ -136,95 +137,118 @@
       IF (PRESENT(append_)) THEN
         append__tmp = append_
-        CALL cxios_set_file_append(file_hdl%daddr, append__tmp)
+        CALL cxios_set_file_append &
+      (file_hdl%daddr, append__tmp)
       ENDIF
 
       IF (PRESENT(compression_level_)) THEN
-        CALL cxios_set_file_compression_level(file_hdl%daddr, compression_level_)
+        CALL cxios_set_file_compression_level &
+      (file_hdl%daddr, compression_level_)
       ENDIF
 
       IF (PRESENT(convention_)) THEN
-        CALL cxios_set_file_convention(file_hdl%daddr, convention_, len(convention_))
+        CALL cxios_set_file_convention &
+      (file_hdl%daddr, convention_, len(convention_))
       ENDIF
 
       IF (PRESENT(cyclic_)) THEN
         cyclic__tmp = cyclic_
-        CALL cxios_set_file_cyclic(file_hdl%daddr, cyclic__tmp)
+        CALL cxios_set_file_cyclic &
+      (file_hdl%daddr, cyclic__tmp)
       ENDIF
 
       IF (PRESENT(description_)) THEN
-        CALL cxios_set_file_description(file_hdl%daddr, description_, len(description_))
+        CALL cxios_set_file_description &
+      (file_hdl%daddr, description_, len(description_))
       ENDIF
 
       IF (PRESENT(enabled_)) THEN
         enabled__tmp = enabled_
-        CALL cxios_set_file_enabled(file_hdl%daddr, enabled__tmp)
+        CALL cxios_set_file_enabled &
+      (file_hdl%daddr, enabled__tmp)
       ENDIF
 
       IF (PRESENT(format_)) THEN
-        CALL cxios_set_file_format(file_hdl%daddr, format_, len(format_))
+        CALL cxios_set_file_format &
+      (file_hdl%daddr, format_, len(format_))
       ENDIF
 
       IF (PRESENT(min_digits_)) THEN
-        CALL cxios_set_file_min_digits(file_hdl%daddr, min_digits_)
+        CALL cxios_set_file_min_digits &
+      (file_hdl%daddr, min_digits_)
       ENDIF
 
       IF (PRESENT(mode_)) THEN
-        CALL cxios_set_file_mode(file_hdl%daddr, mode_, len(mode_))
+        CALL cxios_set_file_mode &
+      (file_hdl%daddr, mode_, len(mode_))
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_set_file_name(file_hdl%daddr, name_, len(name_))
+        CALL cxios_set_file_name &
+      (file_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(name_suffix_)) THEN
-        CALL cxios_set_file_name_suffix(file_hdl%daddr, name_suffix_, len(name_suffix_))
+        CALL cxios_set_file_name_suffix &
+      (file_hdl%daddr, name_suffix_, len(name_suffix_))
       ENDIF
 
       IF (PRESENT(output_freq_)) THEN
-        CALL cxios_set_file_output_freq(file_hdl%daddr, output_freq_)
+        CALL cxios_set_file_output_freq &
+      (file_hdl%daddr, output_freq_)
       ENDIF
 
       IF (PRESENT(output_level_)) THEN
-        CALL cxios_set_file_output_level(file_hdl%daddr, output_level_)
+        CALL cxios_set_file_output_level &
+      (file_hdl%daddr, output_level_)
       ENDIF
 
       IF (PRESENT(par_access_)) THEN
-        CALL cxios_set_file_par_access(file_hdl%daddr, par_access_, len(par_access_))
+        CALL cxios_set_file_par_access &
+      (file_hdl%daddr, par_access_, len(par_access_))
       ENDIF
 
       IF (PRESENT(record_offset_)) THEN
-        CALL cxios_set_file_record_offset(file_hdl%daddr, record_offset_)
+        CALL cxios_set_file_record_offset &
+      (file_hdl%daddr, record_offset_)
       ENDIF
 
       IF (PRESENT(split_freq_)) THEN
-        CALL cxios_set_file_split_freq(file_hdl%daddr, split_freq_)
+        CALL cxios_set_file_split_freq &
+      (file_hdl%daddr, split_freq_)
       ENDIF
 
       IF (PRESENT(split_freq_format_)) THEN
-        CALL cxios_set_file_split_freq_format(file_hdl%daddr, split_freq_format_, len(split_freq_format_))
+        CALL cxios_set_file_split_freq_format &
+      (file_hdl%daddr, split_freq_format_, len(split_freq_format_))
       ENDIF
 
       IF (PRESENT(sync_freq_)) THEN
-        CALL cxios_set_file_sync_freq(file_hdl%daddr, sync_freq_)
+        CALL cxios_set_file_sync_freq &
+      (file_hdl%daddr, sync_freq_)
       ENDIF
 
       IF (PRESENT(time_counter_)) THEN
-        CALL cxios_set_file_time_counter(file_hdl%daddr, time_counter_, len(time_counter_))
+        CALL cxios_set_file_time_counter &
+      (file_hdl%daddr, time_counter_, len(time_counter_))
       ENDIF
 
       IF (PRESENT(time_counter_name_)) THEN
-        CALL cxios_set_file_time_counter_name(file_hdl%daddr, time_counter_name_, len(time_counter_name_))
+        CALL cxios_set_file_time_counter_name &
+      (file_hdl%daddr, time_counter_name_, len(time_counter_name_))
       ENDIF
 
       IF (PRESENT(timeseries_)) THEN
-        CALL cxios_set_file_timeseries(file_hdl%daddr, timeseries_, len(timeseries_))
+        CALL cxios_set_file_timeseries &
+      (file_hdl%daddr, timeseries_, len(timeseries_))
       ENDIF
 
       IF (PRESENT(ts_prefix_)) THEN
-        CALL cxios_set_file_ts_prefix(file_hdl%daddr, ts_prefix_, len(ts_prefix_))
+        CALL cxios_set_file_ts_prefix &
+      (file_hdl%daddr, ts_prefix_, len(ts_prefix_))
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        CALL cxios_set_file_type(file_hdl%daddr, type_, len(type_))
+        CALL cxios_set_file_type &
+      (file_hdl%daddr, type_, len(type_))
       ENDIF
 
@@ -267,5 +291,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type
 
-      CALL xios(get_file_handle)(file_id,file_hdl)
+      CALL xios(get_file_handle) &
+      (file_id,file_hdl)
       CALL xios(get_file_attr_hdl_)   &
       ( file_hdl, append, compression_level, convention, cyclic, description, enabled, format, min_digits  &
@@ -355,96 +380,119 @@
 
       IF (PRESENT(append_)) THEN
-        CALL cxios_get_file_append(file_hdl%daddr, append__tmp)
+        CALL cxios_get_file_append &
+      (file_hdl%daddr, append__tmp)
         append_ = append__tmp
       ENDIF
 
       IF (PRESENT(compression_level_)) THEN
-        CALL cxios_get_file_compression_level(file_hdl%daddr, compression_level_)
+        CALL cxios_get_file_compression_level &
+      (file_hdl%daddr, compression_level_)
       ENDIF
 
       IF (PRESENT(convention_)) THEN
-        CALL cxios_get_file_convention(file_hdl%daddr, convention_, len(convention_))
+        CALL cxios_get_file_convention &
+      (file_hdl%daddr, convention_, len(convention_))
       ENDIF
 
       IF (PRESENT(cyclic_)) THEN
-        CALL cxios_get_file_cyclic(file_hdl%daddr, cyclic__tmp)
+        CALL cxios_get_file_cyclic &
+      (file_hdl%daddr, cyclic__tmp)
         cyclic_ = cyclic__tmp
       ENDIF
 
       IF (PRESENT(description_)) THEN
-        CALL cxios_get_file_description(file_hdl%daddr, description_, len(description_))
+        CALL cxios_get_file_description &
+      (file_hdl%daddr, description_, len(description_))
       ENDIF
 
       IF (PRESENT(enabled_)) THEN
-        CALL cxios_get_file_enabled(file_hdl%daddr, enabled__tmp)
+        CALL cxios_get_file_enabled &
+      (file_hdl%daddr, enabled__tmp)
         enabled_ = enabled__tmp
       ENDIF
 
       IF (PRESENT(format_)) THEN
-        CALL cxios_get_file_format(file_hdl%daddr, format_, len(format_))
+        CALL cxios_get_file_format &
+      (file_hdl%daddr, format_, len(format_))
       ENDIF
 
       IF (PRESENT(min_digits_)) THEN
-        CALL cxios_get_file_min_digits(file_hdl%daddr, min_digits_)
+        CALL cxios_get_file_min_digits &
+      (file_hdl%daddr, min_digits_)
       ENDIF
 
       IF (PRESENT(mode_)) THEN
-        CALL cxios_get_file_mode(file_hdl%daddr, mode_, len(mode_))
+        CALL cxios_get_file_mode &
+      (file_hdl%daddr, mode_, len(mode_))
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_get_file_name(file_hdl%daddr, name_, len(name_))
+        CALL cxios_get_file_name &
+      (file_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(name_suffix_)) THEN
-        CALL cxios_get_file_name_suffix(file_hdl%daddr, name_suffix_, len(name_suffix_))
+        CALL cxios_get_file_name_suffix &
+      (file_hdl%daddr, name_suffix_, len(name_suffix_))
       ENDIF
 
       IF (PRESENT(output_freq_)) THEN
-        CALL cxios_get_file_output_freq(file_hdl%daddr, output_freq_)
+        CALL cxios_get_file_output_freq &
+      (file_hdl%daddr, output_freq_)
       ENDIF
 
       IF (PRESENT(output_level_)) THEN
-        CALL cxios_get_file_output_level(file_hdl%daddr, output_level_)
+        CALL cxios_get_file_output_level &
+      (file_hdl%daddr, output_level_)
       ENDIF
 
       IF (PRESENT(par_access_)) THEN
-        CALL cxios_get_file_par_access(file_hdl%daddr, par_access_, len(par_access_))
+        CALL cxios_get_file_par_access &
+      (file_hdl%daddr, par_access_, len(par_access_))
       ENDIF
 
       IF (PRESENT(record_offset_)) THEN
-        CALL cxios_get_file_record_offset(file_hdl%daddr, record_offset_)
+        CALL cxios_get_file_record_offset &
+      (file_hdl%daddr, record_offset_)
       ENDIF
 
       IF (PRESENT(split_freq_)) THEN
-        CALL cxios_get_file_split_freq(file_hdl%daddr, split_freq_)
+        CALL cxios_get_file_split_freq &
+      (file_hdl%daddr, split_freq_)
       ENDIF
 
       IF (PRESENT(split_freq_format_)) THEN
-        CALL cxios_get_file_split_freq_format(file_hdl%daddr, split_freq_format_, len(split_freq_format_))
+        CALL cxios_get_file_split_freq_format &
+      (file_hdl%daddr, split_freq_format_, len(split_freq_format_))
       ENDIF
 
       IF (PRESENT(sync_freq_)) THEN
-        CALL cxios_get_file_sync_freq(file_hdl%daddr, sync_freq_)
+        CALL cxios_get_file_sync_freq &
+      (file_hdl%daddr, sync_freq_)
       ENDIF
 
       IF (PRESENT(time_counter_)) THEN
-        CALL cxios_get_file_time_counter(file_hdl%daddr, time_counter_, len(time_counter_))
+        CALL cxios_get_file_time_counter &
+      (file_hdl%daddr, time_counter_, len(time_counter_))
       ENDIF
 
       IF (PRESENT(time_counter_name_)) THEN
-        CALL cxios_get_file_time_counter_name(file_hdl%daddr, time_counter_name_, len(time_counter_name_))
+        CALL cxios_get_file_time_counter_name &
+      (file_hdl%daddr, time_counter_name_, len(time_counter_name_))
       ENDIF
 
       IF (PRESENT(timeseries_)) THEN
-        CALL cxios_get_file_timeseries(file_hdl%daddr, timeseries_, len(timeseries_))
+        CALL cxios_get_file_timeseries &
+      (file_hdl%daddr, timeseries_, len(timeseries_))
       ENDIF
 
       IF (PRESENT(ts_prefix_)) THEN
-        CALL cxios_get_file_ts_prefix(file_hdl%daddr, ts_prefix_, len(ts_prefix_))
+        CALL cxios_get_file_ts_prefix &
+      (file_hdl%daddr, ts_prefix_, len(ts_prefix_))
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        CALL cxios_get_file_type(file_hdl%daddr, type_, len(type_))
+        CALL cxios_get_file_type &
+      (file_hdl%daddr, type_, len(type_))
       ENDIF
 
@@ -507,5 +555,6 @@
       LOGICAL(KIND=C_BOOL) :: type_tmp
 
-      CALL xios(get_file_handle)(file_id,file_hdl)
+      CALL xios(get_file_handle) &
+      (file_id,file_hdl)
       CALL xios(is_defined_file_attr_hdl_)   &
       ( file_hdl, append, compression_level, convention, cyclic, description, enabled, format, min_digits  &
@@ -635,115 +684,138 @@
 
       IF (PRESENT(append_)) THEN
-        append__tmp = cxios_is_defined_file_append(file_hdl%daddr)
+        append__tmp = cxios_is_defined_file_append &
+      (file_hdl%daddr)
         append_ = append__tmp
       ENDIF
 
       IF (PRESENT(compression_level_)) THEN
-        compression_level__tmp = cxios_is_defined_file_compression_level(file_hdl%daddr)
+        compression_level__tmp = cxios_is_defined_file_compression_level &
+      (file_hdl%daddr)
         compression_level_ = compression_level__tmp
       ENDIF
 
       IF (PRESENT(convention_)) THEN
-        convention__tmp = cxios_is_defined_file_convention(file_hdl%daddr)
+        convention__tmp = cxios_is_defined_file_convention &
+      (file_hdl%daddr)
         convention_ = convention__tmp
       ENDIF
 
       IF (PRESENT(cyclic_)) THEN
-        cyclic__tmp = cxios_is_defined_file_cyclic(file_hdl%daddr)
+        cyclic__tmp = cxios_is_defined_file_cyclic &
+      (file_hdl%daddr)
         cyclic_ = cyclic__tmp
       ENDIF
 
       IF (PRESENT(description_)) THEN
-        description__tmp = cxios_is_defined_file_description(file_hdl%daddr)
+        description__tmp = cxios_is_defined_file_description &
+      (file_hdl%daddr)
         description_ = description__tmp
       ENDIF
 
       IF (PRESENT(enabled_)) THEN
-        enabled__tmp = cxios_is_defined_file_enabled(file_hdl%daddr)
+        enabled__tmp = cxios_is_defined_file_enabled &
+      (file_hdl%daddr)
         enabled_ = enabled__tmp
       ENDIF
 
       IF (PRESENT(format_)) THEN
-        format__tmp = cxios_is_defined_file_format(file_hdl%daddr)
+        format__tmp = cxios_is_defined_file_format &
+      (file_hdl%daddr)
         format_ = format__tmp
       ENDIF
 
       IF (PRESENT(min_digits_)) THEN
-        min_digits__tmp = cxios_is_defined_file_min_digits(file_hdl%daddr)
+        min_digits__tmp = cxios_is_defined_file_min_digits &
+      (file_hdl%daddr)
         min_digits_ = min_digits__tmp
       ENDIF
 
       IF (PRESENT(mode_)) THEN
-        mode__tmp = cxios_is_defined_file_mode(file_hdl%daddr)
+        mode__tmp = cxios_is_defined_file_mode &
+      (file_hdl%daddr)
         mode_ = mode__tmp
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        name__tmp = cxios_is_defined_file_name(file_hdl%daddr)
+        name__tmp = cxios_is_defined_file_name &
+      (file_hdl%daddr)
         name_ = name__tmp
       ENDIF
 
       IF (PRESENT(name_suffix_)) THEN
-        name_suffix__tmp = cxios_is_defined_file_name_suffix(file_hdl%daddr)
+        name_suffix__tmp = cxios_is_defined_file_name_suffix &
+      (file_hdl%daddr)
         name_suffix_ = name_suffix__tmp
       ENDIF
 
       IF (PRESENT(output_freq_)) THEN
-        output_freq__tmp = cxios_is_defined_file_output_freq(file_hdl%daddr)
+        output_freq__tmp = cxios_is_defined_file_output_freq &
+      (file_hdl%daddr)
         output_freq_ = output_freq__tmp
       ENDIF
 
       IF (PRESENT(output_level_)) THEN
-        output_level__tmp = cxios_is_defined_file_output_level(file_hdl%daddr)
+        output_level__tmp = cxios_is_defined_file_output_level &
+      (file_hdl%daddr)
         output_level_ = output_level__tmp
       ENDIF
 
       IF (PRESENT(par_access_)) THEN
-        par_access__tmp = cxios_is_defined_file_par_access(file_hdl%daddr)
+        par_access__tmp = cxios_is_defined_file_par_access &
+      (file_hdl%daddr)
         par_access_ = par_access__tmp
       ENDIF
 
       IF (PRESENT(record_offset_)) THEN
-        record_offset__tmp = cxios_is_defined_file_record_offset(file_hdl%daddr)
+        record_offset__tmp = cxios_is_defined_file_record_offset &
+      (file_hdl%daddr)
         record_offset_ = record_offset__tmp
       ENDIF
 
       IF (PRESENT(split_freq_)) THEN
-        split_freq__tmp = cxios_is_defined_file_split_freq(file_hdl%daddr)
+        split_freq__tmp = cxios_is_defined_file_split_freq &
+      (file_hdl%daddr)
         split_freq_ = split_freq__tmp
       ENDIF
 
       IF (PRESENT(split_freq_format_)) THEN
-        split_freq_format__tmp = cxios_is_defined_file_split_freq_format(file_hdl%daddr)
+        split_freq_format__tmp = cxios_is_defined_file_split_freq_format &
+      (file_hdl%daddr)
         split_freq_format_ = split_freq_format__tmp
       ENDIF
 
       IF (PRESENT(sync_freq_)) THEN
-        sync_freq__tmp = cxios_is_defined_file_sync_freq(file_hdl%daddr)
+        sync_freq__tmp = cxios_is_defined_file_sync_freq &
+      (file_hdl%daddr)
         sync_freq_ = sync_freq__tmp
       ENDIF
 
       IF (PRESENT(time_counter_)) THEN
-        time_counter__tmp = cxios_is_defined_file_time_counter(file_hdl%daddr)
+        time_counter__tmp = cxios_is_defined_file_time_counter &
+      (file_hdl%daddr)
         time_counter_ = time_counter__tmp
       ENDIF
 
       IF (PRESENT(time_counter_name_)) THEN
-        time_counter_name__tmp = cxios_is_defined_file_time_counter_name(file_hdl%daddr)
+        time_counter_name__tmp = cxios_is_defined_file_time_counter_name &
+      (file_hdl%daddr)
         time_counter_name_ = time_counter_name__tmp
       ENDIF
 
       IF (PRESENT(timeseries_)) THEN
-        timeseries__tmp = cxios_is_defined_file_timeseries(file_hdl%daddr)
+        timeseries__tmp = cxios_is_defined_file_timeseries &
+      (file_hdl%daddr)
         timeseries_ = timeseries__tmp
       ENDIF
 
       IF (PRESENT(ts_prefix_)) THEN
-        ts_prefix__tmp = cxios_is_defined_file_ts_prefix(file_hdl%daddr)
+        ts_prefix__tmp = cxios_is_defined_file_ts_prefix &
+      (file_hdl%daddr)
         ts_prefix_ = ts_prefix__tmp
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        type__tmp = cxios_is_defined_file_type(file_hdl%daddr)
+        type__tmp = cxios_is_defined_file_type &
+      (file_hdl%daddr)
         type_ = type__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/ifilegroup_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/ifilegroup_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/ifilegroup_attr.F90	(revision 966)
@@ -48,5 +48,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type
 
-      CALL xios(get_filegroup_handle)(filegroup_id,filegroup_hdl)
+      CALL xios(get_filegroup_handle) &
+      (filegroup_id,filegroup_hdl)
       CALL xios(set_filegroup_attr_hdl_)   &
       ( filegroup_hdl, append, compression_level, convention, cyclic, description, enabled, format  &
@@ -139,99 +140,123 @@
       IF (PRESENT(append_)) THEN
         append__tmp = append_
-        CALL cxios_set_filegroup_append(filegroup_hdl%daddr, append__tmp)
+        CALL cxios_set_filegroup_append &
+      (filegroup_hdl%daddr, append__tmp)
       ENDIF
 
       IF (PRESENT(compression_level_)) THEN
-        CALL cxios_set_filegroup_compression_level(filegroup_hdl%daddr, compression_level_)
+        CALL cxios_set_filegroup_compression_level &
+      (filegroup_hdl%daddr, compression_level_)
       ENDIF
 
       IF (PRESENT(convention_)) THEN
-        CALL cxios_set_filegroup_convention(filegroup_hdl%daddr, convention_, len(convention_))
+        CALL cxios_set_filegroup_convention &
+      (filegroup_hdl%daddr, convention_, len(convention_))
       ENDIF
 
       IF (PRESENT(cyclic_)) THEN
         cyclic__tmp = cyclic_
-        CALL cxios_set_filegroup_cyclic(filegroup_hdl%daddr, cyclic__tmp)
+        CALL cxios_set_filegroup_cyclic &
+      (filegroup_hdl%daddr, cyclic__tmp)
       ENDIF
 
       IF (PRESENT(description_)) THEN
-        CALL cxios_set_filegroup_description(filegroup_hdl%daddr, description_, len(description_))
+        CALL cxios_set_filegroup_description &
+      (filegroup_hdl%daddr, description_, len(description_))
       ENDIF
 
       IF (PRESENT(enabled_)) THEN
         enabled__tmp = enabled_
-        CALL cxios_set_filegroup_enabled(filegroup_hdl%daddr, enabled__tmp)
+        CALL cxios_set_filegroup_enabled &
+      (filegroup_hdl%daddr, enabled__tmp)
       ENDIF
 
       IF (PRESENT(format_)) THEN
-        CALL cxios_set_filegroup_format(filegroup_hdl%daddr, format_, len(format_))
+        CALL cxios_set_filegroup_format &
+      (filegroup_hdl%daddr, format_, len(format_))
       ENDIF
 
       IF (PRESENT(group_ref_)) THEN
-        CALL cxios_set_filegroup_group_ref(filegroup_hdl%daddr, group_ref_, len(group_ref_))
+        CALL cxios_set_filegroup_group_ref &
+      (filegroup_hdl%daddr, group_ref_, len(group_ref_))
       ENDIF
 
       IF (PRESENT(min_digits_)) THEN
-        CALL cxios_set_filegroup_min_digits(filegroup_hdl%daddr, min_digits_)
+        CALL cxios_set_filegroup_min_digits &
+      (filegroup_hdl%daddr, min_digits_)
       ENDIF
 
       IF (PRESENT(mode_)) THEN
-        CALL cxios_set_filegroup_mode(filegroup_hdl%daddr, mode_, len(mode_))
+        CALL cxios_set_filegroup_mode &
+      (filegroup_hdl%daddr, mode_, len(mode_))
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_set_filegroup_name(filegroup_hdl%daddr, name_, len(name_))
+        CALL cxios_set_filegroup_name &
+      (filegroup_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(name_suffix_)) THEN
-        CALL cxios_set_filegroup_name_suffix(filegroup_hdl%daddr, name_suffix_, len(name_suffix_))
+        CALL cxios_set_filegroup_name_suffix &
+      (filegroup_hdl%daddr, name_suffix_, len(name_suffix_))
       ENDIF
 
       IF (PRESENT(output_freq_)) THEN
-        CALL cxios_set_filegroup_output_freq(filegroup_hdl%daddr, output_freq_)
+        CALL cxios_set_filegroup_output_freq &
+      (filegroup_hdl%daddr, output_freq_)
       ENDIF
 
       IF (PRESENT(output_level_)) THEN
-        CALL cxios_set_filegroup_output_level(filegroup_hdl%daddr, output_level_)
+        CALL cxios_set_filegroup_output_level &
+      (filegroup_hdl%daddr, output_level_)
       ENDIF
 
       IF (PRESENT(par_access_)) THEN
-        CALL cxios_set_filegroup_par_access(filegroup_hdl%daddr, par_access_, len(par_access_))
+        CALL cxios_set_filegroup_par_access &
+      (filegroup_hdl%daddr, par_access_, len(par_access_))
       ENDIF
 
       IF (PRESENT(record_offset_)) THEN
-        CALL cxios_set_filegroup_record_offset(filegroup_hdl%daddr, record_offset_)
+        CALL cxios_set_filegroup_record_offset &
+      (filegroup_hdl%daddr, record_offset_)
       ENDIF
 
       IF (PRESENT(split_freq_)) THEN
-        CALL cxios_set_filegroup_split_freq(filegroup_hdl%daddr, split_freq_)
+        CALL cxios_set_filegroup_split_freq &
+      (filegroup_hdl%daddr, split_freq_)
       ENDIF
 
       IF (PRESENT(split_freq_format_)) THEN
-        CALL cxios_set_filegroup_split_freq_format(filegroup_hdl%daddr, split_freq_format_, len(split_freq_format_))
+        CALL cxios_set_filegroup_split_freq_format &
+      (filegroup_hdl%daddr, split_freq_format_, len(split_freq_format_))
       ENDIF
 
       IF (PRESENT(sync_freq_)) THEN
-        CALL cxios_set_filegroup_sync_freq(filegroup_hdl%daddr, sync_freq_)
+        CALL cxios_set_filegroup_sync_freq &
+      (filegroup_hdl%daddr, sync_freq_)
       ENDIF
 
       IF (PRESENT(time_counter_)) THEN
-        CALL cxios_set_filegroup_time_counter(filegroup_hdl%daddr, time_counter_, len(time_counter_))
+        CALL cxios_set_filegroup_time_counter &
+      (filegroup_hdl%daddr, time_counter_, len(time_counter_))
       ENDIF
 
       IF (PRESENT(time_counter_name_)) THEN
-        CALL cxios_set_filegroup_time_counter_name(filegroup_hdl%daddr, time_counter_name_, len(time_counter_name_))
+        CALL cxios_set_filegroup_time_counter_name &
+      (filegroup_hdl%daddr, time_counter_name_, len(time_counter_name_))
       ENDIF
 
       IF (PRESENT(timeseries_)) THEN
-        CALL cxios_set_filegroup_timeseries(filegroup_hdl%daddr, timeseries_, len(timeseries_))
+        CALL cxios_set_filegroup_timeseries &
+      (filegroup_hdl%daddr, timeseries_, len(timeseries_))
       ENDIF
 
       IF (PRESENT(ts_prefix_)) THEN
-        CALL cxios_set_filegroup_ts_prefix(filegroup_hdl%daddr, ts_prefix_, len(ts_prefix_))
+        CALL cxios_set_filegroup_ts_prefix &
+      (filegroup_hdl%daddr, ts_prefix_, len(ts_prefix_))
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        CALL cxios_set_filegroup_type(filegroup_hdl%daddr, type_, len(type_))
+        CALL cxios_set_filegroup_type &
+      (filegroup_hdl%daddr, type_, len(type_))
       ENDIF
 
@@ -275,5 +300,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type
 
-      CALL xios(get_filegroup_handle)(filegroup_id,filegroup_hdl)
+      CALL xios(get_filegroup_handle) &
+      (filegroup_id,filegroup_hdl)
       CALL xios(get_filegroup_attr_hdl_)   &
       ( filegroup_hdl, append, compression_level, convention, cyclic, description, enabled, format  &
@@ -365,100 +391,124 @@
 
       IF (PRESENT(append_)) THEN
-        CALL cxios_get_filegroup_append(filegroup_hdl%daddr, append__tmp)
+        CALL cxios_get_filegroup_append &
+      (filegroup_hdl%daddr, append__tmp)
         append_ = append__tmp
       ENDIF
 
       IF (PRESENT(compression_level_)) THEN
-        CALL cxios_get_filegroup_compression_level(filegroup_hdl%daddr, compression_level_)
+        CALL cxios_get_filegroup_compression_level &
+      (filegroup_hdl%daddr, compression_level_)
       ENDIF
 
       IF (PRESENT(convention_)) THEN
-        CALL cxios_get_filegroup_convention(filegroup_hdl%daddr, convention_, len(convention_))
+        CALL cxios_get_filegroup_convention &
+      (filegroup_hdl%daddr, convention_, len(convention_))
       ENDIF
 
       IF (PRESENT(cyclic_)) THEN
-        CALL cxios_get_filegroup_cyclic(filegroup_hdl%daddr, cyclic__tmp)
+        CALL cxios_get_filegroup_cyclic &
+      (filegroup_hdl%daddr, cyclic__tmp)
         cyclic_ = cyclic__tmp
       ENDIF
 
       IF (PRESENT(description_)) THEN
-        CALL cxios_get_filegroup_description(filegroup_hdl%daddr, description_, len(description_))
+        CALL cxios_get_filegroup_description &
+      (filegroup_hdl%daddr, description_, len(description_))
       ENDIF
 
       IF (PRESENT(enabled_)) THEN
-        CALL cxios_get_filegroup_enabled(filegroup_hdl%daddr, enabled__tmp)
+        CALL cxios_get_filegroup_enabled &
+      (filegroup_hdl%daddr, enabled__tmp)
         enabled_ = enabled__tmp
       ENDIF
 
       IF (PRESENT(format_)) THEN
-        CALL cxios_get_filegroup_format(filegroup_hdl%daddr, format_, len(format_))
+        CALL cxios_get_filegroup_format &
+      (filegroup_hdl%daddr, format_, len(format_))
       ENDIF
 
       IF (PRESENT(group_ref_)) THEN
-        CALL cxios_get_filegroup_group_ref(filegroup_hdl%daddr, group_ref_, len(group_ref_))
+        CALL cxios_get_filegroup_group_ref &
+      (filegroup_hdl%daddr, group_ref_, len(group_ref_))
       ENDIF
 
       IF (PRESENT(min_digits_)) THEN
-        CALL cxios_get_filegroup_min_digits(filegroup_hdl%daddr, min_digits_)
+        CALL cxios_get_filegroup_min_digits &
+      (filegroup_hdl%daddr, min_digits_)
       ENDIF
 
       IF (PRESENT(mode_)) THEN
-        CALL cxios_get_filegroup_mode(filegroup_hdl%daddr, mode_, len(mode_))
+        CALL cxios_get_filegroup_mode &
+      (filegroup_hdl%daddr, mode_, len(mode_))
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_get_filegroup_name(filegroup_hdl%daddr, name_, len(name_))
+        CALL cxios_get_filegroup_name &
+      (filegroup_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(name_suffix_)) THEN
-        CALL cxios_get_filegroup_name_suffix(filegroup_hdl%daddr, name_suffix_, len(name_suffix_))
+        CALL cxios_get_filegroup_name_suffix &
+      (filegroup_hdl%daddr, name_suffix_, len(name_suffix_))
       ENDIF
 
       IF (PRESENT(output_freq_)) THEN
-        CALL cxios_get_filegroup_output_freq(filegroup_hdl%daddr, output_freq_)
+        CALL cxios_get_filegroup_output_freq &
+      (filegroup_hdl%daddr, output_freq_)
       ENDIF
 
       IF (PRESENT(output_level_)) THEN
-        CALL cxios_get_filegroup_output_level(filegroup_hdl%daddr, output_level_)
+        CALL cxios_get_filegroup_output_level &
+      (filegroup_hdl%daddr, output_level_)
       ENDIF
 
       IF (PRESENT(par_access_)) THEN
-        CALL cxios_get_filegroup_par_access(filegroup_hdl%daddr, par_access_, len(par_access_))
+        CALL cxios_get_filegroup_par_access &
+      (filegroup_hdl%daddr, par_access_, len(par_access_))
       ENDIF
 
       IF (PRESENT(record_offset_)) THEN
-        CALL cxios_get_filegroup_record_offset(filegroup_hdl%daddr, record_offset_)
+        CALL cxios_get_filegroup_record_offset &
+      (filegroup_hdl%daddr, record_offset_)
       ENDIF
 
       IF (PRESENT(split_freq_)) THEN
-        CALL cxios_get_filegroup_split_freq(filegroup_hdl%daddr, split_freq_)
+        CALL cxios_get_filegroup_split_freq &
+      (filegroup_hdl%daddr, split_freq_)
       ENDIF
 
       IF (PRESENT(split_freq_format_)) THEN
-        CALL cxios_get_filegroup_split_freq_format(filegroup_hdl%daddr, split_freq_format_, len(split_freq_format_))
+        CALL cxios_get_filegroup_split_freq_format &
+      (filegroup_hdl%daddr, split_freq_format_, len(split_freq_format_))
       ENDIF
 
       IF (PRESENT(sync_freq_)) THEN
-        CALL cxios_get_filegroup_sync_freq(filegroup_hdl%daddr, sync_freq_)
+        CALL cxios_get_filegroup_sync_freq &
+      (filegroup_hdl%daddr, sync_freq_)
       ENDIF
 
       IF (PRESENT(time_counter_)) THEN
-        CALL cxios_get_filegroup_time_counter(filegroup_hdl%daddr, time_counter_, len(time_counter_))
+        CALL cxios_get_filegroup_time_counter &
+      (filegroup_hdl%daddr, time_counter_, len(time_counter_))
       ENDIF
 
       IF (PRESENT(time_counter_name_)) THEN
-        CALL cxios_get_filegroup_time_counter_name(filegroup_hdl%daddr, time_counter_name_, len(time_counter_name_))
+        CALL cxios_get_filegroup_time_counter_name &
+      (filegroup_hdl%daddr, time_counter_name_, len(time_counter_name_))
       ENDIF
 
       IF (PRESENT(timeseries_)) THEN
-        CALL cxios_get_filegroup_timeseries(filegroup_hdl%daddr, timeseries_, len(timeseries_))
+        CALL cxios_get_filegroup_timeseries &
+      (filegroup_hdl%daddr, timeseries_, len(timeseries_))
       ENDIF
 
       IF (PRESENT(ts_prefix_)) THEN
-        CALL cxios_get_filegroup_ts_prefix(filegroup_hdl%daddr, ts_prefix_, len(ts_prefix_))
+        CALL cxios_get_filegroup_ts_prefix &
+      (filegroup_hdl%daddr, ts_prefix_, len(ts_prefix_))
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        CALL cxios_get_filegroup_type(filegroup_hdl%daddr, type_, len(type_))
+        CALL cxios_get_filegroup_type &
+      (filegroup_hdl%daddr, type_, len(type_))
       ENDIF
 
@@ -523,5 +573,6 @@
       LOGICAL(KIND=C_BOOL) :: type_tmp
 
-      CALL xios(get_filegroup_handle)(filegroup_id,filegroup_hdl)
+      CALL xios(get_filegroup_handle) &
+      (filegroup_id,filegroup_hdl)
       CALL xios(is_defined_filegroup_attr_hdl_)   &
       ( filegroup_hdl, append, compression_level, convention, cyclic, description, enabled, format  &
@@ -655,120 +706,144 @@
 
       IF (PRESENT(append_)) THEN
-        append__tmp = cxios_is_defined_filegroup_append(filegroup_hdl%daddr)
+        append__tmp = cxios_is_defined_filegroup_append &
+      (filegroup_hdl%daddr)
         append_ = append__tmp
       ENDIF
 
       IF (PRESENT(compression_level_)) THEN
-        compression_level__tmp = cxios_is_defined_filegroup_compression_level(filegroup_hdl%daddr)
+        compression_level__tmp = cxios_is_defined_filegroup_compression_level &
+      (filegroup_hdl%daddr)
         compression_level_ = compression_level__tmp
       ENDIF
 
       IF (PRESENT(convention_)) THEN
-        convention__tmp = cxios_is_defined_filegroup_convention(filegroup_hdl%daddr)
+        convention__tmp = cxios_is_defined_filegroup_convention &
+      (filegroup_hdl%daddr)
         convention_ = convention__tmp
       ENDIF
 
       IF (PRESENT(cyclic_)) THEN
-        cyclic__tmp = cxios_is_defined_filegroup_cyclic(filegroup_hdl%daddr)
+        cyclic__tmp = cxios_is_defined_filegroup_cyclic &
+      (filegroup_hdl%daddr)
         cyclic_ = cyclic__tmp
       ENDIF
 
       IF (PRESENT(description_)) THEN
-        description__tmp = cxios_is_defined_filegroup_description(filegroup_hdl%daddr)
+        description__tmp = cxios_is_defined_filegroup_description &
+      (filegroup_hdl%daddr)
         description_ = description__tmp
       ENDIF
 
       IF (PRESENT(enabled_)) THEN
-        enabled__tmp = cxios_is_defined_filegroup_enabled(filegroup_hdl%daddr)
+        enabled__tmp = cxios_is_defined_filegroup_enabled &
+      (filegroup_hdl%daddr)
         enabled_ = enabled__tmp
       ENDIF
 
       IF (PRESENT(format_)) THEN
-        format__tmp = cxios_is_defined_filegroup_format(filegroup_hdl%daddr)
+        format__tmp = cxios_is_defined_filegroup_format &
+      (filegroup_hdl%daddr)
         format_ = format__tmp
       ENDIF
 
       IF (PRESENT(group_ref_)) THEN
-        group_ref__tmp = cxios_is_defined_filegroup_group_ref(filegroup_hdl%daddr)
+        group_ref__tmp = cxios_is_defined_filegroup_group_ref &
+      (filegroup_hdl%daddr)
         group_ref_ = group_ref__tmp
       ENDIF
 
       IF (PRESENT(min_digits_)) THEN
-        min_digits__tmp = cxios_is_defined_filegroup_min_digits(filegroup_hdl%daddr)
+        min_digits__tmp = cxios_is_defined_filegroup_min_digits &
+      (filegroup_hdl%daddr)
         min_digits_ = min_digits__tmp
       ENDIF
 
       IF (PRESENT(mode_)) THEN
-        mode__tmp = cxios_is_defined_filegroup_mode(filegroup_hdl%daddr)
+        mode__tmp = cxios_is_defined_filegroup_mode &
+      (filegroup_hdl%daddr)
         mode_ = mode__tmp
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        name__tmp = cxios_is_defined_filegroup_name(filegroup_hdl%daddr)
+        name__tmp = cxios_is_defined_filegroup_name &
+      (filegroup_hdl%daddr)
         name_ = name__tmp
       ENDIF
 
       IF (PRESENT(name_suffix_)) THEN
-        name_suffix__tmp = cxios_is_defined_filegroup_name_suffix(filegroup_hdl%daddr)
+        name_suffix__tmp = cxios_is_defined_filegroup_name_suffix &
+      (filegroup_hdl%daddr)
         name_suffix_ = name_suffix__tmp
       ENDIF
 
       IF (PRESENT(output_freq_)) THEN
-        output_freq__tmp = cxios_is_defined_filegroup_output_freq(filegroup_hdl%daddr)
+        output_freq__tmp = cxios_is_defined_filegroup_output_freq &
+      (filegroup_hdl%daddr)
         output_freq_ = output_freq__tmp
       ENDIF
 
       IF (PRESENT(output_level_)) THEN
-        output_level__tmp = cxios_is_defined_filegroup_output_level(filegroup_hdl%daddr)
+        output_level__tmp = cxios_is_defined_filegroup_output_level &
+      (filegroup_hdl%daddr)
         output_level_ = output_level__tmp
       ENDIF
 
       IF (PRESENT(par_access_)) THEN
-        par_access__tmp = cxios_is_defined_filegroup_par_access(filegroup_hdl%daddr)
+        par_access__tmp = cxios_is_defined_filegroup_par_access &
+      (filegroup_hdl%daddr)
         par_access_ = par_access__tmp
       ENDIF
 
       IF (PRESENT(record_offset_)) THEN
-        record_offset__tmp = cxios_is_defined_filegroup_record_offset(filegroup_hdl%daddr)
+        record_offset__tmp = cxios_is_defined_filegroup_record_offset &
+      (filegroup_hdl%daddr)
         record_offset_ = record_offset__tmp
       ENDIF
 
       IF (PRESENT(split_freq_)) THEN
-        split_freq__tmp = cxios_is_defined_filegroup_split_freq(filegroup_hdl%daddr)
+        split_freq__tmp = cxios_is_defined_filegroup_split_freq &
+      (filegroup_hdl%daddr)
         split_freq_ = split_freq__tmp
       ENDIF
 
       IF (PRESENT(split_freq_format_)) THEN
-        split_freq_format__tmp = cxios_is_defined_filegroup_split_freq_format(filegroup_hdl%daddr)
+        split_freq_format__tmp = cxios_is_defined_filegroup_split_freq_format &
+      (filegroup_hdl%daddr)
         split_freq_format_ = split_freq_format__tmp
       ENDIF
 
       IF (PRESENT(sync_freq_)) THEN
-        sync_freq__tmp = cxios_is_defined_filegroup_sync_freq(filegroup_hdl%daddr)
+        sync_freq__tmp = cxios_is_defined_filegroup_sync_freq &
+      (filegroup_hdl%daddr)
         sync_freq_ = sync_freq__tmp
       ENDIF
 
       IF (PRESENT(time_counter_)) THEN
-        time_counter__tmp = cxios_is_defined_filegroup_time_counter(filegroup_hdl%daddr)
+        time_counter__tmp = cxios_is_defined_filegroup_time_counter &
+      (filegroup_hdl%daddr)
         time_counter_ = time_counter__tmp
       ENDIF
 
       IF (PRESENT(time_counter_name_)) THEN
-        time_counter_name__tmp = cxios_is_defined_filegroup_time_counter_name(filegroup_hdl%daddr)
+        time_counter_name__tmp = cxios_is_defined_filegroup_time_counter_name &
+      (filegroup_hdl%daddr)
         time_counter_name_ = time_counter_name__tmp
       ENDIF
 
       IF (PRESENT(timeseries_)) THEN
-        timeseries__tmp = cxios_is_defined_filegroup_timeseries(filegroup_hdl%daddr)
+        timeseries__tmp = cxios_is_defined_filegroup_timeseries &
+      (filegroup_hdl%daddr)
         timeseries_ = timeseries__tmp
       ENDIF
 
       IF (PRESENT(ts_prefix_)) THEN
-        ts_prefix__tmp = cxios_is_defined_filegroup_ts_prefix(filegroup_hdl%daddr)
+        ts_prefix__tmp = cxios_is_defined_filegroup_ts_prefix &
+      (filegroup_hdl%daddr)
         ts_prefix_ = ts_prefix__tmp
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        type__tmp = cxios_is_defined_filegroup_type(filegroup_hdl%daddr)
+        type__tmp = cxios_is_defined_filegroup_type &
+      (filegroup_hdl%daddr)
         type_ = type__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/igenerate_rectilinear_domain_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/igenerate_rectilinear_domain_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/igenerate_rectilinear_domain_attr.F90	(revision 966)
@@ -27,5 +27,6 @@
       REAL (KIND=8) , OPTIONAL, INTENT(IN) :: lon_start
 
-      CALL xios(get_generate_rectilinear_domain_handle)(generate_rectilinear_domain_id,generate_rectilinear_domain_hdl)
+      CALL xios(get_generate_rectilinear_domain_handle) &
+      (generate_rectilinear_domain_id,generate_rectilinear_domain_hdl)
       CALL xios(set_generate_rectilinear_domain_attr_hdl_)   &
       ( generate_rectilinear_domain_hdl, bounds_lat_end, bounds_lat_start, bounds_lon_end, bounds_lon_start  &
@@ -71,33 +72,41 @@
 
       IF (PRESENT(bounds_lat_end_)) THEN
-        CALL cxios_set_generate_rectilinear_domain_bounds_lat_end(generate_rectilinear_domain_hdl%daddr, bounds_lat_end_)
+        CALL cxios_set_generate_rectilinear_domain_bounds_lat_end &
+      (generate_rectilinear_domain_hdl%daddr, bounds_lat_end_)
       ENDIF
 
       IF (PRESENT(bounds_lat_start_)) THEN
-        CALL cxios_set_generate_rectilinear_domain_bounds_lat_start(generate_rectilinear_domain_hdl%daddr, bounds_lat_start_)
+        CALL cxios_set_generate_rectilinear_domain_bounds_lat_start &
+      (generate_rectilinear_domain_hdl%daddr, bounds_lat_start_)
       ENDIF
 
       IF (PRESENT(bounds_lon_end_)) THEN
-        CALL cxios_set_generate_rectilinear_domain_bounds_lon_end(generate_rectilinear_domain_hdl%daddr, bounds_lon_end_)
+        CALL cxios_set_generate_rectilinear_domain_bounds_lon_end &
+      (generate_rectilinear_domain_hdl%daddr, bounds_lon_end_)
       ENDIF
 
       IF (PRESENT(bounds_lon_start_)) THEN
-        CALL cxios_set_generate_rectilinear_domain_bounds_lon_start(generate_rectilinear_domain_hdl%daddr, bounds_lon_start_)
+        CALL cxios_set_generate_rectilinear_domain_bounds_lon_start &
+      (generate_rectilinear_domain_hdl%daddr, bounds_lon_start_)
       ENDIF
 
       IF (PRESENT(lat_end_)) THEN
-        CALL cxios_set_generate_rectilinear_domain_lat_end(generate_rectilinear_domain_hdl%daddr, lat_end_)
+        CALL cxios_set_generate_rectilinear_domain_lat_end &
+      (generate_rectilinear_domain_hdl%daddr, lat_end_)
       ENDIF
 
       IF (PRESENT(lat_start_)) THEN
-        CALL cxios_set_generate_rectilinear_domain_lat_start(generate_rectilinear_domain_hdl%daddr, lat_start_)
+        CALL cxios_set_generate_rectilinear_domain_lat_start &
+      (generate_rectilinear_domain_hdl%daddr, lat_start_)
       ENDIF
 
       IF (PRESENT(lon_end_)) THEN
-        CALL cxios_set_generate_rectilinear_domain_lon_end(generate_rectilinear_domain_hdl%daddr, lon_end_)
+        CALL cxios_set_generate_rectilinear_domain_lon_end &
+      (generate_rectilinear_domain_hdl%daddr, lon_end_)
       ENDIF
 
       IF (PRESENT(lon_start_)) THEN
-        CALL cxios_set_generate_rectilinear_domain_lon_start(generate_rectilinear_domain_hdl%daddr, lon_start_)
+        CALL cxios_set_generate_rectilinear_domain_lon_start &
+      (generate_rectilinear_domain_hdl%daddr, lon_start_)
       ENDIF
 
@@ -120,5 +129,6 @@
       REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: lon_start
 
-      CALL xios(get_generate_rectilinear_domain_handle)(generate_rectilinear_domain_id,generate_rectilinear_domain_hdl)
+      CALL xios(get_generate_rectilinear_domain_handle) &
+      (generate_rectilinear_domain_id,generate_rectilinear_domain_hdl)
       CALL xios(get_generate_rectilinear_domain_attr_hdl_)   &
       ( generate_rectilinear_domain_hdl, bounds_lat_end, bounds_lat_start, bounds_lon_end, bounds_lon_start  &
@@ -164,33 +174,41 @@
 
       IF (PRESENT(bounds_lat_end_)) THEN
-        CALL cxios_get_generate_rectilinear_domain_bounds_lat_end(generate_rectilinear_domain_hdl%daddr, bounds_lat_end_)
+        CALL cxios_get_generate_rectilinear_domain_bounds_lat_end &
+      (generate_rectilinear_domain_hdl%daddr, bounds_lat_end_)
       ENDIF
 
       IF (PRESENT(bounds_lat_start_)) THEN
-        CALL cxios_get_generate_rectilinear_domain_bounds_lat_start(generate_rectilinear_domain_hdl%daddr, bounds_lat_start_)
+        CALL cxios_get_generate_rectilinear_domain_bounds_lat_start &
+      (generate_rectilinear_domain_hdl%daddr, bounds_lat_start_)
       ENDIF
 
       IF (PRESENT(bounds_lon_end_)) THEN
-        CALL cxios_get_generate_rectilinear_domain_bounds_lon_end(generate_rectilinear_domain_hdl%daddr, bounds_lon_end_)
+        CALL cxios_get_generate_rectilinear_domain_bounds_lon_end &
+      (generate_rectilinear_domain_hdl%daddr, bounds_lon_end_)
       ENDIF
 
       IF (PRESENT(bounds_lon_start_)) THEN
-        CALL cxios_get_generate_rectilinear_domain_bounds_lon_start(generate_rectilinear_domain_hdl%daddr, bounds_lon_start_)
+        CALL cxios_get_generate_rectilinear_domain_bounds_lon_start &
+      (generate_rectilinear_domain_hdl%daddr, bounds_lon_start_)
       ENDIF
 
       IF (PRESENT(lat_end_)) THEN
-        CALL cxios_get_generate_rectilinear_domain_lat_end(generate_rectilinear_domain_hdl%daddr, lat_end_)
+        CALL cxios_get_generate_rectilinear_domain_lat_end &
+      (generate_rectilinear_domain_hdl%daddr, lat_end_)
       ENDIF
 
       IF (PRESENT(lat_start_)) THEN
-        CALL cxios_get_generate_rectilinear_domain_lat_start(generate_rectilinear_domain_hdl%daddr, lat_start_)
+        CALL cxios_get_generate_rectilinear_domain_lat_start &
+      (generate_rectilinear_domain_hdl%daddr, lat_start_)
       ENDIF
 
       IF (PRESENT(lon_end_)) THEN
-        CALL cxios_get_generate_rectilinear_domain_lon_end(generate_rectilinear_domain_hdl%daddr, lon_end_)
+        CALL cxios_get_generate_rectilinear_domain_lon_end &
+      (generate_rectilinear_domain_hdl%daddr, lon_end_)
       ENDIF
 
       IF (PRESENT(lon_start_)) THEN
-        CALL cxios_get_generate_rectilinear_domain_lon_start(generate_rectilinear_domain_hdl%daddr, lon_start_)
+        CALL cxios_get_generate_rectilinear_domain_lon_start &
+      (generate_rectilinear_domain_hdl%daddr, lon_start_)
       ENDIF
 
@@ -221,5 +239,6 @@
       LOGICAL(KIND=C_BOOL) :: lon_start_tmp
 
-      CALL xios(get_generate_rectilinear_domain_handle)(generate_rectilinear_domain_id,generate_rectilinear_domain_hdl)
+      CALL xios(get_generate_rectilinear_domain_handle) &
+      (generate_rectilinear_domain_id,generate_rectilinear_domain_hdl)
       CALL xios(is_defined_generate_rectilinear_domain_attr_hdl_)   &
       ( generate_rectilinear_domain_hdl, bounds_lat_end, bounds_lat_start, bounds_lon_end, bounds_lon_start  &
@@ -281,40 +300,48 @@
 
       IF (PRESENT(bounds_lat_end_)) THEN
-        bounds_lat_end__tmp = cxios_is_defined_generate_rectilinear_domain_bounds_lat_end(generate_rectilinear_domain_hdl%daddr)
+        bounds_lat_end__tmp = cxios_is_defined_generate_rectilinear_domain_bounds_lat_end &
+      (generate_rectilinear_domain_hdl%daddr)
         bounds_lat_end_ = bounds_lat_end__tmp
       ENDIF
 
       IF (PRESENT(bounds_lat_start_)) THEN
-        bounds_lat_start__tmp = cxios_is_defined_generate_rectilinear_domain_bounds_lat_start(generate_rectilinear_domain_hdl%daddr)
+        bounds_lat_start__tmp = cxios_is_defined_generate_rectilinear_domain_bounds_lat_start &
+      (generate_rectilinear_domain_hdl%daddr)
         bounds_lat_start_ = bounds_lat_start__tmp
       ENDIF
 
       IF (PRESENT(bounds_lon_end_)) THEN
-        bounds_lon_end__tmp = cxios_is_defined_generate_rectilinear_domain_bounds_lon_end(generate_rectilinear_domain_hdl%daddr)
+        bounds_lon_end__tmp = cxios_is_defined_generate_rectilinear_domain_bounds_lon_end &
+      (generate_rectilinear_domain_hdl%daddr)
         bounds_lon_end_ = bounds_lon_end__tmp
       ENDIF
 
       IF (PRESENT(bounds_lon_start_)) THEN
-        bounds_lon_start__tmp = cxios_is_defined_generate_rectilinear_domain_bounds_lon_start(generate_rectilinear_domain_hdl%daddr)
+        bounds_lon_start__tmp = cxios_is_defined_generate_rectilinear_domain_bounds_lon_start &
+      (generate_rectilinear_domain_hdl%daddr)
         bounds_lon_start_ = bounds_lon_start__tmp
       ENDIF
 
       IF (PRESENT(lat_end_)) THEN
-        lat_end__tmp = cxios_is_defined_generate_rectilinear_domain_lat_end(generate_rectilinear_domain_hdl%daddr)
+        lat_end__tmp = cxios_is_defined_generate_rectilinear_domain_lat_end &
+      (generate_rectilinear_domain_hdl%daddr)
         lat_end_ = lat_end__tmp
       ENDIF
 
       IF (PRESENT(lat_start_)) THEN
-        lat_start__tmp = cxios_is_defined_generate_rectilinear_domain_lat_start(generate_rectilinear_domain_hdl%daddr)
+        lat_start__tmp = cxios_is_defined_generate_rectilinear_domain_lat_start &
+      (generate_rectilinear_domain_hdl%daddr)
         lat_start_ = lat_start__tmp
       ENDIF
 
       IF (PRESENT(lon_end_)) THEN
-        lon_end__tmp = cxios_is_defined_generate_rectilinear_domain_lon_end(generate_rectilinear_domain_hdl%daddr)
+        lon_end__tmp = cxios_is_defined_generate_rectilinear_domain_lon_end &
+      (generate_rectilinear_domain_hdl%daddr)
         lon_end_ = lon_end__tmp
       ENDIF
 
       IF (PRESENT(lon_start_)) THEN
-        lon_start__tmp = cxios_is_defined_generate_rectilinear_domain_lon_start(generate_rectilinear_domain_hdl%daddr)
+        lon_start__tmp = cxios_is_defined_generate_rectilinear_domain_lon_start &
+      (generate_rectilinear_domain_hdl%daddr)
         lon_start_ = lon_start__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/igrid_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/igrid_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/igrid_attr.F90	(revision 966)
@@ -35,5 +35,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name
 
-      CALL xios(get_grid_handle)(grid_id,grid_hdl)
+      CALL xios(get_grid_handle) &
+      (grid_id,grid_hdl)
       CALL xios(set_grid_attr_hdl_)   &
       ( grid_hdl, description, mask_1d, mask_2d, mask_3d, mask_4d, mask_5d, mask_6d, mask_7d, name  &
@@ -95,5 +96,6 @@
 
       IF (PRESENT(description_)) THEN
-        CALL cxios_set_grid_description(grid_hdl%daddr, description_, len(description_))
+        CALL cxios_set_grid_description &
+      (grid_hdl%daddr, description_, len(description_))
       ENDIF
 
@@ -101,5 +103,6 @@
         ALLOCATE(mask_1d__tmp(SIZE(mask_1d_,1)))
         mask_1d__tmp = mask_1d_
-        CALL cxios_set_grid_mask_1d(grid_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_))
+        CALL cxios_set_grid_mask_1d &
+      (grid_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_))
       ENDIF
 
@@ -107,5 +110,6 @@
         ALLOCATE(mask_2d__tmp(SIZE(mask_2d_,1), SIZE(mask_2d_,2)))
         mask_2d__tmp = mask_2d_
-        CALL cxios_set_grid_mask_2d(grid_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_))
+        CALL cxios_set_grid_mask_2d &
+      (grid_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_))
       ENDIF
 
@@ -113,33 +117,44 @@
         ALLOCATE(mask_3d__tmp(SIZE(mask_3d_,1), SIZE(mask_3d_,2), SIZE(mask_3d_,3)))
         mask_3d__tmp = mask_3d_
-        CALL cxios_set_grid_mask_3d(grid_hdl%daddr, mask_3d__tmp, SHAPE(mask_3d_))
+        CALL cxios_set_grid_mask_3d &
+      (grid_hdl%daddr, mask_3d__tmp, SHAPE(mask_3d_))
       ENDIF
 
       IF (PRESENT(mask_4d_)) THEN
-        ALLOCATE(mask_4d__tmp(SIZE(mask_4d_,1), SIZE(mask_4d_,2), SIZE(mask_4d_,3), SIZE(mask_4d_,4)))
+        ALLOCATE(mask_4d__tmp(SIZE(mask_4d_,1), SIZE(mask_4d_,2), SIZE(mask_4d_,3), &
+       SIZE(mask_4d_,4)))
         mask_4d__tmp = mask_4d_
-        CALL cxios_set_grid_mask_4d(grid_hdl%daddr, mask_4d__tmp, SHAPE(mask_4d_))
+        CALL cxios_set_grid_mask_4d &
+      (grid_hdl%daddr, mask_4d__tmp, SHAPE(mask_4d_))
       ENDIF
 
       IF (PRESENT(mask_5d_)) THEN
-        ALLOCATE(mask_5d__tmp(SIZE(mask_5d_,1), SIZE(mask_5d_,2), SIZE(mask_5d_,3), SIZE(mask_5d_,4), SIZE(mask_5d_,5)))
+        ALLOCATE(mask_5d__tmp(SIZE(mask_5d_,1), SIZE(mask_5d_,2), SIZE(mask_5d_,3), &
+       SIZE(mask_5d_,4), SIZE(mask_5d_,5)))
         mask_5d__tmp = mask_5d_
-        CALL cxios_set_grid_mask_5d(grid_hdl%daddr, mask_5d__tmp, SHAPE(mask_5d_))
+        CALL cxios_set_grid_mask_5d &
+      (grid_hdl%daddr, mask_5d__tmp, SHAPE(mask_5d_))
       ENDIF
 
       IF (PRESENT(mask_6d_)) THEN
-        ALLOCATE(mask_6d__tmp(SIZE(mask_6d_,1), SIZE(mask_6d_,2), SIZE(mask_6d_,3), SIZE(mask_6d_,4), SIZE(mask_6d_,5), SIZE(mask_6d_,6)))
+        ALLOCATE(mask_6d__tmp(SIZE(mask_6d_,1), SIZE(mask_6d_,2), SIZE(mask_6d_,3), &
+       SIZE(mask_6d_,4), SIZE(mask_6d_,5), SIZE(mask_6d_,6)))
         mask_6d__tmp = mask_6d_
-        CALL cxios_set_grid_mask_6d(grid_hdl%daddr, mask_6d__tmp, SHAPE(mask_6d_))
+        CALL cxios_set_grid_mask_6d &
+      (grid_hdl%daddr, mask_6d__tmp, SHAPE(mask_6d_))
       ENDIF
 
       IF (PRESENT(mask_7d_)) THEN
-        ALLOCATE(mask_7d__tmp(SIZE(mask_7d_,1), SIZE(mask_7d_,2), SIZE(mask_7d_,3), SIZE(mask_7d_,4), SIZE(mask_7d_,5), SIZE(mask_7d_,6), SIZE(mask_7d_,7)))
+        ALLOCATE(mask_7d__tmp(SIZE(mask_7d_,1), SIZE(mask_7d_,2), SIZE(mask_7d_,3), &
+       SIZE(mask_7d_,4), SIZE(mask_7d_,5), SIZE(mask_7d_,6), &
+       SIZE(mask_7d_,7)))
         mask_7d__tmp = mask_7d_
-        CALL cxios_set_grid_mask_7d(grid_hdl%daddr, mask_7d__tmp, SHAPE(mask_7d_))
+        CALL cxios_set_grid_mask_7d &
+      (grid_hdl%daddr, mask_7d__tmp, SHAPE(mask_7d_))
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_set_grid_name(grid_hdl%daddr, name_, len(name_))
+        CALL cxios_set_grid_name &
+      (grid_hdl%daddr, name_, len(name_))
       ENDIF
 
@@ -170,5 +185,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name
 
-      CALL xios(get_grid_handle)(grid_id,grid_hdl)
+      CALL xios(get_grid_handle) &
+      (grid_id,grid_hdl)
       CALL xios(get_grid_attr_hdl_)   &
       ( grid_hdl, description, mask_1d, mask_2d, mask_3d, mask_4d, mask_5d, mask_6d, mask_7d, name  &
@@ -230,10 +246,12 @@
 
       IF (PRESENT(description_)) THEN
-        CALL cxios_get_grid_description(grid_hdl%daddr, description_, len(description_))
+        CALL cxios_get_grid_description &
+      (grid_hdl%daddr, description_, len(description_))
       ENDIF
 
       IF (PRESENT(mask_1d_)) THEN
         ALLOCATE(mask_1d__tmp(SIZE(mask_1d_,1)))
-        CALL cxios_get_grid_mask_1d(grid_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_))
+        CALL cxios_get_grid_mask_1d &
+      (grid_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_))
         mask_1d_ = mask_1d__tmp
       ENDIF
@@ -241,5 +259,6 @@
       IF (PRESENT(mask_2d_)) THEN
         ALLOCATE(mask_2d__tmp(SIZE(mask_2d_,1), SIZE(mask_2d_,2)))
-        CALL cxios_get_grid_mask_2d(grid_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_))
+        CALL cxios_get_grid_mask_2d &
+      (grid_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_))
         mask_2d_ = mask_2d__tmp
       ENDIF
@@ -247,34 +266,45 @@
       IF (PRESENT(mask_3d_)) THEN
         ALLOCATE(mask_3d__tmp(SIZE(mask_3d_,1), SIZE(mask_3d_,2), SIZE(mask_3d_,3)))
-        CALL cxios_get_grid_mask_3d(grid_hdl%daddr, mask_3d__tmp, SHAPE(mask_3d_))
+        CALL cxios_get_grid_mask_3d &
+      (grid_hdl%daddr, mask_3d__tmp, SHAPE(mask_3d_))
         mask_3d_ = mask_3d__tmp
       ENDIF
 
       IF (PRESENT(mask_4d_)) THEN
-        ALLOCATE(mask_4d__tmp(SIZE(mask_4d_,1), SIZE(mask_4d_,2), SIZE(mask_4d_,3), SIZE(mask_4d_,4)))
-        CALL cxios_get_grid_mask_4d(grid_hdl%daddr, mask_4d__tmp, SHAPE(mask_4d_))
+        ALLOCATE(mask_4d__tmp(SIZE(mask_4d_,1), SIZE(mask_4d_,2), SIZE(mask_4d_,3), &
+       SIZE(mask_4d_,4)))
+        CALL cxios_get_grid_mask_4d &
+      (grid_hdl%daddr, mask_4d__tmp, SHAPE(mask_4d_))
         mask_4d_ = mask_4d__tmp
       ENDIF
 
       IF (PRESENT(mask_5d_)) THEN
-        ALLOCATE(mask_5d__tmp(SIZE(mask_5d_,1), SIZE(mask_5d_,2), SIZE(mask_5d_,3), SIZE(mask_5d_,4), SIZE(mask_5d_,5)))
-        CALL cxios_get_grid_mask_5d(grid_hdl%daddr, mask_5d__tmp, SHAPE(mask_5d_))
+        ALLOCATE(mask_5d__tmp(SIZE(mask_5d_,1), SIZE(mask_5d_,2), SIZE(mask_5d_,3), &
+       SIZE(mask_5d_,4), SIZE(mask_5d_,5)))
+        CALL cxios_get_grid_mask_5d &
+      (grid_hdl%daddr, mask_5d__tmp, SHAPE(mask_5d_))
         mask_5d_ = mask_5d__tmp
       ENDIF
 
       IF (PRESENT(mask_6d_)) THEN
-        ALLOCATE(mask_6d__tmp(SIZE(mask_6d_,1), SIZE(mask_6d_,2), SIZE(mask_6d_,3), SIZE(mask_6d_,4), SIZE(mask_6d_,5), SIZE(mask_6d_,6)))
-        CALL cxios_get_grid_mask_6d(grid_hdl%daddr, mask_6d__tmp, SHAPE(mask_6d_))
+        ALLOCATE(mask_6d__tmp(SIZE(mask_6d_,1), SIZE(mask_6d_,2), SIZE(mask_6d_,3), &
+       SIZE(mask_6d_,4), SIZE(mask_6d_,5), SIZE(mask_6d_,6)))
+        CALL cxios_get_grid_mask_6d &
+      (grid_hdl%daddr, mask_6d__tmp, SHAPE(mask_6d_))
         mask_6d_ = mask_6d__tmp
       ENDIF
 
       IF (PRESENT(mask_7d_)) THEN
-        ALLOCATE(mask_7d__tmp(SIZE(mask_7d_,1), SIZE(mask_7d_,2), SIZE(mask_7d_,3), SIZE(mask_7d_,4), SIZE(mask_7d_,5), SIZE(mask_7d_,6), SIZE(mask_7d_,7)))
-        CALL cxios_get_grid_mask_7d(grid_hdl%daddr, mask_7d__tmp, SHAPE(mask_7d_))
+        ALLOCATE(mask_7d__tmp(SIZE(mask_7d_,1), SIZE(mask_7d_,2), SIZE(mask_7d_,3), &
+       SIZE(mask_7d_,4), SIZE(mask_7d_,5), SIZE(mask_7d_,6), &
+       SIZE(mask_7d_,7)))
+        CALL cxios_get_grid_mask_7d &
+      (grid_hdl%daddr, mask_7d__tmp, SHAPE(mask_7d_))
         mask_7d_ = mask_7d__tmp
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_get_grid_name(grid_hdl%daddr, name_, len(name_))
+        CALL cxios_get_grid_name &
+      (grid_hdl%daddr, name_, len(name_))
       ENDIF
 
@@ -307,5 +337,6 @@
       LOGICAL(KIND=C_BOOL) :: name_tmp
 
-      CALL xios(get_grid_handle)(grid_id,grid_hdl)
+      CALL xios(get_grid_handle) &
+      (grid_id,grid_hdl)
       CALL xios(is_defined_grid_attr_hdl_)   &
       ( grid_hdl, description, mask_1d, mask_2d, mask_3d, mask_4d, mask_5d, mask_6d, mask_7d, name  &
@@ -371,45 +402,54 @@
 
       IF (PRESENT(description_)) THEN
-        description__tmp = cxios_is_defined_grid_description(grid_hdl%daddr)
+        description__tmp = cxios_is_defined_grid_description &
+      (grid_hdl%daddr)
         description_ = description__tmp
       ENDIF
 
       IF (PRESENT(mask_1d_)) THEN
-        mask_1d__tmp = cxios_is_defined_grid_mask_1d(grid_hdl%daddr)
+        mask_1d__tmp = cxios_is_defined_grid_mask_1d &
+      (grid_hdl%daddr)
         mask_1d_ = mask_1d__tmp
       ENDIF
 
       IF (PRESENT(mask_2d_)) THEN
-        mask_2d__tmp = cxios_is_defined_grid_mask_2d(grid_hdl%daddr)
+        mask_2d__tmp = cxios_is_defined_grid_mask_2d &
+      (grid_hdl%daddr)
         mask_2d_ = mask_2d__tmp
       ENDIF
 
       IF (PRESENT(mask_3d_)) THEN
-        mask_3d__tmp = cxios_is_defined_grid_mask_3d(grid_hdl%daddr)
+        mask_3d__tmp = cxios_is_defined_grid_mask_3d &
+      (grid_hdl%daddr)
         mask_3d_ = mask_3d__tmp
       ENDIF
 
       IF (PRESENT(mask_4d_)) THEN
-        mask_4d__tmp = cxios_is_defined_grid_mask_4d(grid_hdl%daddr)
+        mask_4d__tmp = cxios_is_defined_grid_mask_4d &
+      (grid_hdl%daddr)
         mask_4d_ = mask_4d__tmp
       ENDIF
 
       IF (PRESENT(mask_5d_)) THEN
-        mask_5d__tmp = cxios_is_defined_grid_mask_5d(grid_hdl%daddr)
+        mask_5d__tmp = cxios_is_defined_grid_mask_5d &
+      (grid_hdl%daddr)
         mask_5d_ = mask_5d__tmp
       ENDIF
 
       IF (PRESENT(mask_6d_)) THEN
-        mask_6d__tmp = cxios_is_defined_grid_mask_6d(grid_hdl%daddr)
+        mask_6d__tmp = cxios_is_defined_grid_mask_6d &
+      (grid_hdl%daddr)
         mask_6d_ = mask_6d__tmp
       ENDIF
 
       IF (PRESENT(mask_7d_)) THEN
-        mask_7d__tmp = cxios_is_defined_grid_mask_7d(grid_hdl%daddr)
+        mask_7d__tmp = cxios_is_defined_grid_mask_7d &
+      (grid_hdl%daddr)
         mask_7d_ = mask_7d__tmp
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        name__tmp = cxios_is_defined_grid_name(grid_hdl%daddr)
+        name__tmp = cxios_is_defined_grid_name &
+      (grid_hdl%daddr)
         name_ = name__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/igridgroup_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/igridgroup_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/igridgroup_attr.F90	(revision 966)
@@ -36,5 +36,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name
 
-      CALL xios(get_gridgroup_handle)(gridgroup_id,gridgroup_hdl)
+      CALL xios(get_gridgroup_handle) &
+      (gridgroup_id,gridgroup_hdl)
       CALL xios(set_gridgroup_attr_hdl_)   &
       ( gridgroup_hdl, description, group_ref, mask_1d, mask_2d, mask_3d, mask_4d, mask_5d, mask_6d  &
@@ -98,9 +99,11 @@
 
       IF (PRESENT(description_)) THEN
-        CALL cxios_set_gridgroup_description(gridgroup_hdl%daddr, description_, len(description_))
+        CALL cxios_set_gridgroup_description &
+      (gridgroup_hdl%daddr, description_, len(description_))
       ENDIF
 
       IF (PRESENT(group_ref_)) THEN
-        CALL cxios_set_gridgroup_group_ref(gridgroup_hdl%daddr, group_ref_, len(group_ref_))
+        CALL cxios_set_gridgroup_group_ref &
+      (gridgroup_hdl%daddr, group_ref_, len(group_ref_))
       ENDIF
 
@@ -108,5 +111,6 @@
         ALLOCATE(mask_1d__tmp(SIZE(mask_1d_,1)))
         mask_1d__tmp = mask_1d_
-        CALL cxios_set_gridgroup_mask_1d(gridgroup_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_))
+        CALL cxios_set_gridgroup_mask_1d &
+      (gridgroup_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_))
       ENDIF
 
@@ -114,5 +118,6 @@
         ALLOCATE(mask_2d__tmp(SIZE(mask_2d_,1), SIZE(mask_2d_,2)))
         mask_2d__tmp = mask_2d_
-        CALL cxios_set_gridgroup_mask_2d(gridgroup_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_))
+        CALL cxios_set_gridgroup_mask_2d &
+      (gridgroup_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_))
       ENDIF
 
@@ -120,33 +125,44 @@
         ALLOCATE(mask_3d__tmp(SIZE(mask_3d_,1), SIZE(mask_3d_,2), SIZE(mask_3d_,3)))
         mask_3d__tmp = mask_3d_
-        CALL cxios_set_gridgroup_mask_3d(gridgroup_hdl%daddr, mask_3d__tmp, SHAPE(mask_3d_))
+        CALL cxios_set_gridgroup_mask_3d &
+      (gridgroup_hdl%daddr, mask_3d__tmp, SHAPE(mask_3d_))
       ENDIF
 
       IF (PRESENT(mask_4d_)) THEN
-        ALLOCATE(mask_4d__tmp(SIZE(mask_4d_,1), SIZE(mask_4d_,2), SIZE(mask_4d_,3), SIZE(mask_4d_,4)))
+        ALLOCATE(mask_4d__tmp(SIZE(mask_4d_,1), SIZE(mask_4d_,2), SIZE(mask_4d_,3), &
+       SIZE(mask_4d_,4)))
         mask_4d__tmp = mask_4d_
-        CALL cxios_set_gridgroup_mask_4d(gridgroup_hdl%daddr, mask_4d__tmp, SHAPE(mask_4d_))
+        CALL cxios_set_gridgroup_mask_4d &
+      (gridgroup_hdl%daddr, mask_4d__tmp, SHAPE(mask_4d_))
       ENDIF
 
       IF (PRESENT(mask_5d_)) THEN
-        ALLOCATE(mask_5d__tmp(SIZE(mask_5d_,1), SIZE(mask_5d_,2), SIZE(mask_5d_,3), SIZE(mask_5d_,4), SIZE(mask_5d_,5)))
+        ALLOCATE(mask_5d__tmp(SIZE(mask_5d_,1), SIZE(mask_5d_,2), SIZE(mask_5d_,3), &
+       SIZE(mask_5d_,4), SIZE(mask_5d_,5)))
         mask_5d__tmp = mask_5d_
-        CALL cxios_set_gridgroup_mask_5d(gridgroup_hdl%daddr, mask_5d__tmp, SHAPE(mask_5d_))
+        CALL cxios_set_gridgroup_mask_5d &
+      (gridgroup_hdl%daddr, mask_5d__tmp, SHAPE(mask_5d_))
       ENDIF
 
       IF (PRESENT(mask_6d_)) THEN
-        ALLOCATE(mask_6d__tmp(SIZE(mask_6d_,1), SIZE(mask_6d_,2), SIZE(mask_6d_,3), SIZE(mask_6d_,4), SIZE(mask_6d_,5), SIZE(mask_6d_,6)))
+        ALLOCATE(mask_6d__tmp(SIZE(mask_6d_,1), SIZE(mask_6d_,2), SIZE(mask_6d_,3), &
+       SIZE(mask_6d_,4), SIZE(mask_6d_,5), SIZE(mask_6d_,6)))
         mask_6d__tmp = mask_6d_
-        CALL cxios_set_gridgroup_mask_6d(gridgroup_hdl%daddr, mask_6d__tmp, SHAPE(mask_6d_))
+        CALL cxios_set_gridgroup_mask_6d &
+      (gridgroup_hdl%daddr, mask_6d__tmp, SHAPE(mask_6d_))
       ENDIF
 
       IF (PRESENT(mask_7d_)) THEN
-        ALLOCATE(mask_7d__tmp(SIZE(mask_7d_,1), SIZE(mask_7d_,2), SIZE(mask_7d_,3), SIZE(mask_7d_,4), SIZE(mask_7d_,5), SIZE(mask_7d_,6), SIZE(mask_7d_,7)))
+        ALLOCATE(mask_7d__tmp(SIZE(mask_7d_,1), SIZE(mask_7d_,2), SIZE(mask_7d_,3), &
+       SIZE(mask_7d_,4), SIZE(mask_7d_,5), SIZE(mask_7d_,6), &
+       SIZE(mask_7d_,7)))
         mask_7d__tmp = mask_7d_
-        CALL cxios_set_gridgroup_mask_7d(gridgroup_hdl%daddr, mask_7d__tmp, SHAPE(mask_7d_))
+        CALL cxios_set_gridgroup_mask_7d &
+      (gridgroup_hdl%daddr, mask_7d__tmp, SHAPE(mask_7d_))
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_set_gridgroup_name(gridgroup_hdl%daddr, name_, len(name_))
+        CALL cxios_set_gridgroup_name &
+      (gridgroup_hdl%daddr, name_, len(name_))
       ENDIF
 
@@ -178,5 +194,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name
 
-      CALL xios(get_gridgroup_handle)(gridgroup_id,gridgroup_hdl)
+      CALL xios(get_gridgroup_handle) &
+      (gridgroup_id,gridgroup_hdl)
       CALL xios(get_gridgroup_attr_hdl_)   &
       ( gridgroup_hdl, description, group_ref, mask_1d, mask_2d, mask_3d, mask_4d, mask_5d, mask_6d  &
@@ -240,14 +257,17 @@
 
       IF (PRESENT(description_)) THEN
-        CALL cxios_get_gridgroup_description(gridgroup_hdl%daddr, description_, len(description_))
+        CALL cxios_get_gridgroup_description &
+      (gridgroup_hdl%daddr, description_, len(description_))
       ENDIF
 
       IF (PRESENT(group_ref_)) THEN
-        CALL cxios_get_gridgroup_group_ref(gridgroup_hdl%daddr, group_ref_, len(group_ref_))
+        CALL cxios_get_gridgroup_group_ref &
+      (gridgroup_hdl%daddr, group_ref_, len(group_ref_))
       ENDIF
 
       IF (PRESENT(mask_1d_)) THEN
         ALLOCATE(mask_1d__tmp(SIZE(mask_1d_,1)))
-        CALL cxios_get_gridgroup_mask_1d(gridgroup_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_))
+        CALL cxios_get_gridgroup_mask_1d &
+      (gridgroup_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_))
         mask_1d_ = mask_1d__tmp
       ENDIF
@@ -255,5 +275,6 @@
       IF (PRESENT(mask_2d_)) THEN
         ALLOCATE(mask_2d__tmp(SIZE(mask_2d_,1), SIZE(mask_2d_,2)))
-        CALL cxios_get_gridgroup_mask_2d(gridgroup_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_))
+        CALL cxios_get_gridgroup_mask_2d &
+      (gridgroup_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_))
         mask_2d_ = mask_2d__tmp
       ENDIF
@@ -261,34 +282,45 @@
       IF (PRESENT(mask_3d_)) THEN
         ALLOCATE(mask_3d__tmp(SIZE(mask_3d_,1), SIZE(mask_3d_,2), SIZE(mask_3d_,3)))
-        CALL cxios_get_gridgroup_mask_3d(gridgroup_hdl%daddr, mask_3d__tmp, SHAPE(mask_3d_))
+        CALL cxios_get_gridgroup_mask_3d &
+      (gridgroup_hdl%daddr, mask_3d__tmp, SHAPE(mask_3d_))
         mask_3d_ = mask_3d__tmp
       ENDIF
 
       IF (PRESENT(mask_4d_)) THEN
-        ALLOCATE(mask_4d__tmp(SIZE(mask_4d_,1), SIZE(mask_4d_,2), SIZE(mask_4d_,3), SIZE(mask_4d_,4)))
-        CALL cxios_get_gridgroup_mask_4d(gridgroup_hdl%daddr, mask_4d__tmp, SHAPE(mask_4d_))
+        ALLOCATE(mask_4d__tmp(SIZE(mask_4d_,1), SIZE(mask_4d_,2), SIZE(mask_4d_,3), &
+       SIZE(mask_4d_,4)))
+        CALL cxios_get_gridgroup_mask_4d &
+      (gridgroup_hdl%daddr, mask_4d__tmp, SHAPE(mask_4d_))
         mask_4d_ = mask_4d__tmp
       ENDIF
 
       IF (PRESENT(mask_5d_)) THEN
-        ALLOCATE(mask_5d__tmp(SIZE(mask_5d_,1), SIZE(mask_5d_,2), SIZE(mask_5d_,3), SIZE(mask_5d_,4), SIZE(mask_5d_,5)))
-        CALL cxios_get_gridgroup_mask_5d(gridgroup_hdl%daddr, mask_5d__tmp, SHAPE(mask_5d_))
+        ALLOCATE(mask_5d__tmp(SIZE(mask_5d_,1), SIZE(mask_5d_,2), SIZE(mask_5d_,3), &
+       SIZE(mask_5d_,4), SIZE(mask_5d_,5)))
+        CALL cxios_get_gridgroup_mask_5d &
+      (gridgroup_hdl%daddr, mask_5d__tmp, SHAPE(mask_5d_))
         mask_5d_ = mask_5d__tmp
       ENDIF
 
       IF (PRESENT(mask_6d_)) THEN
-        ALLOCATE(mask_6d__tmp(SIZE(mask_6d_,1), SIZE(mask_6d_,2), SIZE(mask_6d_,3), SIZE(mask_6d_,4), SIZE(mask_6d_,5), SIZE(mask_6d_,6)))
-        CALL cxios_get_gridgroup_mask_6d(gridgroup_hdl%daddr, mask_6d__tmp, SHAPE(mask_6d_))
+        ALLOCATE(mask_6d__tmp(SIZE(mask_6d_,1), SIZE(mask_6d_,2), SIZE(mask_6d_,3), &
+       SIZE(mask_6d_,4), SIZE(mask_6d_,5), SIZE(mask_6d_,6)))
+        CALL cxios_get_gridgroup_mask_6d &
+      (gridgroup_hdl%daddr, mask_6d__tmp, SHAPE(mask_6d_))
         mask_6d_ = mask_6d__tmp
       ENDIF
 
       IF (PRESENT(mask_7d_)) THEN
-        ALLOCATE(mask_7d__tmp(SIZE(mask_7d_,1), SIZE(mask_7d_,2), SIZE(mask_7d_,3), SIZE(mask_7d_,4), SIZE(mask_7d_,5), SIZE(mask_7d_,6), SIZE(mask_7d_,7)))
-        CALL cxios_get_gridgroup_mask_7d(gridgroup_hdl%daddr, mask_7d__tmp, SHAPE(mask_7d_))
+        ALLOCATE(mask_7d__tmp(SIZE(mask_7d_,1), SIZE(mask_7d_,2), SIZE(mask_7d_,3), &
+       SIZE(mask_7d_,4), SIZE(mask_7d_,5), SIZE(mask_7d_,6), &
+       SIZE(mask_7d_,7)))
+        CALL cxios_get_gridgroup_mask_7d &
+      (gridgroup_hdl%daddr, mask_7d__tmp, SHAPE(mask_7d_))
         mask_7d_ = mask_7d__tmp
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_get_gridgroup_name(gridgroup_hdl%daddr, name_, len(name_))
+        CALL cxios_get_gridgroup_name &
+      (gridgroup_hdl%daddr, name_, len(name_))
       ENDIF
 
@@ -323,5 +355,6 @@
       LOGICAL(KIND=C_BOOL) :: name_tmp
 
-      CALL xios(get_gridgroup_handle)(gridgroup_id,gridgroup_hdl)
+      CALL xios(get_gridgroup_handle) &
+      (gridgroup_id,gridgroup_hdl)
       CALL xios(is_defined_gridgroup_attr_hdl_)   &
       ( gridgroup_hdl, description, group_ref, mask_1d, mask_2d, mask_3d, mask_4d, mask_5d, mask_6d  &
@@ -391,50 +424,60 @@
 
       IF (PRESENT(description_)) THEN
-        description__tmp = cxios_is_defined_gridgroup_description(gridgroup_hdl%daddr)
+        description__tmp = cxios_is_defined_gridgroup_description &
+      (gridgroup_hdl%daddr)
         description_ = description__tmp
       ENDIF
 
       IF (PRESENT(group_ref_)) THEN
-        group_ref__tmp = cxios_is_defined_gridgroup_group_ref(gridgroup_hdl%daddr)
+        group_ref__tmp = cxios_is_defined_gridgroup_group_ref &
+      (gridgroup_hdl%daddr)
         group_ref_ = group_ref__tmp
       ENDIF
 
       IF (PRESENT(mask_1d_)) THEN
-        mask_1d__tmp = cxios_is_defined_gridgroup_mask_1d(gridgroup_hdl%daddr)
+        mask_1d__tmp = cxios_is_defined_gridgroup_mask_1d &
+      (gridgroup_hdl%daddr)
         mask_1d_ = mask_1d__tmp
       ENDIF
 
       IF (PRESENT(mask_2d_)) THEN
-        mask_2d__tmp = cxios_is_defined_gridgroup_mask_2d(gridgroup_hdl%daddr)
+        mask_2d__tmp = cxios_is_defined_gridgroup_mask_2d &
+      (gridgroup_hdl%daddr)
         mask_2d_ = mask_2d__tmp
       ENDIF
 
       IF (PRESENT(mask_3d_)) THEN
-        mask_3d__tmp = cxios_is_defined_gridgroup_mask_3d(gridgroup_hdl%daddr)
+        mask_3d__tmp = cxios_is_defined_gridgroup_mask_3d &
+      (gridgroup_hdl%daddr)
         mask_3d_ = mask_3d__tmp
       ENDIF
 
       IF (PRESENT(mask_4d_)) THEN
-        mask_4d__tmp = cxios_is_defined_gridgroup_mask_4d(gridgroup_hdl%daddr)
+        mask_4d__tmp = cxios_is_defined_gridgroup_mask_4d &
+      (gridgroup_hdl%daddr)
         mask_4d_ = mask_4d__tmp
       ENDIF
 
       IF (PRESENT(mask_5d_)) THEN
-        mask_5d__tmp = cxios_is_defined_gridgroup_mask_5d(gridgroup_hdl%daddr)
+        mask_5d__tmp = cxios_is_defined_gridgroup_mask_5d &
+      (gridgroup_hdl%daddr)
         mask_5d_ = mask_5d__tmp
       ENDIF
 
       IF (PRESENT(mask_6d_)) THEN
-        mask_6d__tmp = cxios_is_defined_gridgroup_mask_6d(gridgroup_hdl%daddr)
+        mask_6d__tmp = cxios_is_defined_gridgroup_mask_6d &
+      (gridgroup_hdl%daddr)
         mask_6d_ = mask_6d__tmp
       ENDIF
 
       IF (PRESENT(mask_7d_)) THEN
-        mask_7d__tmp = cxios_is_defined_gridgroup_mask_7d(gridgroup_hdl%daddr)
+        mask_7d__tmp = cxios_is_defined_gridgroup_mask_7d &
+      (gridgroup_hdl%daddr)
         mask_7d_ = mask_7d__tmp
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        name__tmp = cxios_is_defined_gridgroup_name(gridgroup_hdl%daddr)
+        name__tmp = cxios_is_defined_gridgroup_name &
+      (gridgroup_hdl%daddr)
         name_ = name__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/iinterpolate_axis_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/iinterpolate_axis_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/iinterpolate_axis_attr.F90	(revision 966)
@@ -21,5 +21,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type
 
-      CALL xios(get_interpolate_axis_handle)(interpolate_axis_id,interpolate_axis_hdl)
+      CALL xios(get_interpolate_axis_handle) &
+      (interpolate_axis_id,interpolate_axis_hdl)
       CALL xios(set_interpolate_axis_attr_hdl_)   &
       ( interpolate_axis_hdl, coordinate, order, type )
@@ -51,13 +52,16 @@
 
       IF (PRESENT(coordinate_)) THEN
-        CALL cxios_set_interpolate_axis_coordinate(interpolate_axis_hdl%daddr, coordinate_, len(coordinate_))
+        CALL cxios_set_interpolate_axis_coordinate &
+      (interpolate_axis_hdl%daddr, coordinate_, len(coordinate_))
       ENDIF
 
       IF (PRESENT(order_)) THEN
-        CALL cxios_set_interpolate_axis_order(interpolate_axis_hdl%daddr, order_)
+        CALL cxios_set_interpolate_axis_order &
+      (interpolate_axis_hdl%daddr, order_)
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        CALL cxios_set_interpolate_axis_type(interpolate_axis_hdl%daddr, type_, len(type_))
+        CALL cxios_set_interpolate_axis_type &
+      (interpolate_axis_hdl%daddr, type_, len(type_))
       ENDIF
 
@@ -74,5 +78,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type
 
-      CALL xios(get_interpolate_axis_handle)(interpolate_axis_id,interpolate_axis_hdl)
+      CALL xios(get_interpolate_axis_handle) &
+      (interpolate_axis_id,interpolate_axis_hdl)
       CALL xios(get_interpolate_axis_attr_hdl_)   &
       ( interpolate_axis_hdl, coordinate, order, type )
@@ -104,13 +109,16 @@
 
       IF (PRESENT(coordinate_)) THEN
-        CALL cxios_get_interpolate_axis_coordinate(interpolate_axis_hdl%daddr, coordinate_, len(coordinate_))
+        CALL cxios_get_interpolate_axis_coordinate &
+      (interpolate_axis_hdl%daddr, coordinate_, len(coordinate_))
       ENDIF
 
       IF (PRESENT(order_)) THEN
-        CALL cxios_get_interpolate_axis_order(interpolate_axis_hdl%daddr, order_)
+        CALL cxios_get_interpolate_axis_order &
+      (interpolate_axis_hdl%daddr, order_)
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        CALL cxios_get_interpolate_axis_type(interpolate_axis_hdl%daddr, type_, len(type_))
+        CALL cxios_get_interpolate_axis_type &
+      (interpolate_axis_hdl%daddr, type_, len(type_))
       ENDIF
 
@@ -130,5 +138,6 @@
       LOGICAL(KIND=C_BOOL) :: type_tmp
 
-      CALL xios(get_interpolate_axis_handle)(interpolate_axis_id,interpolate_axis_hdl)
+      CALL xios(get_interpolate_axis_handle) &
+      (interpolate_axis_id,interpolate_axis_hdl)
       CALL xios(is_defined_interpolate_axis_attr_hdl_)   &
       ( interpolate_axis_hdl, coordinate, order, type )
@@ -166,15 +175,18 @@
 
       IF (PRESENT(coordinate_)) THEN
-        coordinate__tmp = cxios_is_defined_interpolate_axis_coordinate(interpolate_axis_hdl%daddr)
+        coordinate__tmp = cxios_is_defined_interpolate_axis_coordinate &
+      (interpolate_axis_hdl%daddr)
         coordinate_ = coordinate__tmp
       ENDIF
 
       IF (PRESENT(order_)) THEN
-        order__tmp = cxios_is_defined_interpolate_axis_order(interpolate_axis_hdl%daddr)
+        order__tmp = cxios_is_defined_interpolate_axis_order &
+      (interpolate_axis_hdl%daddr)
         order_ = order__tmp
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        type__tmp = cxios_is_defined_interpolate_axis_type(interpolate_axis_hdl%daddr)
+        type__tmp = cxios_is_defined_interpolate_axis_type &
+      (interpolate_axis_hdl%daddr)
         type_ = type__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/iinterpolate_domain_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/iinterpolate_domain_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/iinterpolate_domain_attr.F90	(revision 966)
@@ -22,5 +22,6 @@
       LOGICAL (KIND=C_BOOL) :: renormalize_tmp
 
-      CALL xios(get_interpolate_domain_handle)(interpolate_domain_id,interpolate_domain_hdl)
+      CALL xios(get_interpolate_domain_handle) &
+      (interpolate_domain_id,interpolate_domain_hdl)
       CALL xios(set_interpolate_domain_attr_hdl_)   &
       ( interpolate_domain_hdl, file, order, renormalize )
@@ -54,14 +55,17 @@
 
       IF (PRESENT(file_)) THEN
-        CALL cxios_set_interpolate_domain_file(interpolate_domain_hdl%daddr, file_, len(file_))
+        CALL cxios_set_interpolate_domain_file &
+      (interpolate_domain_hdl%daddr, file_, len(file_))
       ENDIF
 
       IF (PRESENT(order_)) THEN
-        CALL cxios_set_interpolate_domain_order(interpolate_domain_hdl%daddr, order_)
+        CALL cxios_set_interpolate_domain_order &
+      (interpolate_domain_hdl%daddr, order_)
       ENDIF
 
       IF (PRESENT(renormalize_)) THEN
         renormalize__tmp = renormalize_
-        CALL cxios_set_interpolate_domain_renormalize(interpolate_domain_hdl%daddr, renormalize__tmp)
+        CALL cxios_set_interpolate_domain_renormalize &
+      (interpolate_domain_hdl%daddr, renormalize__tmp)
       ENDIF
 
@@ -79,5 +83,6 @@
       LOGICAL (KIND=C_BOOL) :: renormalize_tmp
 
-      CALL xios(get_interpolate_domain_handle)(interpolate_domain_id,interpolate_domain_hdl)
+      CALL xios(get_interpolate_domain_handle) &
+      (interpolate_domain_id,interpolate_domain_hdl)
       CALL xios(get_interpolate_domain_attr_hdl_)   &
       ( interpolate_domain_hdl, file, order, renormalize )
@@ -111,13 +116,16 @@
 
       IF (PRESENT(file_)) THEN
-        CALL cxios_get_interpolate_domain_file(interpolate_domain_hdl%daddr, file_, len(file_))
+        CALL cxios_get_interpolate_domain_file &
+      (interpolate_domain_hdl%daddr, file_, len(file_))
       ENDIF
 
       IF (PRESENT(order_)) THEN
-        CALL cxios_get_interpolate_domain_order(interpolate_domain_hdl%daddr, order_)
+        CALL cxios_get_interpolate_domain_order &
+      (interpolate_domain_hdl%daddr, order_)
       ENDIF
 
       IF (PRESENT(renormalize_)) THEN
-        CALL cxios_get_interpolate_domain_renormalize(interpolate_domain_hdl%daddr, renormalize__tmp)
+        CALL cxios_get_interpolate_domain_renormalize &
+      (interpolate_domain_hdl%daddr, renormalize__tmp)
         renormalize_ = renormalize__tmp
       ENDIF
@@ -138,5 +146,6 @@
       LOGICAL(KIND=C_BOOL) :: renormalize_tmp
 
-      CALL xios(get_interpolate_domain_handle)(interpolate_domain_id,interpolate_domain_hdl)
+      CALL xios(get_interpolate_domain_handle) &
+      (interpolate_domain_id,interpolate_domain_hdl)
       CALL xios(is_defined_interpolate_domain_attr_hdl_)   &
       ( interpolate_domain_hdl, file, order, renormalize )
@@ -174,15 +183,18 @@
 
       IF (PRESENT(file_)) THEN
-        file__tmp = cxios_is_defined_interpolate_domain_file(interpolate_domain_hdl%daddr)
+        file__tmp = cxios_is_defined_interpolate_domain_file &
+      (interpolate_domain_hdl%daddr)
         file_ = file__tmp
       ENDIF
 
       IF (PRESENT(order_)) THEN
-        order__tmp = cxios_is_defined_interpolate_domain_order(interpolate_domain_hdl%daddr)
+        order__tmp = cxios_is_defined_interpolate_domain_order &
+      (interpolate_domain_hdl%daddr)
         order_ = order__tmp
       ENDIF
 
       IF (PRESENT(renormalize_)) THEN
-        renormalize__tmp = cxios_is_defined_interpolate_domain_renormalize(interpolate_domain_hdl%daddr)
+        renormalize__tmp = cxios_is_defined_interpolate_domain_renormalize &
+      (interpolate_domain_hdl%daddr)
         renormalize_ = renormalize__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/iinverse_axis_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/iinverse_axis_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/iinverse_axis_attr.F90	(revision 966)
@@ -18,5 +18,6 @@
       CHARACTER(LEN=*), INTENT(IN) ::inverse_axis_id
 
-      CALL xios(get_inverse_axis_handle)(inverse_axis_id,inverse_axis_hdl)
+      CALL xios(get_inverse_axis_handle) &
+      (inverse_axis_id,inverse_axis_hdl)
       CALL xios(set_inverse_axis_attr_hdl_)   &
       ( inverse_axis_hdl )
@@ -50,5 +51,6 @@
       CHARACTER(LEN=*), INTENT(IN) ::inverse_axis_id
 
-      CALL xios(get_inverse_axis_handle)(inverse_axis_id,inverse_axis_hdl)
+      CALL xios(get_inverse_axis_handle) &
+      (inverse_axis_id,inverse_axis_hdl)
       CALL xios(get_inverse_axis_attr_hdl_)   &
       ( inverse_axis_hdl )
@@ -82,5 +84,6 @@
       CHARACTER(LEN=*), INTENT(IN) ::inverse_axis_id
 
-      CALL xios(get_inverse_axis_handle)(inverse_axis_id,inverse_axis_hdl)
+      CALL xios(get_inverse_axis_handle) &
+      (inverse_axis_id,inverse_axis_hdl)
       CALL xios(is_defined_inverse_axis_attr_hdl_)   &
       ( inverse_axis_hdl )
Index: /XIOS/trunk/src/interface/fortran_attr/ireduce_axis_to_scalar_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/ireduce_axis_to_scalar_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/ireduce_axis_to_scalar_attr.F90	(revision 966)
@@ -19,5 +19,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: operation
 
-      CALL xios(get_reduce_axis_to_scalar_handle)(reduce_axis_to_scalar_id,reduce_axis_to_scalar_hdl)
+      CALL xios(get_reduce_axis_to_scalar_handle) &
+      (reduce_axis_to_scalar_id,reduce_axis_to_scalar_hdl)
       CALL xios(set_reduce_axis_to_scalar_attr_hdl_)   &
       ( reduce_axis_to_scalar_hdl, operation )
@@ -45,5 +46,6 @@
 
       IF (PRESENT(operation_)) THEN
-        CALL cxios_set_reduce_axis_to_scalar_operation(reduce_axis_to_scalar_hdl%daddr, operation_, len(operation_))
+        CALL cxios_set_reduce_axis_to_scalar_operation &
+      (reduce_axis_to_scalar_hdl%daddr, operation_, len(operation_))
       ENDIF
 
@@ -58,5 +60,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: operation
 
-      CALL xios(get_reduce_axis_to_scalar_handle)(reduce_axis_to_scalar_id,reduce_axis_to_scalar_hdl)
+      CALL xios(get_reduce_axis_to_scalar_handle) &
+      (reduce_axis_to_scalar_id,reduce_axis_to_scalar_hdl)
       CALL xios(get_reduce_axis_to_scalar_attr_hdl_)   &
       ( reduce_axis_to_scalar_hdl, operation )
@@ -84,5 +87,6 @@
 
       IF (PRESENT(operation_)) THEN
-        CALL cxios_get_reduce_axis_to_scalar_operation(reduce_axis_to_scalar_hdl%daddr, operation_, len(operation_))
+        CALL cxios_get_reduce_axis_to_scalar_operation &
+      (reduce_axis_to_scalar_hdl%daddr, operation_, len(operation_))
       ENDIF
 
@@ -98,5 +102,6 @@
       LOGICAL(KIND=C_BOOL) :: operation_tmp
 
-      CALL xios(get_reduce_axis_to_scalar_handle)(reduce_axis_to_scalar_id,reduce_axis_to_scalar_hdl)
+      CALL xios(get_reduce_axis_to_scalar_handle) &
+      (reduce_axis_to_scalar_id,reduce_axis_to_scalar_hdl)
       CALL xios(is_defined_reduce_axis_to_scalar_attr_hdl_)   &
       ( reduce_axis_to_scalar_hdl, operation )
@@ -126,5 +131,6 @@
 
       IF (PRESENT(operation_)) THEN
-        operation__tmp = cxios_is_defined_reduce_axis_to_scalar_operation(reduce_axis_to_scalar_hdl%daddr)
+        operation__tmp = cxios_is_defined_reduce_axis_to_scalar_operation &
+      (reduce_axis_to_scalar_hdl%daddr)
         operation_ = operation__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/iscalar_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/iscalar_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/iscalar_attr.F90	(revision 966)
@@ -24,5 +24,6 @@
       REAL (KIND=8) , OPTIONAL, INTENT(IN) :: value
 
-      CALL xios(get_scalar_handle)(scalar_id,scalar_hdl)
+      CALL xios(get_scalar_handle) &
+      (scalar_id,scalar_hdl)
       CALL xios(set_scalar_attr_hdl_)   &
       ( scalar_hdl, long_name, name, scalar_ref, standard_name, unit, value )
@@ -60,25 +61,31 @@
 
       IF (PRESENT(long_name_)) THEN
-        CALL cxios_set_scalar_long_name(scalar_hdl%daddr, long_name_, len(long_name_))
+        CALL cxios_set_scalar_long_name &
+      (scalar_hdl%daddr, long_name_, len(long_name_))
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_set_scalar_name(scalar_hdl%daddr, name_, len(name_))
+        CALL cxios_set_scalar_name &
+      (scalar_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(scalar_ref_)) THEN
-        CALL cxios_set_scalar_scalar_ref(scalar_hdl%daddr, scalar_ref_, len(scalar_ref_))
+        CALL cxios_set_scalar_scalar_ref &
+      (scalar_hdl%daddr, scalar_ref_, len(scalar_ref_))
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        CALL cxios_set_scalar_standard_name(scalar_hdl%daddr, standard_name_, len(standard_name_))
+        CALL cxios_set_scalar_standard_name &
+      (scalar_hdl%daddr, standard_name_, len(standard_name_))
       ENDIF
 
       IF (PRESENT(unit_)) THEN
-        CALL cxios_set_scalar_unit(scalar_hdl%daddr, unit_, len(unit_))
+        CALL cxios_set_scalar_unit &
+      (scalar_hdl%daddr, unit_, len(unit_))
       ENDIF
 
       IF (PRESENT(value_)) THEN
-        CALL cxios_set_scalar_value(scalar_hdl%daddr, value_)
+        CALL cxios_set_scalar_value &
+      (scalar_hdl%daddr, value_)
       ENDIF
 
@@ -98,5 +105,6 @@
       REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: value
 
-      CALL xios(get_scalar_handle)(scalar_id,scalar_hdl)
+      CALL xios(get_scalar_handle) &
+      (scalar_id,scalar_hdl)
       CALL xios(get_scalar_attr_hdl_)   &
       ( scalar_hdl, long_name, name, scalar_ref, standard_name, unit, value )
@@ -134,25 +142,31 @@
 
       IF (PRESENT(long_name_)) THEN
-        CALL cxios_get_scalar_long_name(scalar_hdl%daddr, long_name_, len(long_name_))
+        CALL cxios_get_scalar_long_name &
+      (scalar_hdl%daddr, long_name_, len(long_name_))
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_get_scalar_name(scalar_hdl%daddr, name_, len(name_))
+        CALL cxios_get_scalar_name &
+      (scalar_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(scalar_ref_)) THEN
-        CALL cxios_get_scalar_scalar_ref(scalar_hdl%daddr, scalar_ref_, len(scalar_ref_))
+        CALL cxios_get_scalar_scalar_ref &
+      (scalar_hdl%daddr, scalar_ref_, len(scalar_ref_))
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        CALL cxios_get_scalar_standard_name(scalar_hdl%daddr, standard_name_, len(standard_name_))
+        CALL cxios_get_scalar_standard_name &
+      (scalar_hdl%daddr, standard_name_, len(standard_name_))
       ENDIF
 
       IF (PRESENT(unit_)) THEN
-        CALL cxios_get_scalar_unit(scalar_hdl%daddr, unit_, len(unit_))
+        CALL cxios_get_scalar_unit &
+      (scalar_hdl%daddr, unit_, len(unit_))
       ENDIF
 
       IF (PRESENT(value_)) THEN
-        CALL cxios_get_scalar_value(scalar_hdl%daddr, value_)
+        CALL cxios_get_scalar_value &
+      (scalar_hdl%daddr, value_)
       ENDIF
 
@@ -178,5 +192,6 @@
       LOGICAL(KIND=C_BOOL) :: value_tmp
 
-      CALL xios(get_scalar_handle)(scalar_id,scalar_hdl)
+      CALL xios(get_scalar_handle) &
+      (scalar_id,scalar_hdl)
       CALL xios(is_defined_scalar_attr_hdl_)   &
       ( scalar_hdl, long_name, name, scalar_ref, standard_name, unit, value )
@@ -226,30 +241,36 @@
 
       IF (PRESENT(long_name_)) THEN
-        long_name__tmp = cxios_is_defined_scalar_long_name(scalar_hdl%daddr)
+        long_name__tmp = cxios_is_defined_scalar_long_name &
+      (scalar_hdl%daddr)
         long_name_ = long_name__tmp
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        name__tmp = cxios_is_defined_scalar_name(scalar_hdl%daddr)
+        name__tmp = cxios_is_defined_scalar_name &
+      (scalar_hdl%daddr)
         name_ = name__tmp
       ENDIF
 
       IF (PRESENT(scalar_ref_)) THEN
-        scalar_ref__tmp = cxios_is_defined_scalar_scalar_ref(scalar_hdl%daddr)
+        scalar_ref__tmp = cxios_is_defined_scalar_scalar_ref &
+      (scalar_hdl%daddr)
         scalar_ref_ = scalar_ref__tmp
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        standard_name__tmp = cxios_is_defined_scalar_standard_name(scalar_hdl%daddr)
+        standard_name__tmp = cxios_is_defined_scalar_standard_name &
+      (scalar_hdl%daddr)
         standard_name_ = standard_name__tmp
       ENDIF
 
       IF (PRESENT(unit_)) THEN
-        unit__tmp = cxios_is_defined_scalar_unit(scalar_hdl%daddr)
+        unit__tmp = cxios_is_defined_scalar_unit &
+      (scalar_hdl%daddr)
         unit_ = unit__tmp
       ENDIF
 
       IF (PRESENT(value_)) THEN
-        value__tmp = cxios_is_defined_scalar_value(scalar_hdl%daddr)
+        value__tmp = cxios_is_defined_scalar_value &
+      (scalar_hdl%daddr)
         value_ = value__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/iscalargroup_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/iscalargroup_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/iscalargroup_attr.F90	(revision 966)
@@ -25,5 +25,6 @@
       REAL (KIND=8) , OPTIONAL, INTENT(IN) :: value
 
-      CALL xios(get_scalargroup_handle)(scalargroup_id,scalargroup_hdl)
+      CALL xios(get_scalargroup_handle) &
+      (scalargroup_id,scalargroup_hdl)
       CALL xios(set_scalargroup_attr_hdl_)   &
       ( scalargroup_hdl, group_ref, long_name, name, scalar_ref, standard_name, unit, value )
@@ -64,29 +65,36 @@
 
       IF (PRESENT(group_ref_)) THEN
-        CALL cxios_set_scalargroup_group_ref(scalargroup_hdl%daddr, group_ref_, len(group_ref_))
+        CALL cxios_set_scalargroup_group_ref &
+      (scalargroup_hdl%daddr, group_ref_, len(group_ref_))
       ENDIF
 
       IF (PRESENT(long_name_)) THEN
-        CALL cxios_set_scalargroup_long_name(scalargroup_hdl%daddr, long_name_, len(long_name_))
+        CALL cxios_set_scalargroup_long_name &
+      (scalargroup_hdl%daddr, long_name_, len(long_name_))
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_set_scalargroup_name(scalargroup_hdl%daddr, name_, len(name_))
+        CALL cxios_set_scalargroup_name &
+      (scalargroup_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(scalar_ref_)) THEN
-        CALL cxios_set_scalargroup_scalar_ref(scalargroup_hdl%daddr, scalar_ref_, len(scalar_ref_))
+        CALL cxios_set_scalargroup_scalar_ref &
+      (scalargroup_hdl%daddr, scalar_ref_, len(scalar_ref_))
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        CALL cxios_set_scalargroup_standard_name(scalargroup_hdl%daddr, standard_name_, len(standard_name_))
+        CALL cxios_set_scalargroup_standard_name &
+      (scalargroup_hdl%daddr, standard_name_, len(standard_name_))
       ENDIF
 
       IF (PRESENT(unit_)) THEN
-        CALL cxios_set_scalargroup_unit(scalargroup_hdl%daddr, unit_, len(unit_))
+        CALL cxios_set_scalargroup_unit &
+      (scalargroup_hdl%daddr, unit_, len(unit_))
       ENDIF
 
       IF (PRESENT(value_)) THEN
-        CALL cxios_set_scalargroup_value(scalargroup_hdl%daddr, value_)
+        CALL cxios_set_scalargroup_value &
+      (scalargroup_hdl%daddr, value_)
       ENDIF
 
@@ -107,5 +115,6 @@
       REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: value
 
-      CALL xios(get_scalargroup_handle)(scalargroup_id,scalargroup_hdl)
+      CALL xios(get_scalargroup_handle) &
+      (scalargroup_id,scalargroup_hdl)
       CALL xios(get_scalargroup_attr_hdl_)   &
       ( scalargroup_hdl, group_ref, long_name, name, scalar_ref, standard_name, unit, value )
@@ -146,29 +155,36 @@
 
       IF (PRESENT(group_ref_)) THEN
-        CALL cxios_get_scalargroup_group_ref(scalargroup_hdl%daddr, group_ref_, len(group_ref_))
+        CALL cxios_get_scalargroup_group_ref &
+      (scalargroup_hdl%daddr, group_ref_, len(group_ref_))
       ENDIF
 
       IF (PRESENT(long_name_)) THEN
-        CALL cxios_get_scalargroup_long_name(scalargroup_hdl%daddr, long_name_, len(long_name_))
+        CALL cxios_get_scalargroup_long_name &
+      (scalargroup_hdl%daddr, long_name_, len(long_name_))
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_get_scalargroup_name(scalargroup_hdl%daddr, name_, len(name_))
+        CALL cxios_get_scalargroup_name &
+      (scalargroup_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(scalar_ref_)) THEN
-        CALL cxios_get_scalargroup_scalar_ref(scalargroup_hdl%daddr, scalar_ref_, len(scalar_ref_))
+        CALL cxios_get_scalargroup_scalar_ref &
+      (scalargroup_hdl%daddr, scalar_ref_, len(scalar_ref_))
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        CALL cxios_get_scalargroup_standard_name(scalargroup_hdl%daddr, standard_name_, len(standard_name_))
+        CALL cxios_get_scalargroup_standard_name &
+      (scalargroup_hdl%daddr, standard_name_, len(standard_name_))
       ENDIF
 
       IF (PRESENT(unit_)) THEN
-        CALL cxios_get_scalargroup_unit(scalargroup_hdl%daddr, unit_, len(unit_))
+        CALL cxios_get_scalargroup_unit &
+      (scalargroup_hdl%daddr, unit_, len(unit_))
       ENDIF
 
       IF (PRESENT(value_)) THEN
-        CALL cxios_get_scalargroup_value(scalargroup_hdl%daddr, value_)
+        CALL cxios_get_scalargroup_value &
+      (scalargroup_hdl%daddr, value_)
       ENDIF
 
@@ -196,5 +212,6 @@
       LOGICAL(KIND=C_BOOL) :: value_tmp
 
-      CALL xios(get_scalargroup_handle)(scalargroup_id,scalargroup_hdl)
+      CALL xios(get_scalargroup_handle) &
+      (scalargroup_id,scalargroup_hdl)
       CALL xios(is_defined_scalargroup_attr_hdl_)   &
       ( scalargroup_hdl, group_ref, long_name, name, scalar_ref, standard_name, unit, value )
@@ -249,35 +266,42 @@
 
       IF (PRESENT(group_ref_)) THEN
-        group_ref__tmp = cxios_is_defined_scalargroup_group_ref(scalargroup_hdl%daddr)
+        group_ref__tmp = cxios_is_defined_scalargroup_group_ref &
+      (scalargroup_hdl%daddr)
         group_ref_ = group_ref__tmp
       ENDIF
 
       IF (PRESENT(long_name_)) THEN
-        long_name__tmp = cxios_is_defined_scalargroup_long_name(scalargroup_hdl%daddr)
+        long_name__tmp = cxios_is_defined_scalargroup_long_name &
+      (scalargroup_hdl%daddr)
         long_name_ = long_name__tmp
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        name__tmp = cxios_is_defined_scalargroup_name(scalargroup_hdl%daddr)
+        name__tmp = cxios_is_defined_scalargroup_name &
+      (scalargroup_hdl%daddr)
         name_ = name__tmp
       ENDIF
 
       IF (PRESENT(scalar_ref_)) THEN
-        scalar_ref__tmp = cxios_is_defined_scalargroup_scalar_ref(scalargroup_hdl%daddr)
+        scalar_ref__tmp = cxios_is_defined_scalargroup_scalar_ref &
+      (scalargroup_hdl%daddr)
         scalar_ref_ = scalar_ref__tmp
       ENDIF
 
       IF (PRESENT(standard_name_)) THEN
-        standard_name__tmp = cxios_is_defined_scalargroup_standard_name(scalargroup_hdl%daddr)
+        standard_name__tmp = cxios_is_defined_scalargroup_standard_name &
+      (scalargroup_hdl%daddr)
         standard_name_ = standard_name__tmp
       ENDIF
 
       IF (PRESENT(unit_)) THEN
-        unit__tmp = cxios_is_defined_scalargroup_unit(scalargroup_hdl%daddr)
+        unit__tmp = cxios_is_defined_scalargroup_unit &
+      (scalargroup_hdl%daddr)
         unit_ = unit__tmp
       ENDIF
 
       IF (PRESENT(value_)) THEN
-        value__tmp = cxios_is_defined_scalargroup_value(scalargroup_hdl%daddr)
+        value__tmp = cxios_is_defined_scalargroup_value &
+      (scalargroup_hdl%daddr)
         value_ = value__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/ivariable_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/ivariable_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/ivariable_attr.F90	(revision 966)
@@ -20,5 +20,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type
 
-      CALL xios(get_variable_handle)(variable_id,variable_hdl)
+      CALL xios(get_variable_handle) &
+      (variable_id,variable_hdl)
       CALL xios(set_variable_attr_hdl_)   &
       ( variable_hdl, name, type )
@@ -48,9 +49,11 @@
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_set_variable_name(variable_hdl%daddr, name_, len(name_))
+        CALL cxios_set_variable_name &
+      (variable_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        CALL cxios_set_variable_type(variable_hdl%daddr, type_, len(type_))
+        CALL cxios_set_variable_type &
+      (variable_hdl%daddr, type_, len(type_))
       ENDIF
 
@@ -66,5 +69,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type
 
-      CALL xios(get_variable_handle)(variable_id,variable_hdl)
+      CALL xios(get_variable_handle) &
+      (variable_id,variable_hdl)
       CALL xios(get_variable_attr_hdl_)   &
       ( variable_hdl, name, type )
@@ -94,9 +98,11 @@
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_get_variable_name(variable_hdl%daddr, name_, len(name_))
+        CALL cxios_get_variable_name &
+      (variable_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        CALL cxios_get_variable_type(variable_hdl%daddr, type_, len(type_))
+        CALL cxios_get_variable_type &
+      (variable_hdl%daddr, type_, len(type_))
       ENDIF
 
@@ -114,5 +120,6 @@
       LOGICAL(KIND=C_BOOL) :: type_tmp
 
-      CALL xios(get_variable_handle)(variable_id,variable_hdl)
+      CALL xios(get_variable_handle) &
+      (variable_id,variable_hdl)
       CALL xios(is_defined_variable_attr_hdl_)   &
       ( variable_hdl, name, type )
@@ -146,10 +153,12 @@
 
       IF (PRESENT(name_)) THEN
-        name__tmp = cxios_is_defined_variable_name(variable_hdl%daddr)
+        name__tmp = cxios_is_defined_variable_name &
+      (variable_hdl%daddr)
         name_ = name__tmp
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        type__tmp = cxios_is_defined_variable_type(variable_hdl%daddr)
+        type__tmp = cxios_is_defined_variable_type &
+      (variable_hdl%daddr)
         type_ = type__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/ivariablegroup_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/ivariablegroup_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/ivariablegroup_attr.F90	(revision 966)
@@ -21,5 +21,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type
 
-      CALL xios(get_variablegroup_handle)(variablegroup_id,variablegroup_hdl)
+      CALL xios(get_variablegroup_handle) &
+      (variablegroup_id,variablegroup_hdl)
       CALL xios(set_variablegroup_attr_hdl_)   &
       ( variablegroup_hdl, group_ref, name, type )
@@ -51,13 +52,16 @@
 
       IF (PRESENT(group_ref_)) THEN
-        CALL cxios_set_variablegroup_group_ref(variablegroup_hdl%daddr, group_ref_, len(group_ref_))
+        CALL cxios_set_variablegroup_group_ref &
+      (variablegroup_hdl%daddr, group_ref_, len(group_ref_))
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_set_variablegroup_name(variablegroup_hdl%daddr, name_, len(name_))
+        CALL cxios_set_variablegroup_name &
+      (variablegroup_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        CALL cxios_set_variablegroup_type(variablegroup_hdl%daddr, type_, len(type_))
+        CALL cxios_set_variablegroup_type &
+      (variablegroup_hdl%daddr, type_, len(type_))
       ENDIF
 
@@ -74,5 +78,6 @@
       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type
 
-      CALL xios(get_variablegroup_handle)(variablegroup_id,variablegroup_hdl)
+      CALL xios(get_variablegroup_handle) &
+      (variablegroup_id,variablegroup_hdl)
       CALL xios(get_variablegroup_attr_hdl_)   &
       ( variablegroup_hdl, group_ref, name, type )
@@ -104,13 +109,16 @@
 
       IF (PRESENT(group_ref_)) THEN
-        CALL cxios_get_variablegroup_group_ref(variablegroup_hdl%daddr, group_ref_, len(group_ref_))
+        CALL cxios_get_variablegroup_group_ref &
+      (variablegroup_hdl%daddr, group_ref_, len(group_ref_))
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        CALL cxios_get_variablegroup_name(variablegroup_hdl%daddr, name_, len(name_))
+        CALL cxios_get_variablegroup_name &
+      (variablegroup_hdl%daddr, name_, len(name_))
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        CALL cxios_get_variablegroup_type(variablegroup_hdl%daddr, type_, len(type_))
+        CALL cxios_get_variablegroup_type &
+      (variablegroup_hdl%daddr, type_, len(type_))
       ENDIF
 
@@ -130,5 +138,6 @@
       LOGICAL(KIND=C_BOOL) :: type_tmp
 
-      CALL xios(get_variablegroup_handle)(variablegroup_id,variablegroup_hdl)
+      CALL xios(get_variablegroup_handle) &
+      (variablegroup_id,variablegroup_hdl)
       CALL xios(is_defined_variablegroup_attr_hdl_)   &
       ( variablegroup_hdl, group_ref, name, type )
@@ -166,15 +175,18 @@
 
       IF (PRESENT(group_ref_)) THEN
-        group_ref__tmp = cxios_is_defined_variablegroup_group_ref(variablegroup_hdl%daddr)
+        group_ref__tmp = cxios_is_defined_variablegroup_group_ref &
+      (variablegroup_hdl%daddr)
         group_ref_ = group_ref__tmp
       ENDIF
 
       IF (PRESENT(name_)) THEN
-        name__tmp = cxios_is_defined_variablegroup_name(variablegroup_hdl%daddr)
+        name__tmp = cxios_is_defined_variablegroup_name &
+      (variablegroup_hdl%daddr)
         name_ = name__tmp
       ENDIF
 
       IF (PRESENT(type_)) THEN
-        type__tmp = cxios_is_defined_variablegroup_type(variablegroup_hdl%daddr)
+        type__tmp = cxios_is_defined_variablegroup_type &
+      (variablegroup_hdl%daddr)
         type_ = type__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/izoom_axis_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/izoom_axis_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/izoom_axis_attr.F90	(revision 966)
@@ -20,5 +20,6 @@
       INTEGER  , OPTIONAL, INTENT(IN) :: n
 
-      CALL xios(get_zoom_axis_handle)(zoom_axis_id,zoom_axis_hdl)
+      CALL xios(get_zoom_axis_handle) &
+      (zoom_axis_id,zoom_axis_hdl)
       CALL xios(set_zoom_axis_attr_hdl_)   &
       ( zoom_axis_hdl, begin, n )
@@ -48,9 +49,11 @@
 
       IF (PRESENT(begin_)) THEN
-        CALL cxios_set_zoom_axis_begin(zoom_axis_hdl%daddr, begin_)
+        CALL cxios_set_zoom_axis_begin &
+      (zoom_axis_hdl%daddr, begin_)
       ENDIF
 
       IF (PRESENT(n_)) THEN
-        CALL cxios_set_zoom_axis_n(zoom_axis_hdl%daddr, n_)
+        CALL cxios_set_zoom_axis_n &
+      (zoom_axis_hdl%daddr, n_)
       ENDIF
 
@@ -66,5 +69,6 @@
       INTEGER  , OPTIONAL, INTENT(OUT) :: n
 
-      CALL xios(get_zoom_axis_handle)(zoom_axis_id,zoom_axis_hdl)
+      CALL xios(get_zoom_axis_handle) &
+      (zoom_axis_id,zoom_axis_hdl)
       CALL xios(get_zoom_axis_attr_hdl_)   &
       ( zoom_axis_hdl, begin, n )
@@ -94,9 +98,11 @@
 
       IF (PRESENT(begin_)) THEN
-        CALL cxios_get_zoom_axis_begin(zoom_axis_hdl%daddr, begin_)
+        CALL cxios_get_zoom_axis_begin &
+      (zoom_axis_hdl%daddr, begin_)
       ENDIF
 
       IF (PRESENT(n_)) THEN
-        CALL cxios_get_zoom_axis_n(zoom_axis_hdl%daddr, n_)
+        CALL cxios_get_zoom_axis_n &
+      (zoom_axis_hdl%daddr, n_)
       ENDIF
 
@@ -114,5 +120,6 @@
       LOGICAL(KIND=C_BOOL) :: n_tmp
 
-      CALL xios(get_zoom_axis_handle)(zoom_axis_id,zoom_axis_hdl)
+      CALL xios(get_zoom_axis_handle) &
+      (zoom_axis_id,zoom_axis_hdl)
       CALL xios(is_defined_zoom_axis_attr_hdl_)   &
       ( zoom_axis_hdl, begin, n )
@@ -146,10 +153,12 @@
 
       IF (PRESENT(begin_)) THEN
-        begin__tmp = cxios_is_defined_zoom_axis_begin(zoom_axis_hdl%daddr)
+        begin__tmp = cxios_is_defined_zoom_axis_begin &
+      (zoom_axis_hdl%daddr)
         begin_ = begin__tmp
       ENDIF
 
       IF (PRESENT(n_)) THEN
-        n__tmp = cxios_is_defined_zoom_axis_n(zoom_axis_hdl%daddr)
+        n__tmp = cxios_is_defined_zoom_axis_n &
+      (zoom_axis_hdl%daddr)
         n_ = n__tmp
       ENDIF
Index: /XIOS/trunk/src/interface/fortran_attr/izoom_domain_attr.F90
===================================================================
--- /XIOS/trunk/src/interface/fortran_attr/izoom_domain_attr.F90	(revision 965)
+++ /XIOS/trunk/src/interface/fortran_attr/izoom_domain_attr.F90	(revision 966)
@@ -22,5 +22,6 @@
       INTEGER  , OPTIONAL, INTENT(IN) :: nj
 
-      CALL xios(get_zoom_domain_handle)(zoom_domain_id,zoom_domain_hdl)
+      CALL xios(get_zoom_domain_handle) &
+      (zoom_domain_id,zoom_domain_hdl)
       CALL xios(set_zoom_domain_attr_hdl_)   &
       ( zoom_domain_hdl, ibegin, jbegin, ni, nj )
@@ -54,17 +55,21 @@
 
       IF (PRESENT(ibegin_)) THEN
-        CALL cxios_set_zoom_domain_ibegin(zoom_domain_hdl%daddr, ibegin_)
+        CALL cxios_set_zoom_domain_ibegin &
+      (zoom_domain_hdl%daddr, ibegin_)
       ENDIF
 
       IF (PRESENT(jbegin_)) THEN
-        CALL cxios_set_zoom_domain_jbegin(zoom_domain_hdl%daddr, jbegin_)
+        CALL cxios_set_zoom_domain_jbegin &
+      (zoom_domain_hdl%daddr, jbegin_)
       ENDIF
 
       IF (PRESENT(ni_)) THEN
-        CALL cxios_set_zoom_domain_ni(zoom_domain_hdl%daddr, ni_)
+        CALL cxios_set_zoom_domain_ni &
+      (zoom_domain_hdl%daddr, ni_)
       ENDIF
 
       IF (PRESENT(nj_)) THEN
-        CALL cxios_set_zoom_domain_nj(zoom_domain_hdl%daddr, nj_)
+        CALL cxios_set_zoom_domain_nj &
+      (zoom_domain_hdl%daddr, nj_)
       ENDIF
 
@@ -82,5 +87,6 @@
       INTEGER  , OPTIONAL, INTENT(OUT) :: nj
 
-      CALL xios(get_zoom_domain_handle)(zoom_domain_id,zoom_domain_hdl)
+      CALL xios(get_zoom_domain_handle) &
+      (zoom_domain_id,zoom_domain_hdl)
       CALL xios(get_zoom_domain_attr_hdl_)   &
       ( zoom_domain_hdl, ibegin, jbegin, ni, nj )
@@ -114,17 +120,21 @@
 
       IF (PRESENT(ibegin_)) THEN
-        CALL cxios_get_zoom_domain_ibegin(zoom_domain_hdl%daddr, ibegin_)
+        CALL cxios_get_zoom_domain_ibegin &
+      (zoom_domain_hdl%daddr, ibegin_)
       ENDIF
 
       IF (PRESENT(jbegin_)) THEN
-        CALL cxios_get_zoom_domain_jbegin(zoom_domain_hdl%daddr, jbegin_)
+        CALL cxios_get_zoom_domain_jbegin &
+      (zoom_domain_hdl%daddr, jbegin_)
       ENDIF
 
       IF (PRESENT(ni_)) THEN
-        CALL cxios_get_zoom_domain_ni(zoom_domain_hdl%daddr, ni_)
+        CALL cxios_get_zoom_domain_ni &
+      (zoom_domain_hdl%daddr, ni_)
       ENDIF
 
       IF (PRESENT(nj_)) THEN
-        CALL cxios_get_zoom_domain_nj(zoom_domain_hdl%daddr, nj_)
+        CALL cxios_get_zoom_domain_nj &
+      (zoom_domain_hdl%daddr, nj_)
       ENDIF
 
@@ -146,5 +156,6 @@
       LOGICAL(KIND=C_BOOL) :: nj_tmp
 
-      CALL xios(get_zoom_domain_handle)(zoom_domain_id,zoom_domain_hdl)
+      CALL xios(get_zoom_domain_handle) &
+      (zoom_domain_id,zoom_domain_hdl)
       CALL xios(is_defined_zoom_domain_attr_hdl_)   &
       ( zoom_domain_hdl, ibegin, jbegin, ni, nj )
@@ -186,20 +197,24 @@
 
       IF (PRESENT(ibegin_)) THEN
-        ibegin__tmp = cxios_is_defined_zoom_domain_ibegin(zoom_domain_hdl%daddr)
+        ibegin__tmp = cxios_is_defined_zoom_domain_ibegin &
+      (zoom_domain_hdl%daddr)
         ibegin_ = ibegin__tmp
       ENDIF
 
       IF (PRESENT(jbegin_)) THEN
-        jbegin__tmp = cxios_is_defined_zoom_domain_jbegin(zoom_domain_hdl%daddr)
+        jbegin__tmp = cxios_is_defined_zoom_domain_jbegin &
+      (zoom_domain_hdl%daddr)
         jbegin_ = jbegin__tmp
       ENDIF
 
       IF (PRESENT(ni_)) THEN
-        ni__tmp = cxios_is_defined_zoom_domain_ni(zoom_domain_hdl%daddr)
+        ni__tmp = cxios_is_defined_zoom_domain_ni &
+      (zoom_domain_hdl%daddr)
         ni_ = ni__tmp
       ENDIF
 
       IF (PRESENT(nj_)) THEN
-        nj__tmp = cxios_is_defined_zoom_domain_nj(zoom_domain_hdl%daddr)
+        nj__tmp = cxios_is_defined_zoom_domain_nj &
+      (zoom_domain_hdl%daddr)
         nj_ = nj__tmp
       ENDIF
