Changeset 674


Ignore:
Timestamp:
08/25/15 10:50:21 (6 years ago)
Author:
rlacroix
Message:

Fix Fortran interface generation to avoid generating long lines.

Long lines can cause compilation issues with some compilers.

Location:
XIOS/trunk/src
Files:
22 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/src/generate_interface_impl.hpp

    r672 r674  
    378378    string typeName=getStrType<T>(); \ 
    379379\ 
    380     oss << "void cxios_set_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int extent1)" << iendl; \ 
     380    oss << "void cxios_set_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int* extent)" << iendl; \ 
    381381    oss << "{" << iendl; \ 
    382382    oss << "  CTimer::get(\"XIOS\").resume();" << iendl; \ 
    383     oss << "  CArray<" << typeName << ",1> tmp(" << name << ", shape(extent1), neverDeleteData);" << iendl; \ 
     383    oss << "  CArray<" << typeName << ",1> tmp(" << name << ", shape(extent[0]), neverDeleteData);" << iendl; \ 
    384384    oss << "  " << className << "_hdl->" << name << ".reference(tmp.copy());" << iendl; \ 
    385385    /*oss << "  " << className << "_hdl->sendAttributToServer(" << className << "_hdl->" << name << ");" << iendl;*/ \ 
     
    387387    oss << "}" << std::endl; \ 
    388388    oss << iendl; \ 
    389     oss << "void cxios_get_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int extent1)" << iendl; \ 
     389    oss << "void cxios_get_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int* extent)" << iendl; \ 
    390390    oss << "{" << iendl; \ 
    391391    oss << "  CTimer::get(\"XIOS\").resume();" << iendl; \ 
    392     oss << "  CArray<" << typeName << ",1> tmp(" << name << ", shape(extent1), neverDeleteData);" << iendl; \ 
     392    oss << "  CArray<" << typeName << ",1> tmp(" << name << ", shape(extent[0]), neverDeleteData);" << iendl; \ 
    393393    oss << "  tmp=" << className << "_hdl->" << name << ".getInheritedValue();" << iendl; \ 
    394394    oss << "   CTimer::get(\"XIOS\").suspend();" << iendl; \ 
     
    401401    string typeName=getStrType<T>(); \ 
    402402\ 
    403     oss << "void cxios_set_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int extent1, int extent2)" << iendl; \ 
     403    oss << "void cxios_set_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int* extent)" << iendl; \ 
    404404    oss << "{" << iendl; \ 
    405405    oss << "  CTimer::get(\"XIOS\").resume();" << iendl; \ 
    406     oss << "  CArray<" << typeName << ",2> tmp(" << name << ", shape(extent1, extent2), neverDeleteData);" << iendl; \ 
     406    oss << "  CArray<" << typeName << ",2> tmp(" << name << ", shape(extent[0], extent[1]), neverDeleteData);" << iendl; \ 
    407407    oss << "  " << className << "_hdl->" << name << ".reference(tmp.copy());" << iendl; \ 
    408408    /*oss << "  " << className << "_hdl->sendAttributToServer(" << className << "_hdl->" << name << ");" << iendl;*/ \ 
     
    410410    oss << "}" << std::endl; \ 
    411411    oss << iendl; \ 
    412     oss << "void cxios_get_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int extent1, int extent2)" << iendl; \ 
     412    oss << "void cxios_get_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int* extent)" << iendl; \ 
    413413    oss << "{" << iendl; \ 
    414414    oss << "  CTimer::get(\"XIOS\").resume();" << iendl; \ 
    415     oss << "  CArray<" << typeName << ",2> tmp(" << name << ", shape(extent1, extent2), neverDeleteData);" << iendl; \ 
     415    oss << "  CArray<" << typeName << ",2> tmp(" << name << ", shape(extent[0], extent[1]), neverDeleteData);" << iendl; \ 
    416416    oss << "  tmp=" << className << "_hdl->" << name << ".getInheritedValue();" << iendl; \ 
    417417    oss << "   CTimer::get(\"XIOS\").suspend();" << iendl; \ 
     
    424424    string typeName=getStrType<T>(); \ 
    425425\ 
    426     oss << "void cxios_set_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int extent1, int extent2, int extent3)" << iendl; \ 
     426    oss << "void cxios_set_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int* extent)" << iendl; \ 
    427427    oss << "{" << iendl; \ 
    428428    oss << "  CTimer::get(\"XIOS\").resume();" << iendl; \ 
    429     oss << "  CArray<" << typeName << ",3> tmp(" << name << ", shape(extent1, extent2, extent3), neverDeleteData);" << iendl; \ 
     429    oss << "  CArray<" << typeName << ",3> tmp(" << name << ", shape(extent[0], extent[1], extent[2]), neverDeleteData);" << iendl; \ 
    430430    oss << "  " << className << "_hdl->" << name << ".reference(tmp.copy());" << iendl; \ 
    431431    /*oss << "  " << className << "_hdl->sendAttributToServer(" << className << "_hdl->" << name << ");" << iendl;*/ \ 
     
    433433    oss << "}" << std::endl; \ 
    434434    oss << iendl; \ 
    435     oss << "void cxios_get_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int extent1, int extent2, int extent3)" << iendl; \ 
     435    oss << "void cxios_get_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int* extent)" << iendl; \ 
    436436    oss << "{" << iendl; \ 
    437437    oss << "  CTimer::get(\"XIOS\").resume();" << iendl; \ 
    438     oss << "  CArray<" << typeName << ",3> tmp(" << name << ", shape(extent1, extent2, extent3), neverDeleteData);" << iendl; \ 
     438    oss << "  CArray<" << typeName << ",3> tmp(" << name << ", shape(extent[0], extent[1], extent[2]), neverDeleteData);" << iendl; \ 
    439439    oss << "  tmp=" << className << "_hdl->" << name << ".getInheritedValue();" << iendl; \ 
    440440    oss << "   CTimer::get(\"XIOS\").suspend();" << iendl; \ 
     
    459459    string fortranKindC=getStrFortranKindC<T>(); \ 
    460460      \ 
    461     oss << "SUBROUTINE cxios_set_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent1) BIND(C)" << iendl; \ 
     461    oss << "SUBROUTINE cxios_set_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent) BIND(C)" << iendl; \ 
    462462    oss << "  USE ISO_C_BINDING" << iendl; \ 
    463463    oss << "  INTEGER (kind = C_INTPTR_T), VALUE       :: " << className << "_hdl" << iendl; \ 
    464464    oss << "  " << fortranType << " " << fortranKindC << "     , DIMENSION(*) :: " << name << iendl; \ 
    465     oss << "  INTEGER (kind = C_INT), VALUE  :: extent1" << iendl; \ 
     465    oss << "  INTEGER (kind = C_INT), DIMENSION(*)     :: extent" << iendl; \ 
    466466    oss << "END SUBROUTINE cxios_set_" << className << "_" << name << std::endl; \ 
    467467    oss << iendl; \ 
    468     oss << "SUBROUTINE cxios_get_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent1) BIND(C)" << iendl; \ 
     468    oss << "SUBROUTINE cxios_get_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent) BIND(C)" << iendl; \ 
    469469    oss << "  USE ISO_C_BINDING" << iendl; \ 
    470470    oss << "  INTEGER (kind = C_INTPTR_T), VALUE       :: " << className << "_hdl" << iendl; \ 
    471471    oss << "  " << fortranType << " " << fortranKindC << "     , DIMENSION(*) :: " << name << iendl; \ 
    472     oss << "  INTEGER (kind = C_INT), VALUE  :: extent1" << iendl; \ 
     472    oss << "  INTEGER (kind = C_INT), DIMENSION(*)     :: extent" << iendl; \ 
    473473    oss << "END SUBROUTINE cxios_get_" << className << "_" << name << std::endl; \ 
    474474  } \ 
     
    480480    string fortranKindC=getStrFortranKindC<T>(); \ 
    481481      \ 
    482     oss << "SUBROUTINE cxios_set_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent1, extent2) BIND(C)" << iendl; \ 
     482    oss << "SUBROUTINE cxios_set_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent) BIND(C)" << iendl; \ 
    483483    oss << "  USE ISO_C_BINDING" << iendl; \ 
    484484    oss << "  INTEGER (kind = C_INTPTR_T), VALUE       :: " << className << "_hdl" << iendl; \ 
    485485    oss << "  " << fortranType << " " << fortranKindC << "     , DIMENSION(*) :: " << name << iendl; \ 
    486     oss << "  INTEGER (kind = C_INT), VALUE  :: extent1" << iendl; \ 
    487     oss << "  INTEGER (kind = C_INT), VALUE  :: extent2" << iendl; \ 
     486    oss << "  INTEGER (kind = C_INT), DIMENSION(*)     :: extent" << iendl; \ 
    488487    oss << "END SUBROUTINE cxios_set_" << className << "_" << name << std::endl; \ 
    489488    oss << iendl; \ 
    490     oss << "SUBROUTINE cxios_get_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent1, extent2) BIND(C)" << iendl; \ 
     489    oss << "SUBROUTINE cxios_get_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent) BIND(C)" << iendl; \ 
    491490    oss << "  USE ISO_C_BINDING" << iendl; \ 
    492491    oss << "  INTEGER (kind = C_INTPTR_T), VALUE       :: " << className << "_hdl" << iendl; \ 
    493492    oss << "  " << fortranType << " " << fortranKindC << "     , DIMENSION(*) :: " << name << iendl; \ 
    494     oss << "  INTEGER (kind = C_INT), VALUE  :: extent1" << iendl; \ 
    495     oss << "  INTEGER (kind = C_INT), VALUE  :: extent2" << iendl; \ 
     493    oss << "  INTEGER (kind = C_INT), DIMENSION(*)     :: extent" << iendl; \ 
    496494    oss << "END SUBROUTINE cxios_get_" << className << "_" << name << std::endl; \ 
    497495  } \ 
     
    503501    string fortranKindC=getStrFortranKindC<T>(); \ 
    504502      \ 
    505     oss << "SUBROUTINE cxios_set_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent1, extent2, extent3) BIND(C)" << iendl; \ 
     503    oss << "SUBROUTINE cxios_set_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent) BIND(C)" << iendl; \ 
    506504    oss << "  USE ISO_C_BINDING" << iendl; \ 
    507505    oss << "  INTEGER (kind = C_INTPTR_T), VALUE       :: " << className << "_hdl" << iendl; \ 
    508506    oss << "  " << fortranType << " " << fortranKindC << "     , DIMENSION(*) :: " << name << iendl; \ 
    509     oss << "  INTEGER (kind = C_INT), VALUE  :: extent1" << iendl; \ 
    510     oss << "  INTEGER (kind = C_INT), VALUE  :: extent2" << iendl; \ 
    511     oss << "  INTEGER (kind = C_INT), VALUE  :: extent3" << iendl; \ 
     507    oss << "  INTEGER (kind = C_INT), DIMENSION(*)     :: extent" << iendl; \ 
    512508    oss << "END SUBROUTINE cxios_set_" << className << "_" << name << std::endl; \ 
    513509    oss << iendl; \ 
    514     oss << "SUBROUTINE cxios_get_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent1, extent2, extent3) BIND(C)" << iendl; \ 
     510    oss << "SUBROUTINE cxios_get_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent) BIND(C)" << iendl; \ 
    515511    oss << "  USE ISO_C_BINDING" << iendl; \ 
    516512    oss << "  INTEGER (kind = C_INTPTR_T), VALUE       :: " << className << "_hdl" << iendl; \ 
    517513    oss << "  " << fortranType << " " << fortranKindC << "     , DIMENSION(*) :: " << name << iendl; \ 
    518     oss << "  INTEGER (kind = C_INT), VALUE  :: extent1" << iendl; \ 
    519     oss << "  INTEGER (kind = C_INT), VALUE  :: extent2" << iendl; \ 
    520     oss << "  INTEGER (kind = C_INT), VALUE  :: extent3" << iendl; \ 
     514    oss << "  INTEGER (kind = C_INT), DIMENSION(*)     :: extent" << iendl; \ 
    521515    oss << "END SUBROUTINE cxios_get_" << className << "_" << name << std::endl; \ 
    522516  } 
     
    585579    if (!matchingTypeCFortran<T>())  \ 
    586580    { \ 
    587       oss << "  ALLOCATE(" << name_tmp << "(size(" << name << "_,1)))" << iendl; \ 
     581      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1)))" << iendl; \ 
    588582      oss << "  " << name_tmp << " = " << name << "_" << iendl; \ 
    589       oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", size(" << name << "_,1))" << iendl; \ 
     583      oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \ 
    590584    } \ 
    591     else oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, size(" << name << "_,1))" << iendl; \ 
     585    else oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \ 
    592586    oss << "ENDIF"; \ 
    593587  } \ 
     
    601595    if (!matchingTypeCFortran<T>())  \ 
    602596    { \ 
    603       oss << "  ALLOCATE(" << name_tmp << "(size(" << name << "_,1), size(" << name << "_,2)))" << iendl; \ 
     597      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2)))" << iendl; \ 
    604598      oss << "  " << name_tmp << " = " << name << "_" << iendl; \ 
    605       oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", size(" << name << "_,1), size(" << name << "_,2))" << iendl; \ 
     599      oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \ 
    606600    } \ 
    607     else oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, size(" << name << "_,1), size(" << name << "_,2))" << iendl; \ 
     601    else oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \ 
    608602    oss << "ENDIF"; \ 
    609603  } \ 
     
    617611    if (!matchingTypeCFortran<T>())  \ 
    618612    { \ 
    619       oss << "  ALLOCATE(" << name_tmp << "(size(" << name << "_,1), size(" << name << "_,2), size(" << name << "_,3)))" << iendl; \ 
     613      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3)))" << iendl; \ 
    620614      oss << "  " << name_tmp << " = " << name << "_" << iendl; \ 
    621       oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", size(" << name << "_,1), size(" << name << "_,2), size(" << name << "_,3))" << iendl; \ 
     615      oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \ 
    622616    } \ 
    623     else oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, size(" << name << "_,1), size(" << name << "_,2), size(" << name << "_,3))" << iendl; \ 
     617    else oss << "  CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \ 
    624618    oss << "ENDIF"; \ 
    625619  } 
     
    640634    if (!matchingTypeCFortran<T>())  \ 
    641635    { \ 
    642       oss << "  ALLOCATE(" << name_tmp << "(size(" << name << "_,1)))" << iendl; \ 
    643       oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", size(" << name << "_,1))" << iendl; \ 
     636      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1)))" << iendl; \ 
     637      oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \ 
    644638      oss << "  " << name << "_ = " << name_tmp << iendl; \ 
    645639    } \ 
    646     else oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, size(" << name << "_,1))" << iendl; \ 
     640    else oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \ 
    647641    oss << "ENDIF"; \ 
    648642  } \ 
     
    656650    if (!matchingTypeCFortran<T>())  \ 
    657651    { \ 
    658       oss << "  ALLOCATE(" << name_tmp << "(size(" << name << "_,1), size(" << name << "_,2)))" << iendl; \ 
    659       oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", size(" << name << "_,1), size(" << name << "_,2))" << iendl; \ 
     652      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2)))" << iendl; \ 
     653      oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \ 
    660654      oss << "  " << name << "_ = " << name_tmp << iendl; \ 
    661655    } \ 
    662     else oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, size(" << name << "_,1), size(" << name << "_,2))" << iendl; \ 
     656    else oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \ 
    663657    oss << "ENDIF"; \ 
    664658  } \ 
     
    672666    if (!matchingTypeCFortran<T>())  \ 
    673667    { \ 
    674       oss << "  ALLOCATE(" << name_tmp << "(size(" << name << "_,1), size(" << name << "_,2), size(" << name << "_,3)))" << iendl; \ 
    675       oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", size(" << name << "_,1), size(" << name << "_,2), size(" << name << "_,3))" << iendl; \ 
     668      oss << "  ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3)))" << iendl; \ 
     669      oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \ 
    676670      oss << "  " << name << "_ = " << name_tmp << iendl; \ 
    677671      } \ 
    678     else oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, size(" << name << "_,1), size(" << name << "_,2), size(" << name << "_,3))" << iendl; \ 
     672    else oss << "  CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \ 
    679673    oss << "ENDIF"; \ 
    680674  } 
  • XIOS/trunk/src/interface/c_attr/icaxis_attr.cpp

    r666 r674  
    6767 
    6868 
    69   void cxios_set_axis_bounds(axis_Ptr axis_hdl, double* bounds, int extent1, int extent2) 
    70   { 
    71     CTimer::get("XIOS").resume(); 
    72     CArray<double,2> tmp(bounds, shape(extent1, extent2), neverDeleteData); 
     69  void cxios_set_axis_bounds(axis_Ptr axis_hdl, double* bounds, int* extent) 
     70  { 
     71    CTimer::get("XIOS").resume(); 
     72    CArray<double,2> tmp(bounds, shape(extent[0], extent[1]), neverDeleteData); 
    7373    axis_hdl->bounds.reference(tmp.copy()); 
    7474     CTimer::get("XIOS").suspend(); 
    7575  } 
    7676 
    77   void cxios_get_axis_bounds(axis_Ptr axis_hdl, double* bounds, int extent1, int extent2) 
    78   { 
    79     CTimer::get("XIOS").resume(); 
    80     CArray<double,2> tmp(bounds, shape(extent1, extent2), neverDeleteData); 
     77  void cxios_get_axis_bounds(axis_Ptr axis_hdl, double* bounds, int* extent) 
     78  { 
     79    CTimer::get("XIOS").resume(); 
     80    CArray<double,2> tmp(bounds, shape(extent[0], extent[1]), neverDeleteData); 
    8181    tmp=axis_hdl->bounds.getInheritedValue(); 
    8282     CTimer::get("XIOS").suspend(); 
     
    115115 
    116116 
    117   void cxios_set_axis_data_index(axis_Ptr axis_hdl, int* data_index, int extent1) 
    118   { 
    119     CTimer::get("XIOS").resume(); 
    120     CArray<int,1> tmp(data_index, shape(extent1), neverDeleteData); 
     117  void cxios_set_axis_data_index(axis_Ptr axis_hdl, int* data_index, int* extent) 
     118  { 
     119    CTimer::get("XIOS").resume(); 
     120    CArray<int,1> tmp(data_index, shape(extent[0]), neverDeleteData); 
    121121    axis_hdl->data_index.reference(tmp.copy()); 
    122122     CTimer::get("XIOS").suspend(); 
    123123  } 
    124124 
    125   void cxios_get_axis_data_index(axis_Ptr axis_hdl, int* data_index, int extent1) 
    126   { 
    127     CTimer::get("XIOS").resume(); 
    128     CArray<int,1> tmp(data_index, shape(extent1), neverDeleteData); 
     125  void cxios_get_axis_data_index(axis_Ptr axis_hdl, int* data_index, int* extent) 
     126  { 
     127    CTimer::get("XIOS").resume(); 
     128    CArray<int,1> tmp(data_index, shape(extent[0]), neverDeleteData); 
    129129    tmp=axis_hdl->data_index.getInheritedValue(); 
    130130     CTimer::get("XIOS").suspend(); 
     
    189189 
    190190 
    191   void cxios_set_axis_mask(axis_Ptr axis_hdl, bool* mask, int extent1) 
    192   { 
    193     CTimer::get("XIOS").resume(); 
    194     CArray<bool,1> tmp(mask, shape(extent1), neverDeleteData); 
     191  void cxios_set_axis_mask(axis_Ptr axis_hdl, bool* mask, int* extent) 
     192  { 
     193    CTimer::get("XIOS").resume(); 
     194    CArray<bool,1> tmp(mask, shape(extent[0]), neverDeleteData); 
    195195    axis_hdl->mask.reference(tmp.copy()); 
    196196     CTimer::get("XIOS").suspend(); 
    197197  } 
    198198 
    199   void cxios_get_axis_mask(axis_Ptr axis_hdl, bool* mask, int extent1) 
    200   { 
    201     CTimer::get("XIOS").resume(); 
    202     CArray<bool,1> tmp(mask, shape(extent1), neverDeleteData); 
     199  void cxios_get_axis_mask(axis_Ptr axis_hdl, bool* mask, int* extent) 
     200  { 
     201    CTimer::get("XIOS").resume(); 
     202    CArray<bool,1> tmp(mask, shape(extent[0]), neverDeleteData); 
    203203    tmp=axis_hdl->mask.getInheritedValue(); 
    204204     CTimer::get("XIOS").suspend(); 
     
    364364 
    365365 
    366   void cxios_set_axis_value(axis_Ptr axis_hdl, double* value, int extent1) 
    367   { 
    368     CTimer::get("XIOS").resume(); 
    369     CArray<double,1> tmp(value, shape(extent1), neverDeleteData); 
     366  void cxios_set_axis_value(axis_Ptr axis_hdl, double* value, int* extent) 
     367  { 
     368    CTimer::get("XIOS").resume(); 
     369    CArray<double,1> tmp(value, shape(extent[0]), neverDeleteData); 
    370370    axis_hdl->value.reference(tmp.copy()); 
    371371     CTimer::get("XIOS").suspend(); 
    372372  } 
    373373 
    374   void cxios_get_axis_value(axis_Ptr axis_hdl, double* value, int extent1) 
    375   { 
    376     CTimer::get("XIOS").resume(); 
    377     CArray<double,1> tmp(value, shape(extent1), neverDeleteData); 
     374  void cxios_get_axis_value(axis_Ptr axis_hdl, double* value, int* extent) 
     375  { 
     376    CTimer::get("XIOS").resume(); 
     377    CArray<double,1> tmp(value, shape(extent[0]), neverDeleteData); 
    378378    tmp=axis_hdl->value.getInheritedValue(); 
    379379     CTimer::get("XIOS").suspend(); 
  • XIOS/trunk/src/interface/c_attr/icaxisgroup_attr.cpp

    r666 r674  
    6767 
    6868 
    69   void cxios_set_axisgroup_bounds(axisgroup_Ptr axisgroup_hdl, double* bounds, int extent1, int extent2) 
    70   { 
    71     CTimer::get("XIOS").resume(); 
    72     CArray<double,2> tmp(bounds, shape(extent1, extent2), neverDeleteData); 
     69  void cxios_set_axisgroup_bounds(axisgroup_Ptr axisgroup_hdl, double* bounds, int* extent) 
     70  { 
     71    CTimer::get("XIOS").resume(); 
     72    CArray<double,2> tmp(bounds, shape(extent[0], extent[1]), neverDeleteData); 
    7373    axisgroup_hdl->bounds.reference(tmp.copy()); 
    7474     CTimer::get("XIOS").suspend(); 
    7575  } 
    7676 
    77   void cxios_get_axisgroup_bounds(axisgroup_Ptr axisgroup_hdl, double* bounds, int extent1, int extent2) 
    78   { 
    79     CTimer::get("XIOS").resume(); 
    80     CArray<double,2> tmp(bounds, shape(extent1, extent2), neverDeleteData); 
     77  void cxios_get_axisgroup_bounds(axisgroup_Ptr axisgroup_hdl, double* bounds, int* extent) 
     78  { 
     79    CTimer::get("XIOS").resume(); 
     80    CArray<double,2> tmp(bounds, shape(extent[0], extent[1]), neverDeleteData); 
    8181    tmp=axisgroup_hdl->bounds.getInheritedValue(); 
    8282     CTimer::get("XIOS").suspend(); 
     
    115115 
    116116 
    117   void cxios_set_axisgroup_data_index(axisgroup_Ptr axisgroup_hdl, int* data_index, int extent1) 
    118   { 
    119     CTimer::get("XIOS").resume(); 
    120     CArray<int,1> tmp(data_index, shape(extent1), neverDeleteData); 
     117  void cxios_set_axisgroup_data_index(axisgroup_Ptr axisgroup_hdl, int* data_index, int* extent) 
     118  { 
     119    CTimer::get("XIOS").resume(); 
     120    CArray<int,1> tmp(data_index, shape(extent[0]), neverDeleteData); 
    121121    axisgroup_hdl->data_index.reference(tmp.copy()); 
    122122     CTimer::get("XIOS").suspend(); 
    123123  } 
    124124 
    125   void cxios_get_axisgroup_data_index(axisgroup_Ptr axisgroup_hdl, int* data_index, int extent1) 
    126   { 
    127     CTimer::get("XIOS").resume(); 
    128     CArray<int,1> tmp(data_index, shape(extent1), neverDeleteData); 
     125  void cxios_get_axisgroup_data_index(axisgroup_Ptr axisgroup_hdl, int* data_index, int* extent) 
     126  { 
     127    CTimer::get("XIOS").resume(); 
     128    CArray<int,1> tmp(data_index, shape(extent[0]), neverDeleteData); 
    129129    tmp=axisgroup_hdl->data_index.getInheritedValue(); 
    130130     CTimer::get("XIOS").suspend(); 
     
    215215 
    216216 
    217   void cxios_set_axisgroup_mask(axisgroup_Ptr axisgroup_hdl, bool* mask, int extent1) 
    218   { 
    219     CTimer::get("XIOS").resume(); 
    220     CArray<bool,1> tmp(mask, shape(extent1), neverDeleteData); 
     217  void cxios_set_axisgroup_mask(axisgroup_Ptr axisgroup_hdl, bool* mask, int* extent) 
     218  { 
     219    CTimer::get("XIOS").resume(); 
     220    CArray<bool,1> tmp(mask, shape(extent[0]), neverDeleteData); 
    221221    axisgroup_hdl->mask.reference(tmp.copy()); 
    222222     CTimer::get("XIOS").suspend(); 
    223223  } 
    224224 
    225   void cxios_get_axisgroup_mask(axisgroup_Ptr axisgroup_hdl, bool* mask, int extent1) 
    226   { 
    227     CTimer::get("XIOS").resume(); 
    228     CArray<bool,1> tmp(mask, shape(extent1), neverDeleteData); 
     225  void cxios_get_axisgroup_mask(axisgroup_Ptr axisgroup_hdl, bool* mask, int* extent) 
     226  { 
     227    CTimer::get("XIOS").resume(); 
     228    CArray<bool,1> tmp(mask, shape(extent[0]), neverDeleteData); 
    229229    tmp=axisgroup_hdl->mask.getInheritedValue(); 
    230230     CTimer::get("XIOS").suspend(); 
     
    390390 
    391391 
    392   void cxios_set_axisgroup_value(axisgroup_Ptr axisgroup_hdl, double* value, int extent1) 
    393   { 
    394     CTimer::get("XIOS").resume(); 
    395     CArray<double,1> tmp(value, shape(extent1), neverDeleteData); 
     392  void cxios_set_axisgroup_value(axisgroup_Ptr axisgroup_hdl, double* value, int* extent) 
     393  { 
     394    CTimer::get("XIOS").resume(); 
     395    CArray<double,1> tmp(value, shape(extent[0]), neverDeleteData); 
    396396    axisgroup_hdl->value.reference(tmp.copy()); 
    397397     CTimer::get("XIOS").suspend(); 
    398398  } 
    399399 
    400   void cxios_get_axisgroup_value(axisgroup_Ptr axisgroup_hdl, double* value, int extent1) 
    401   { 
    402     CTimer::get("XIOS").resume(); 
    403     CArray<double,1> tmp(value, shape(extent1), neverDeleteData); 
     400  void cxios_get_axisgroup_value(axisgroup_Ptr axisgroup_hdl, double* value, int* extent) 
     401  { 
     402    CTimer::get("XIOS").resume(); 
     403    CArray<double,1> tmp(value, shape(extent[0]), neverDeleteData); 
    404404    tmp=axisgroup_hdl->value.getInheritedValue(); 
    405405     CTimer::get("XIOS").suspend(); 
  • XIOS/trunk/src/interface/c_attr/iccalendar_wrapper_attr.cpp

    r591 r674  
    110110 
    111111 
    112   void cxios_set_calendar_wrapper_month_lengths(calendar_wrapper_Ptr calendar_wrapper_hdl, int* month_lengths, int extent1) 
    113   { 
    114     CTimer::get("XIOS").resume(); 
    115     CArray<int,1> tmp(month_lengths, shape(extent1), neverDeleteData); 
     112  void cxios_set_calendar_wrapper_month_lengths(calendar_wrapper_Ptr calendar_wrapper_hdl, int* month_lengths, int* extent) 
     113  { 
     114    CTimer::get("XIOS").resume(); 
     115    CArray<int,1> tmp(month_lengths, shape(extent[0]), neverDeleteData); 
    116116    calendar_wrapper_hdl->month_lengths.reference(tmp.copy()); 
    117117     CTimer::get("XIOS").suspend(); 
    118118  } 
    119119 
    120   void cxios_get_calendar_wrapper_month_lengths(calendar_wrapper_Ptr calendar_wrapper_hdl, int* month_lengths, int extent1) 
    121   { 
    122     CTimer::get("XIOS").resume(); 
    123     CArray<int,1> tmp(month_lengths, shape(extent1), neverDeleteData); 
     120  void cxios_get_calendar_wrapper_month_lengths(calendar_wrapper_Ptr calendar_wrapper_hdl, int* month_lengths, int* extent) 
     121  { 
     122    CTimer::get("XIOS").resume(); 
     123    CArray<int,1> tmp(month_lengths, shape(extent[0]), neverDeleteData); 
    124124    tmp=calendar_wrapper_hdl->month_lengths.getInheritedValue(); 
    125125     CTimer::get("XIOS").suspend(); 
  • XIOS/trunk/src/interface/c_attr/icdomain_attr.cpp

    r666 r674  
    1818  typedef xios::CDomain* domain_Ptr; 
    1919 
    20   void cxios_set_domain_area(domain_Ptr domain_hdl, double* area, int extent1, int extent2) 
    21   { 
    22     CTimer::get("XIOS").resume(); 
    23     CArray<double,2> tmp(area, shape(extent1, extent2), neverDeleteData); 
     20  void cxios_set_domain_area(domain_Ptr domain_hdl, double* area, int* extent) 
     21  { 
     22    CTimer::get("XIOS").resume(); 
     23    CArray<double,2> tmp(area, shape(extent[0], extent[1]), neverDeleteData); 
    2424    domain_hdl->area.reference(tmp.copy()); 
    2525     CTimer::get("XIOS").suspend(); 
    2626  } 
    2727 
    28   void cxios_get_domain_area(domain_Ptr domain_hdl, double* area, int extent1, int extent2) 
    29   { 
    30     CTimer::get("XIOS").resume(); 
    31     CArray<double,2> tmp(area, shape(extent1, extent2), neverDeleteData); 
     28  void cxios_get_domain_area(domain_Ptr domain_hdl, double* area, int* extent) 
     29  { 
     30    CTimer::get("XIOS").resume(); 
     31    CArray<double,2> tmp(area, shape(extent[0], extent[1]), neverDeleteData); 
    3232    tmp=domain_hdl->area.getInheritedValue(); 
    3333     CTimer::get("XIOS").suspend(); 
     
    4343 
    4444 
    45   void cxios_set_domain_bounds_lat_1d(domain_Ptr domain_hdl, double* bounds_lat_1d, int extent1, int extent2) 
    46   { 
    47     CTimer::get("XIOS").resume(); 
    48     CArray<double,2> tmp(bounds_lat_1d, shape(extent1, extent2), neverDeleteData); 
     45  void cxios_set_domain_bounds_lat_1d(domain_Ptr domain_hdl, double* bounds_lat_1d, int* extent) 
     46  { 
     47    CTimer::get("XIOS").resume(); 
     48    CArray<double,2> tmp(bounds_lat_1d, shape(extent[0], extent[1]), neverDeleteData); 
    4949    domain_hdl->bounds_lat_1d.reference(tmp.copy()); 
    5050     CTimer::get("XIOS").suspend(); 
    5151  } 
    5252 
    53   void cxios_get_domain_bounds_lat_1d(domain_Ptr domain_hdl, double* bounds_lat_1d, int extent1, int extent2) 
    54   { 
    55     CTimer::get("XIOS").resume(); 
    56     CArray<double,2> tmp(bounds_lat_1d, shape(extent1, extent2), neverDeleteData); 
     53  void cxios_get_domain_bounds_lat_1d(domain_Ptr domain_hdl, double* bounds_lat_1d, int* extent) 
     54  { 
     55    CTimer::get("XIOS").resume(); 
     56    CArray<double,2> tmp(bounds_lat_1d, shape(extent[0], extent[1]), neverDeleteData); 
    5757    tmp=domain_hdl->bounds_lat_1d.getInheritedValue(); 
    5858     CTimer::get("XIOS").suspend(); 
     
    6868 
    6969 
    70   void cxios_set_domain_bounds_lat_2d(domain_Ptr domain_hdl, double* bounds_lat_2d, int extent1, int extent2, int extent3) 
    71   { 
    72     CTimer::get("XIOS").resume(); 
    73     CArray<double,3> tmp(bounds_lat_2d, shape(extent1, extent2, extent3), neverDeleteData); 
     70  void cxios_set_domain_bounds_lat_2d(domain_Ptr domain_hdl, double* bounds_lat_2d, int* extent) 
     71  { 
     72    CTimer::get("XIOS").resume(); 
     73    CArray<double,3> tmp(bounds_lat_2d, shape(extent[0], extent[1], extent[2]), neverDeleteData); 
    7474    domain_hdl->bounds_lat_2d.reference(tmp.copy()); 
    7575     CTimer::get("XIOS").suspend(); 
    7676  } 
    7777 
    78   void cxios_get_domain_bounds_lat_2d(domain_Ptr domain_hdl, double* bounds_lat_2d, int extent1, int extent2, int extent3) 
    79   { 
    80     CTimer::get("XIOS").resume(); 
    81     CArray<double,3> tmp(bounds_lat_2d, shape(extent1, extent2, extent3), neverDeleteData); 
     78  void cxios_get_domain_bounds_lat_2d(domain_Ptr domain_hdl, double* bounds_lat_2d, int* extent) 
     79  { 
     80    CTimer::get("XIOS").resume(); 
     81    CArray<double,3> tmp(bounds_lat_2d, shape(extent[0], extent[1], extent[2]), neverDeleteData); 
    8282    tmp=domain_hdl->bounds_lat_2d.getInheritedValue(); 
    8383     CTimer::get("XIOS").suspend(); 
     
    9393 
    9494 
    95   void cxios_set_domain_bounds_lon_1d(domain_Ptr domain_hdl, double* bounds_lon_1d, int extent1, int extent2) 
    96   { 
    97     CTimer::get("XIOS").resume(); 
    98     CArray<double,2> tmp(bounds_lon_1d, shape(extent1, extent2), neverDeleteData); 
     95  void cxios_set_domain_bounds_lon_1d(domain_Ptr domain_hdl, double* bounds_lon_1d, int* extent) 
     96  { 
     97    CTimer::get("XIOS").resume(); 
     98    CArray<double,2> tmp(bounds_lon_1d, shape(extent[0], extent[1]), neverDeleteData); 
    9999    domain_hdl->bounds_lon_1d.reference(tmp.copy()); 
    100100     CTimer::get("XIOS").suspend(); 
    101101  } 
    102102 
    103   void cxios_get_domain_bounds_lon_1d(domain_Ptr domain_hdl, double* bounds_lon_1d, int extent1, int extent2) 
    104   { 
    105     CTimer::get("XIOS").resume(); 
    106     CArray<double,2> tmp(bounds_lon_1d, shape(extent1, extent2), neverDeleteData); 
     103  void cxios_get_domain_bounds_lon_1d(domain_Ptr domain_hdl, double* bounds_lon_1d, int* extent) 
     104  { 
     105    CTimer::get("XIOS").resume(); 
     106    CArray<double,2> tmp(bounds_lon_1d, shape(extent[0], extent[1]), neverDeleteData); 
    107107    tmp=domain_hdl->bounds_lon_1d.getInheritedValue(); 
    108108     CTimer::get("XIOS").suspend(); 
     
    118118 
    119119 
    120   void cxios_set_domain_bounds_lon_2d(domain_Ptr domain_hdl, double* bounds_lon_2d, int extent1, int extent2, int extent3) 
    121   { 
    122     CTimer::get("XIOS").resume(); 
    123     CArray<double,3> tmp(bounds_lon_2d, shape(extent1, extent2, extent3), neverDeleteData); 
     120  void cxios_set_domain_bounds_lon_2d(domain_Ptr domain_hdl, double* bounds_lon_2d, int* extent) 
     121  { 
     122    CTimer::get("XIOS").resume(); 
     123    CArray<double,3> tmp(bounds_lon_2d, shape(extent[0], extent[1], extent[2]), neverDeleteData); 
    124124    domain_hdl->bounds_lon_2d.reference(tmp.copy()); 
    125125     CTimer::get("XIOS").suspend(); 
    126126  } 
    127127 
    128   void cxios_get_domain_bounds_lon_2d(domain_Ptr domain_hdl, double* bounds_lon_2d, int extent1, int extent2, int extent3) 
    129   { 
    130     CTimer::get("XIOS").resume(); 
    131     CArray<double,3> tmp(bounds_lon_2d, shape(extent1, extent2, extent3), neverDeleteData); 
     128  void cxios_get_domain_bounds_lon_2d(domain_Ptr domain_hdl, double* bounds_lon_2d, int* extent) 
     129  { 
     130    CTimer::get("XIOS").resume(); 
     131    CArray<double,3> tmp(bounds_lon_2d, shape(extent[0], extent[1], extent[2]), neverDeleteData); 
    132132    tmp=domain_hdl->bounds_lon_2d.getInheritedValue(); 
    133133     CTimer::get("XIOS").suspend(); 
     
    166166 
    167167 
    168   void cxios_set_domain_data_i_index(domain_Ptr domain_hdl, int* data_i_index, int extent1) 
    169   { 
    170     CTimer::get("XIOS").resume(); 
    171     CArray<int,1> tmp(data_i_index, shape(extent1), neverDeleteData); 
     168  void cxios_set_domain_data_i_index(domain_Ptr domain_hdl, int* data_i_index, int* extent) 
     169  { 
     170    CTimer::get("XIOS").resume(); 
     171    CArray<int,1> tmp(data_i_index, shape(extent[0]), neverDeleteData); 
    172172    domain_hdl->data_i_index.reference(tmp.copy()); 
    173173     CTimer::get("XIOS").suspend(); 
    174174  } 
    175175 
    176   void cxios_get_domain_data_i_index(domain_Ptr domain_hdl, int* data_i_index, int extent1) 
    177   { 
    178     CTimer::get("XIOS").resume(); 
    179     CArray<int,1> tmp(data_i_index, shape(extent1), neverDeleteData); 
     176  void cxios_get_domain_data_i_index(domain_Ptr domain_hdl, int* data_i_index, int* extent) 
     177  { 
     178    CTimer::get("XIOS").resume(); 
     179    CArray<int,1> tmp(data_i_index, shape(extent[0]), neverDeleteData); 
    180180    tmp=domain_hdl->data_i_index.getInheritedValue(); 
    181181     CTimer::get("XIOS").suspend(); 
     
    214214 
    215215 
    216   void cxios_set_domain_data_j_index(domain_Ptr domain_hdl, int* data_j_index, int extent1) 
    217   { 
    218     CTimer::get("XIOS").resume(); 
    219     CArray<int,1> tmp(data_j_index, shape(extent1), neverDeleteData); 
     216  void cxios_set_domain_data_j_index(domain_Ptr domain_hdl, int* data_j_index, int* extent) 
     217  { 
     218    CTimer::get("XIOS").resume(); 
     219    CArray<int,1> tmp(data_j_index, shape(extent[0]), neverDeleteData); 
    220220    domain_hdl->data_j_index.reference(tmp.copy()); 
    221221     CTimer::get("XIOS").suspend(); 
    222222  } 
    223223 
    224   void cxios_get_domain_data_j_index(domain_Ptr domain_hdl, int* data_j_index, int extent1) 
    225   { 
    226     CTimer::get("XIOS").resume(); 
    227     CArray<int,1> tmp(data_j_index, shape(extent1), neverDeleteData); 
     224  void cxios_get_domain_data_j_index(domain_Ptr domain_hdl, int* data_j_index, int* extent) 
     225  { 
     226    CTimer::get("XIOS").resume(); 
     227    CArray<int,1> tmp(data_j_index, shape(extent[0]), neverDeleteData); 
    228228    tmp=domain_hdl->data_j_index.getInheritedValue(); 
    229229     CTimer::get("XIOS").suspend(); 
     
    360360 
    361361 
    362   void cxios_set_domain_i_index(domain_Ptr domain_hdl, int* i_index, int extent1) 
    363   { 
    364     CTimer::get("XIOS").resume(); 
    365     CArray<int,1> tmp(i_index, shape(extent1), neverDeleteData); 
     362  void cxios_set_domain_i_index(domain_Ptr domain_hdl, int* i_index, int* extent) 
     363  { 
     364    CTimer::get("XIOS").resume(); 
     365    CArray<int,1> tmp(i_index, shape(extent[0]), neverDeleteData); 
    366366    domain_hdl->i_index.reference(tmp.copy()); 
    367367     CTimer::get("XIOS").suspend(); 
    368368  } 
    369369 
    370   void cxios_get_domain_i_index(domain_Ptr domain_hdl, int* i_index, int extent1) 
    371   { 
    372     CTimer::get("XIOS").resume(); 
    373     CArray<int,1> tmp(i_index, shape(extent1), neverDeleteData); 
     370  void cxios_get_domain_i_index(domain_Ptr domain_hdl, int* i_index, int* extent) 
     371  { 
     372    CTimer::get("XIOS").resume(); 
     373    CArray<int,1> tmp(i_index, shape(extent[0]), neverDeleteData); 
    374374    tmp=domain_hdl->i_index.getInheritedValue(); 
    375375     CTimer::get("XIOS").suspend(); 
     
    408408 
    409409 
    410   void cxios_set_domain_j_index(domain_Ptr domain_hdl, int* j_index, int extent1) 
    411   { 
    412     CTimer::get("XIOS").resume(); 
    413     CArray<int,1> tmp(j_index, shape(extent1), neverDeleteData); 
     410  void cxios_set_domain_j_index(domain_Ptr domain_hdl, int* j_index, int* extent) 
     411  { 
     412    CTimer::get("XIOS").resume(); 
     413    CArray<int,1> tmp(j_index, shape(extent[0]), neverDeleteData); 
    414414    domain_hdl->j_index.reference(tmp.copy()); 
    415415     CTimer::get("XIOS").suspend(); 
    416416  } 
    417417 
    418   void cxios_get_domain_j_index(domain_Ptr domain_hdl, int* j_index, int extent1) 
    419   { 
    420     CTimer::get("XIOS").resume(); 
    421     CArray<int,1> tmp(j_index, shape(extent1), neverDeleteData); 
     418  void cxios_get_domain_j_index(domain_Ptr domain_hdl, int* j_index, int* extent) 
     419  { 
     420    CTimer::get("XIOS").resume(); 
     421    CArray<int,1> tmp(j_index, shape(extent[0]), neverDeleteData); 
    422422    tmp=domain_hdl->j_index.getInheritedValue(); 
    423423     CTimer::get("XIOS").suspend(); 
     
    456456 
    457457 
    458   void cxios_set_domain_latvalue_1d(domain_Ptr domain_hdl, double* latvalue_1d, int extent1) 
    459   { 
    460     CTimer::get("XIOS").resume(); 
    461     CArray<double,1> tmp(latvalue_1d, shape(extent1), neverDeleteData); 
     458  void cxios_set_domain_latvalue_1d(domain_Ptr domain_hdl, double* latvalue_1d, int* extent) 
     459  { 
     460    CTimer::get("XIOS").resume(); 
     461    CArray<double,1> tmp(latvalue_1d, shape(extent[0]), neverDeleteData); 
    462462    domain_hdl->latvalue_1d.reference(tmp.copy()); 
    463463     CTimer::get("XIOS").suspend(); 
    464464  } 
    465465 
    466   void cxios_get_domain_latvalue_1d(domain_Ptr domain_hdl, double* latvalue_1d, int extent1) 
    467   { 
    468     CTimer::get("XIOS").resume(); 
    469     CArray<double,1> tmp(latvalue_1d, shape(extent1), neverDeleteData); 
     466  void cxios_get_domain_latvalue_1d(domain_Ptr domain_hdl, double* latvalue_1d, int* extent) 
     467  { 
     468    CTimer::get("XIOS").resume(); 
     469    CArray<double,1> tmp(latvalue_1d, shape(extent[0]), neverDeleteData); 
    470470    tmp=domain_hdl->latvalue_1d.getInheritedValue(); 
    471471     CTimer::get("XIOS").suspend(); 
     
    481481 
    482482 
    483   void cxios_set_domain_latvalue_2d(domain_Ptr domain_hdl, double* latvalue_2d, int extent1, int extent2) 
    484   { 
    485     CTimer::get("XIOS").resume(); 
    486     CArray<double,2> tmp(latvalue_2d, shape(extent1, extent2), neverDeleteData); 
     483  void cxios_set_domain_latvalue_2d(domain_Ptr domain_hdl, double* latvalue_2d, int* extent) 
     484  { 
     485    CTimer::get("XIOS").resume(); 
     486    CArray<double,2> tmp(latvalue_2d, shape(extent[0], extent[1]), neverDeleteData); 
    487487    domain_hdl->latvalue_2d.reference(tmp.copy()); 
    488488     CTimer::get("XIOS").suspend(); 
    489489  } 
    490490 
    491   void cxios_get_domain_latvalue_2d(domain_Ptr domain_hdl, double* latvalue_2d, int extent1, int extent2) 
    492   { 
    493     CTimer::get("XIOS").resume(); 
    494     CArray<double,2> tmp(latvalue_2d, shape(extent1, extent2), neverDeleteData); 
     491  void cxios_get_domain_latvalue_2d(domain_Ptr domain_hdl, double* latvalue_2d, int* extent) 
     492  { 
     493    CTimer::get("XIOS").resume(); 
     494    CArray<double,2> tmp(latvalue_2d, shape(extent[0], extent[1]), neverDeleteData); 
    495495    tmp=domain_hdl->latvalue_2d.getInheritedValue(); 
    496496     CTimer::get("XIOS").suspend(); 
     
    532532 
    533533 
    534   void cxios_set_domain_lonvalue_1d(domain_Ptr domain_hdl, double* lonvalue_1d, int extent1) 
    535   { 
    536     CTimer::get("XIOS").resume(); 
    537     CArray<double,1> tmp(lonvalue_1d, shape(extent1), neverDeleteData); 
     534  void cxios_set_domain_lonvalue_1d(domain_Ptr domain_hdl, double* lonvalue_1d, int* extent) 
     535  { 
     536    CTimer::get("XIOS").resume(); 
     537    CArray<double,1> tmp(lonvalue_1d, shape(extent[0]), neverDeleteData); 
    538538    domain_hdl->lonvalue_1d.reference(tmp.copy()); 
    539539     CTimer::get("XIOS").suspend(); 
    540540  } 
    541541 
    542   void cxios_get_domain_lonvalue_1d(domain_Ptr domain_hdl, double* lonvalue_1d, int extent1) 
    543   { 
    544     CTimer::get("XIOS").resume(); 
    545     CArray<double,1> tmp(lonvalue_1d, shape(extent1), neverDeleteData); 
     542  void cxios_get_domain_lonvalue_1d(domain_Ptr domain_hdl, double* lonvalue_1d, int* extent) 
     543  { 
     544    CTimer::get("XIOS").resume(); 
     545    CArray<double,1> tmp(lonvalue_1d, shape(extent[0]), neverDeleteData); 
    546546    tmp=domain_hdl->lonvalue_1d.getInheritedValue(); 
    547547     CTimer::get("XIOS").suspend(); 
     
    557557 
    558558 
    559   void cxios_set_domain_lonvalue_2d(domain_Ptr domain_hdl, double* lonvalue_2d, int extent1, int extent2) 
    560   { 
    561     CTimer::get("XIOS").resume(); 
    562     CArray<double,2> tmp(lonvalue_2d, shape(extent1, extent2), neverDeleteData); 
     559  void cxios_set_domain_lonvalue_2d(domain_Ptr domain_hdl, double* lonvalue_2d, int* extent) 
     560  { 
     561    CTimer::get("XIOS").resume(); 
     562    CArray<double,2> tmp(lonvalue_2d, shape(extent[0], extent[1]), neverDeleteData); 
    563563    domain_hdl->lonvalue_2d.reference(tmp.copy()); 
    564564     CTimer::get("XIOS").suspend(); 
    565565  } 
    566566 
    567   void cxios_get_domain_lonvalue_2d(domain_Ptr domain_hdl, double* lonvalue_2d, int extent1, int extent2) 
    568   { 
    569     CTimer::get("XIOS").resume(); 
    570     CArray<double,2> tmp(lonvalue_2d, shape(extent1, extent2), neverDeleteData); 
     567  void cxios_get_domain_lonvalue_2d(domain_Ptr domain_hdl, double* lonvalue_2d, int* extent) 
     568  { 
     569    CTimer::get("XIOS").resume(); 
     570    CArray<double,2> tmp(lonvalue_2d, shape(extent[0], extent[1]), neverDeleteData); 
    571571    tmp=domain_hdl->lonvalue_2d.getInheritedValue(); 
    572572     CTimer::get("XIOS").suspend(); 
     
    582582 
    583583 
    584   void cxios_set_domain_mask_1d(domain_Ptr domain_hdl, bool* mask_1d, int extent1) 
    585   { 
    586     CTimer::get("XIOS").resume(); 
    587     CArray<bool,1> tmp(mask_1d, shape(extent1), neverDeleteData); 
     584  void cxios_set_domain_mask_1d(domain_Ptr domain_hdl, bool* mask_1d, int* extent) 
     585  { 
     586    CTimer::get("XIOS").resume(); 
     587    CArray<bool,1> tmp(mask_1d, shape(extent[0]), neverDeleteData); 
    588588    domain_hdl->mask_1d.reference(tmp.copy()); 
    589589     CTimer::get("XIOS").suspend(); 
    590590  } 
    591591 
    592   void cxios_get_domain_mask_1d(domain_Ptr domain_hdl, bool* mask_1d, int extent1) 
    593   { 
    594     CTimer::get("XIOS").resume(); 
    595     CArray<bool,1> tmp(mask_1d, shape(extent1), neverDeleteData); 
     592  void cxios_get_domain_mask_1d(domain_Ptr domain_hdl, bool* mask_1d, int* extent) 
     593  { 
     594    CTimer::get("XIOS").resume(); 
     595    CArray<bool,1> tmp(mask_1d, shape(extent[0]), neverDeleteData); 
    596596    tmp=domain_hdl->mask_1d.getInheritedValue(); 
    597597     CTimer::get("XIOS").suspend(); 
     
    607607 
    608608 
    609   void cxios_set_domain_mask_2d(domain_Ptr domain_hdl, bool* mask_2d, int extent1, int extent2) 
    610   { 
    611     CTimer::get("XIOS").resume(); 
    612     CArray<bool,2> tmp(mask_2d, shape(extent1, extent2), neverDeleteData); 
     609  void cxios_set_domain_mask_2d(domain_Ptr domain_hdl, bool* mask_2d, int* extent) 
     610  { 
     611    CTimer::get("XIOS").resume(); 
     612    CArray<bool,2> tmp(mask_2d, shape(extent[0], extent[1]), neverDeleteData); 
    613613    domain_hdl->mask_2d.reference(tmp.copy()); 
    614614     CTimer::get("XIOS").suspend(); 
    615615  } 
    616616 
    617   void cxios_get_domain_mask_2d(domain_Ptr domain_hdl, bool* mask_2d, int extent1, int extent2) 
    618   { 
    619     CTimer::get("XIOS").resume(); 
    620     CArray<bool,2> tmp(mask_2d, shape(extent1, extent2), neverDeleteData); 
     617  void cxios_get_domain_mask_2d(domain_Ptr domain_hdl, bool* mask_2d, int* extent) 
     618  { 
     619    CTimer::get("XIOS").resume(); 
     620    CArray<bool,2> tmp(mask_2d, shape(extent[0], extent[1]), neverDeleteData); 
    621621    tmp=domain_hdl->mask_2d.getInheritedValue(); 
    622622     CTimer::get("XIOS").suspend(); 
  • XIOS/trunk/src/interface/c_attr/icdomaingroup_attr.cpp

    r666 r674  
    1818  typedef xios::CDomainGroup* domaingroup_Ptr; 
    1919 
    20   void cxios_set_domaingroup_area(domaingroup_Ptr domaingroup_hdl, double* area, int extent1, int extent2) 
    21   { 
    22     CTimer::get("XIOS").resume(); 
    23     CArray<double,2> tmp(area, shape(extent1, extent2), neverDeleteData); 
     20  void cxios_set_domaingroup_area(domaingroup_Ptr domaingroup_hdl, double* area, int* extent) 
     21  { 
     22    CTimer::get("XIOS").resume(); 
     23    CArray<double,2> tmp(area, shape(extent[0], extent[1]), neverDeleteData); 
    2424    domaingroup_hdl->area.reference(tmp.copy()); 
    2525     CTimer::get("XIOS").suspend(); 
    2626  } 
    2727 
    28   void cxios_get_domaingroup_area(domaingroup_Ptr domaingroup_hdl, double* area, int extent1, int extent2) 
    29   { 
    30     CTimer::get("XIOS").resume(); 
    31     CArray<double,2> tmp(area, shape(extent1, extent2), neverDeleteData); 
     28  void cxios_get_domaingroup_area(domaingroup_Ptr domaingroup_hdl, double* area, int* extent) 
     29  { 
     30    CTimer::get("XIOS").resume(); 
     31    CArray<double,2> tmp(area, shape(extent[0], extent[1]), neverDeleteData); 
    3232    tmp=domaingroup_hdl->area.getInheritedValue(); 
    3333     CTimer::get("XIOS").suspend(); 
     
    4343 
    4444 
    45   void cxios_set_domaingroup_bounds_lat_1d(domaingroup_Ptr domaingroup_hdl, double* bounds_lat_1d, int extent1, int extent2) 
    46   { 
    47     CTimer::get("XIOS").resume(); 
    48     CArray<double,2> tmp(bounds_lat_1d, shape(extent1, extent2), neverDeleteData); 
     45  void cxios_set_domaingroup_bounds_lat_1d(domaingroup_Ptr domaingroup_hdl, double* bounds_lat_1d, int* extent) 
     46  { 
     47    CTimer::get("XIOS").resume(); 
     48    CArray<double,2> tmp(bounds_lat_1d, shape(extent[0], extent[1]), neverDeleteData); 
    4949    domaingroup_hdl->bounds_lat_1d.reference(tmp.copy()); 
    5050     CTimer::get("XIOS").suspend(); 
    5151  } 
    5252 
    53   void cxios_get_domaingroup_bounds_lat_1d(domaingroup_Ptr domaingroup_hdl, double* bounds_lat_1d, int extent1, int extent2) 
    54   { 
    55     CTimer::get("XIOS").resume(); 
    56     CArray<double,2> tmp(bounds_lat_1d, shape(extent1, extent2), neverDeleteData); 
     53  void cxios_get_domaingroup_bounds_lat_1d(domaingroup_Ptr domaingroup_hdl, double* bounds_lat_1d, int* extent) 
     54  { 
     55    CTimer::get("XIOS").resume(); 
     56    CArray<double,2> tmp(bounds_lat_1d, shape(extent[0], extent[1]), neverDeleteData); 
    5757    tmp=domaingroup_hdl->bounds_lat_1d.getInheritedValue(); 
    5858     CTimer::get("XIOS").suspend(); 
     
    6868 
    6969 
    70   void cxios_set_domaingroup_bounds_lat_2d(domaingroup_Ptr domaingroup_hdl, double* bounds_lat_2d, int extent1, int extent2, int extent3) 
    71   { 
    72     CTimer::get("XIOS").resume(); 
    73     CArray<double,3> tmp(bounds_lat_2d, shape(extent1, extent2, extent3), neverDeleteData); 
     70  void cxios_set_domaingroup_bounds_lat_2d(domaingroup_Ptr domaingroup_hdl, double* bounds_lat_2d, int* extent) 
     71  { 
     72    CTimer::get("XIOS").resume(); 
     73    CArray<double,3> tmp(bounds_lat_2d, shape(extent[0], extent[1], extent[2]), neverDeleteData); 
    7474    domaingroup_hdl->bounds_lat_2d.reference(tmp.copy()); 
    7575     CTimer::get("XIOS").suspend(); 
    7676  } 
    7777 
    78   void cxios_get_domaingroup_bounds_lat_2d(domaingroup_Ptr domaingroup_hdl, double* bounds_lat_2d, int extent1, int extent2, int extent3) 
    79   { 
    80     CTimer::get("XIOS").resume(); 
    81     CArray<double,3> tmp(bounds_lat_2d, shape(extent1, extent2, extent3), neverDeleteData); 
     78  void cxios_get_domaingroup_bounds_lat_2d(domaingroup_Ptr domaingroup_hdl, double* bounds_lat_2d, int* extent) 
     79  { 
     80    CTimer::get("XIOS").resume(); 
     81    CArray<double,3> tmp(bounds_lat_2d, shape(extent[0], extent[1], extent[2]), neverDeleteData); 
    8282    tmp=domaingroup_hdl->bounds_lat_2d.getInheritedValue(); 
    8383     CTimer::get("XIOS").suspend(); 
     
    9393 
    9494 
    95   void cxios_set_domaingroup_bounds_lon_1d(domaingroup_Ptr domaingroup_hdl, double* bounds_lon_1d, int extent1, int extent2) 
    96   { 
    97     CTimer::get("XIOS").resume(); 
    98     CArray<double,2> tmp(bounds_lon_1d, shape(extent1, extent2), neverDeleteData); 
     95  void cxios_set_domaingroup_bounds_lon_1d(domaingroup_Ptr domaingroup_hdl, double* bounds_lon_1d, int* extent) 
     96  { 
     97    CTimer::get("XIOS").resume(); 
     98    CArray<double,2> tmp(bounds_lon_1d, shape(extent[0], extent[1]), neverDeleteData); 
    9999    domaingroup_hdl->bounds_lon_1d.reference(tmp.copy()); 
    100100     CTimer::get("XIOS").suspend(); 
    101101  } 
    102102 
    103   void cxios_get_domaingroup_bounds_lon_1d(domaingroup_Ptr domaingroup_hdl, double* bounds_lon_1d, int extent1, int extent2) 
    104   { 
    105     CTimer::get("XIOS").resume(); 
    106     CArray<double,2> tmp(bounds_lon_1d, shape(extent1, extent2), neverDeleteData); 
     103  void cxios_get_domaingroup_bounds_lon_1d(domaingroup_Ptr domaingroup_hdl, double* bounds_lon_1d, int* extent) 
     104  { 
     105    CTimer::get("XIOS").resume(); 
     106    CArray<double,2> tmp(bounds_lon_1d, shape(extent[0], extent[1]), neverDeleteData); 
    107107    tmp=domaingroup_hdl->bounds_lon_1d.getInheritedValue(); 
    108108     CTimer::get("XIOS").suspend(); 
     
    118118 
    119119 
    120   void cxios_set_domaingroup_bounds_lon_2d(domaingroup_Ptr domaingroup_hdl, double* bounds_lon_2d, int extent1, int extent2, int extent3) 
    121   { 
    122     CTimer::get("XIOS").resume(); 
    123     CArray<double,3> tmp(bounds_lon_2d, shape(extent1, extent2, extent3), neverDeleteData); 
     120  void cxios_set_domaingroup_bounds_lon_2d(domaingroup_Ptr domaingroup_hdl, double* bounds_lon_2d, int* extent) 
     121  { 
     122    CTimer::get("XIOS").resume(); 
     123    CArray<double,3> tmp(bounds_lon_2d, shape(extent[0], extent[1], extent[2]), neverDeleteData); 
    124124    domaingroup_hdl->bounds_lon_2d.reference(tmp.copy()); 
    125125     CTimer::get("XIOS").suspend(); 
    126126  } 
    127127 
    128   void cxios_get_domaingroup_bounds_lon_2d(domaingroup_Ptr domaingroup_hdl, double* bounds_lon_2d, int extent1, int extent2, int extent3) 
    129   { 
    130     CTimer::get("XIOS").resume(); 
    131     CArray<double,3> tmp(bounds_lon_2d, shape(extent1, extent2, extent3), neverDeleteData); 
     128  void cxios_get_domaingroup_bounds_lon_2d(domaingroup_Ptr domaingroup_hdl, double* bounds_lon_2d, int* extent) 
     129  { 
     130    CTimer::get("XIOS").resume(); 
     131    CArray<double,3> tmp(bounds_lon_2d, shape(extent[0], extent[1], extent[2]), neverDeleteData); 
    132132    tmp=domaingroup_hdl->bounds_lon_2d.getInheritedValue(); 
    133133     CTimer::get("XIOS").suspend(); 
     
    166166 
    167167 
    168   void cxios_set_domaingroup_data_i_index(domaingroup_Ptr domaingroup_hdl, int* data_i_index, int extent1) 
    169   { 
    170     CTimer::get("XIOS").resume(); 
    171     CArray<int,1> tmp(data_i_index, shape(extent1), neverDeleteData); 
     168  void cxios_set_domaingroup_data_i_index(domaingroup_Ptr domaingroup_hdl, int* data_i_index, int* extent) 
     169  { 
     170    CTimer::get("XIOS").resume(); 
     171    CArray<int,1> tmp(data_i_index, shape(extent[0]), neverDeleteData); 
    172172    domaingroup_hdl->data_i_index.reference(tmp.copy()); 
    173173     CTimer::get("XIOS").suspend(); 
    174174  } 
    175175 
    176   void cxios_get_domaingroup_data_i_index(domaingroup_Ptr domaingroup_hdl, int* data_i_index, int extent1) 
    177   { 
    178     CTimer::get("XIOS").resume(); 
    179     CArray<int,1> tmp(data_i_index, shape(extent1), neverDeleteData); 
     176  void cxios_get_domaingroup_data_i_index(domaingroup_Ptr domaingroup_hdl, int* data_i_index, int* extent) 
     177  { 
     178    CTimer::get("XIOS").resume(); 
     179    CArray<int,1> tmp(data_i_index, shape(extent[0]), neverDeleteData); 
    180180    tmp=domaingroup_hdl->data_i_index.getInheritedValue(); 
    181181     CTimer::get("XIOS").suspend(); 
     
    214214 
    215215 
    216   void cxios_set_domaingroup_data_j_index(domaingroup_Ptr domaingroup_hdl, int* data_j_index, int extent1) 
    217   { 
    218     CTimer::get("XIOS").resume(); 
    219     CArray<int,1> tmp(data_j_index, shape(extent1), neverDeleteData); 
     216  void cxios_set_domaingroup_data_j_index(domaingroup_Ptr domaingroup_hdl, int* data_j_index, int* extent) 
     217  { 
     218    CTimer::get("XIOS").resume(); 
     219    CArray<int,1> tmp(data_j_index, shape(extent[0]), neverDeleteData); 
    220220    domaingroup_hdl->data_j_index.reference(tmp.copy()); 
    221221     CTimer::get("XIOS").suspend(); 
    222222  } 
    223223 
    224   void cxios_get_domaingroup_data_j_index(domaingroup_Ptr domaingroup_hdl, int* data_j_index, int extent1) 
    225   { 
    226     CTimer::get("XIOS").resume(); 
    227     CArray<int,1> tmp(data_j_index, shape(extent1), neverDeleteData); 
     224  void cxios_get_domaingroup_data_j_index(domaingroup_Ptr domaingroup_hdl, int* data_j_index, int* extent) 
     225  { 
     226    CTimer::get("XIOS").resume(); 
     227    CArray<int,1> tmp(data_j_index, shape(extent[0]), neverDeleteData); 
    228228    tmp=domaingroup_hdl->data_j_index.getInheritedValue(); 
    229229     CTimer::get("XIOS").suspend(); 
     
    386386 
    387387 
    388   void cxios_set_domaingroup_i_index(domaingroup_Ptr domaingroup_hdl, int* i_index, int extent1) 
    389   { 
    390     CTimer::get("XIOS").resume(); 
    391     CArray<int,1> tmp(i_index, shape(extent1), neverDeleteData); 
     388  void cxios_set_domaingroup_i_index(domaingroup_Ptr domaingroup_hdl, int* i_index, int* extent) 
     389  { 
     390    CTimer::get("XIOS").resume(); 
     391    CArray<int,1> tmp(i_index, shape(extent[0]), neverDeleteData); 
    392392    domaingroup_hdl->i_index.reference(tmp.copy()); 
    393393     CTimer::get("XIOS").suspend(); 
    394394  } 
    395395 
    396   void cxios_get_domaingroup_i_index(domaingroup_Ptr domaingroup_hdl, int* i_index, int extent1) 
    397   { 
    398     CTimer::get("XIOS").resume(); 
    399     CArray<int,1> tmp(i_index, shape(extent1), neverDeleteData); 
     396  void cxios_get_domaingroup_i_index(domaingroup_Ptr domaingroup_hdl, int* i_index, int* extent) 
     397  { 
     398    CTimer::get("XIOS").resume(); 
     399    CArray<int,1> tmp(i_index, shape(extent[0]), neverDeleteData); 
    400400    tmp=domaingroup_hdl->i_index.getInheritedValue(); 
    401401     CTimer::get("XIOS").suspend(); 
     
    434434 
    435435 
    436   void cxios_set_domaingroup_j_index(domaingroup_Ptr domaingroup_hdl, int* j_index, int extent1) 
    437   { 
    438     CTimer::get("XIOS").resume(); 
    439     CArray<int,1> tmp(j_index, shape(extent1), neverDeleteData); 
     436  void cxios_set_domaingroup_j_index(domaingroup_Ptr domaingroup_hdl, int* j_index, int* extent) 
     437  { 
     438    CTimer::get("XIOS").resume(); 
     439    CArray<int,1> tmp(j_index, shape(extent[0]), neverDeleteData); 
    440440    domaingroup_hdl->j_index.reference(tmp.copy()); 
    441441     CTimer::get("XIOS").suspend(); 
    442442  } 
    443443 
    444   void cxios_get_domaingroup_j_index(domaingroup_Ptr domaingroup_hdl, int* j_index, int extent1) 
    445   { 
    446     CTimer::get("XIOS").resume(); 
    447     CArray<int,1> tmp(j_index, shape(extent1), neverDeleteData); 
     444  void cxios_get_domaingroup_j_index(domaingroup_Ptr domaingroup_hdl, int* j_index, int* extent) 
     445  { 
     446    CTimer::get("XIOS").resume(); 
     447    CArray<int,1> tmp(j_index, shape(extent[0]), neverDeleteData); 
    448448    tmp=domaingroup_hdl->j_index.getInheritedValue(); 
    449449     CTimer::get("XIOS").suspend(); 
     
    482482 
    483483 
    484   void cxios_set_domaingroup_latvalue_1d(domaingroup_Ptr domaingroup_hdl, double* latvalue_1d, int extent1) 
    485   { 
    486     CTimer::get("XIOS").resume(); 
    487     CArray<double,1> tmp(latvalue_1d, shape(extent1), neverDeleteData); 
     484  void cxios_set_domaingroup_latvalue_1d(domaingroup_Ptr domaingroup_hdl, double* latvalue_1d, int* extent) 
     485  { 
     486    CTimer::get("XIOS").resume(); 
     487    CArray<double,1> tmp(latvalue_1d, shape(extent[0]), neverDeleteData); 
    488488    domaingroup_hdl->latvalue_1d.reference(tmp.copy()); 
    489489     CTimer::get("XIOS").suspend(); 
    490490  } 
    491491 
    492   void cxios_get_domaingroup_latvalue_1d(domaingroup_Ptr domaingroup_hdl, double* latvalue_1d, int extent1) 
    493   { 
    494     CTimer::get("XIOS").resume(); 
    495     CArray<double,1> tmp(latvalue_1d, shape(extent1), neverDeleteData); 
     492  void cxios_get_domaingroup_latvalue_1d(domaingroup_Ptr domaingroup_hdl, double* latvalue_1d, int* extent) 
     493  { 
     494    CTimer::get("XIOS").resume(); 
     495    CArray<double,1> tmp(latvalue_1d, shape(extent[0]), neverDeleteData); 
    496496    tmp=domaingroup_hdl->latvalue_1d.getInheritedValue(); 
    497497     CTimer::get("XIOS").suspend(); 
     
    507507 
    508508 
    509   void cxios_set_domaingroup_latvalue_2d(domaingroup_Ptr domaingroup_hdl, double* latvalue_2d, int extent1, int extent2) 
    510   { 
    511     CTimer::get("XIOS").resume(); 
    512     CArray<double,2> tmp(latvalue_2d, shape(extent1, extent2), neverDeleteData); 
     509  void cxios_set_domaingroup_latvalue_2d(domaingroup_Ptr domaingroup_hdl, double* latvalue_2d, int* extent) 
     510  { 
     511    CTimer::get("XIOS").resume(); 
     512    CArray<double,2> tmp(latvalue_2d, shape(extent[0], extent[1]), neverDeleteData); 
    513513    domaingroup_hdl->latvalue_2d.reference(tmp.copy()); 
    514514     CTimer::get("XIOS").suspend(); 
    515515  } 
    516516 
    517   void cxios_get_domaingroup_latvalue_2d(domaingroup_Ptr domaingroup_hdl, double* latvalue_2d, int extent1, int extent2) 
    518   { 
    519     CTimer::get("XIOS").resume(); 
    520     CArray<double,2> tmp(latvalue_2d, shape(extent1, extent2), neverDeleteData); 
     517  void cxios_get_domaingroup_latvalue_2d(domaingroup_Ptr domaingroup_hdl, double* latvalue_2d, int* extent) 
     518  { 
     519    CTimer::get("XIOS").resume(); 
     520    CArray<double,2> tmp(latvalue_2d, shape(extent[0], extent[1]), neverDeleteData); 
    521521    tmp=domaingroup_hdl->latvalue_2d.getInheritedValue(); 
    522522     CTimer::get("XIOS").suspend(); 
     
    558558 
    559559 
    560   void cxios_set_domaingroup_lonvalue_1d(domaingroup_Ptr domaingroup_hdl, double* lonvalue_1d, int extent1) 
    561   { 
    562     CTimer::get("XIOS").resume(); 
    563     CArray<double,1> tmp(lonvalue_1d, shape(extent1), neverDeleteData); 
     560  void cxios_set_domaingroup_lonvalue_1d(domaingroup_Ptr domaingroup_hdl, double* lonvalue_1d, int* extent) 
     561  { 
     562    CTimer::get("XIOS").resume(); 
     563    CArray<double,1> tmp(lonvalue_1d, shape(extent[0]), neverDeleteData); 
    564564    domaingroup_hdl->lonvalue_1d.reference(tmp.copy()); 
    565565     CTimer::get("XIOS").suspend(); 
    566566  } 
    567567 
    568   void cxios_get_domaingroup_lonvalue_1d(domaingroup_Ptr domaingroup_hdl, double* lonvalue_1d, int extent1) 
    569   { 
    570     CTimer::get("XIOS").resume(); 
    571     CArray<double,1> tmp(lonvalue_1d, shape(extent1), neverDeleteData); 
     568  void cxios_get_domaingroup_lonvalue_1d(domaingroup_Ptr domaingroup_hdl, double* lonvalue_1d, int* extent) 
     569  { 
     570    CTimer::get("XIOS").resume(); 
     571    CArray<double,1> tmp(lonvalue_1d, shape(extent[0]), neverDeleteData); 
    572572    tmp=domaingroup_hdl->lonvalue_1d.getInheritedValue(); 
    573573     CTimer::get("XIOS").suspend(); 
     
    583583 
    584584 
    585   void cxios_set_domaingroup_lonvalue_2d(domaingroup_Ptr domaingroup_hdl, double* lonvalue_2d, int extent1, int extent2) 
    586   { 
    587     CTimer::get("XIOS").resume(); 
    588     CArray<double,2> tmp(lonvalue_2d, shape(extent1, extent2), neverDeleteData); 
     585  void cxios_set_domaingroup_lonvalue_2d(domaingroup_Ptr domaingroup_hdl, double* lonvalue_2d, int* extent) 
     586  { 
     587    CTimer::get("XIOS").resume(); 
     588    CArray<double,2> tmp(lonvalue_2d, shape(extent[0], extent[1]), neverDeleteData); 
    589589    domaingroup_hdl->lonvalue_2d.reference(tmp.copy()); 
    590590     CTimer::get("XIOS").suspend(); 
    591591  } 
    592592 
    593   void cxios_get_domaingroup_lonvalue_2d(domaingroup_Ptr domaingroup_hdl, double* lonvalue_2d, int extent1, int extent2) 
    594   { 
    595     CTimer::get("XIOS").resume(); 
    596     CArray<double,2> tmp(lonvalue_2d, shape(extent1, extent2), neverDeleteData); 
     593  void cxios_get_domaingroup_lonvalue_2d(domaingroup_Ptr domaingroup_hdl, double* lonvalue_2d, int* extent) 
     594  { 
     595    CTimer::get("XIOS").resume(); 
     596    CArray<double,2> tmp(lonvalue_2d, shape(extent[0], extent[1]), neverDeleteData); 
    597597    tmp=domaingroup_hdl->lonvalue_2d.getInheritedValue(); 
    598598     CTimer::get("XIOS").suspend(); 
     
    608608 
    609609 
    610   void cxios_set_domaingroup_mask_1d(domaingroup_Ptr domaingroup_hdl, bool* mask_1d, int extent1) 
    611   { 
    612     CTimer::get("XIOS").resume(); 
    613     CArray<bool,1> tmp(mask_1d, shape(extent1), neverDeleteData); 
     610  void cxios_set_domaingroup_mask_1d(domaingroup_Ptr domaingroup_hdl, bool* mask_1d, int* extent) 
     611  { 
     612    CTimer::get("XIOS").resume(); 
     613    CArray<bool,1> tmp(mask_1d, shape(extent[0]), neverDeleteData); 
    614614    domaingroup_hdl->mask_1d.reference(tmp.copy()); 
    615615     CTimer::get("XIOS").suspend(); 
    616616  } 
    617617 
    618   void cxios_get_domaingroup_mask_1d(domaingroup_Ptr domaingroup_hdl, bool* mask_1d, int extent1) 
    619   { 
    620     CTimer::get("XIOS").resume(); 
    621     CArray<bool,1> tmp(mask_1d, shape(extent1), neverDeleteData); 
     618  void cxios_get_domaingroup_mask_1d(domaingroup_Ptr domaingroup_hdl, bool* mask_1d, int* extent) 
     619  { 
     620    CTimer::get("XIOS").resume(); 
     621    CArray<bool,1> tmp(mask_1d, shape(extent[0]), neverDeleteData); 
    622622    tmp=domaingroup_hdl->mask_1d.getInheritedValue(); 
    623623     CTimer::get("XIOS").suspend(); 
     
    633633 
    634634 
    635   void cxios_set_domaingroup_mask_2d(domaingroup_Ptr domaingroup_hdl, bool* mask_2d, int extent1, int extent2) 
    636   { 
    637     CTimer::get("XIOS").resume(); 
    638     CArray<bool,2> tmp(mask_2d, shape(extent1, extent2), neverDeleteData); 
     635  void cxios_set_domaingroup_mask_2d(domaingroup_Ptr domaingroup_hdl, bool* mask_2d, int* extent) 
     636  { 
     637    CTimer::get("XIOS").resume(); 
     638    CArray<bool,2> tmp(mask_2d, shape(extent[0], extent[1]), neverDeleteData); 
    639639    domaingroup_hdl->mask_2d.reference(tmp.copy()); 
    640640     CTimer::get("XIOS").suspend(); 
    641641  } 
    642642 
    643   void cxios_get_domaingroup_mask_2d(domaingroup_Ptr domaingroup_hdl, bool* mask_2d, int extent1, int extent2) 
    644   { 
    645     CTimer::get("XIOS").resume(); 
    646     CArray<bool,2> tmp(mask_2d, shape(extent1, extent2), neverDeleteData); 
     643  void cxios_get_domaingroup_mask_2d(domaingroup_Ptr domaingroup_hdl, bool* mask_2d, int* extent) 
     644  { 
     645    CTimer::get("XIOS").resume(); 
     646    CArray<bool,2> tmp(mask_2d, shape(extent[0], extent[1]), neverDeleteData); 
    647647    tmp=domaingroup_hdl->mask_2d.getInheritedValue(); 
    648648     CTimer::get("XIOS").suspend(); 
  • XIOS/trunk/src/interface/c_attr/icgrid_attr.cpp

    r591 r674  
    1818  typedef xios::CGrid* grid_Ptr; 
    1919 
    20   void cxios_set_grid_axis_domain_order(grid_Ptr grid_hdl, bool* axis_domain_order, int extent1) 
     20  void cxios_set_grid_axis_domain_order(grid_Ptr grid_hdl, bool* axis_domain_order, int* extent) 
    2121  { 
    2222    CTimer::get("XIOS").resume(); 
    23     CArray<bool,1> tmp(axis_domain_order, shape(extent1), neverDeleteData); 
     23    CArray<bool,1> tmp(axis_domain_order, shape(extent[0]), neverDeleteData); 
    2424    grid_hdl->axis_domain_order.reference(tmp.copy()); 
    2525     CTimer::get("XIOS").suspend(); 
    2626  } 
    2727 
    28   void cxios_get_grid_axis_domain_order(grid_Ptr grid_hdl, bool* axis_domain_order, int extent1) 
     28  void cxios_get_grid_axis_domain_order(grid_Ptr grid_hdl, bool* axis_domain_order, int* extent) 
    2929  { 
    3030    CTimer::get("XIOS").resume(); 
    31     CArray<bool,1> tmp(axis_domain_order, shape(extent1), neverDeleteData); 
     31    CArray<bool,1> tmp(axis_domain_order, shape(extent[0]), neverDeleteData); 
    3232    tmp=grid_hdl->axis_domain_order.getInheritedValue(); 
    3333     CTimer::get("XIOS").suspend(); 
     
    6969 
    7070 
    71   void cxios_set_grid_mask1(grid_Ptr grid_hdl, bool* mask1, int extent1) 
     71  void cxios_set_grid_mask1(grid_Ptr grid_hdl, bool* mask1, int* extent) 
    7272  { 
    7373    CTimer::get("XIOS").resume(); 
    74     CArray<bool,1> tmp(mask1, shape(extent1), neverDeleteData); 
     74    CArray<bool,1> tmp(mask1, shape(extent[0]), neverDeleteData); 
    7575    grid_hdl->mask1.reference(tmp.copy()); 
    7676     CTimer::get("XIOS").suspend(); 
    7777  } 
    7878 
    79   void cxios_get_grid_mask1(grid_Ptr grid_hdl, bool* mask1, int extent1) 
     79  void cxios_get_grid_mask1(grid_Ptr grid_hdl, bool* mask1, int* extent) 
    8080  { 
    8181    CTimer::get("XIOS").resume(); 
    82     CArray<bool,1> tmp(mask1, shape(extent1), neverDeleteData); 
     82    CArray<bool,1> tmp(mask1, shape(extent[0]), neverDeleteData); 
    8383    tmp=grid_hdl->mask1.getInheritedValue(); 
    8484     CTimer::get("XIOS").suspend(); 
     
    9494 
    9595 
    96   void cxios_set_grid_mask2(grid_Ptr grid_hdl, bool* mask2, int extent1, int extent2) 
     96  void cxios_set_grid_mask2(grid_Ptr grid_hdl, bool* mask2, int* extent) 
    9797  { 
    9898    CTimer::get("XIOS").resume(); 
    99     CArray<bool,2> tmp(mask2, shape(extent1, extent2), neverDeleteData); 
     99    CArray<bool,2> tmp(mask2, shape(extent[0], extent[1]), neverDeleteData); 
    100100    grid_hdl->mask2.reference(tmp.copy()); 
    101101     CTimer::get("XIOS").suspend(); 
    102102  } 
    103103 
    104   void cxios_get_grid_mask2(grid_Ptr grid_hdl, bool* mask2, int extent1, int extent2) 
     104  void cxios_get_grid_mask2(grid_Ptr grid_hdl, bool* mask2, int* extent) 
    105105  { 
    106106    CTimer::get("XIOS").resume(); 
    107     CArray<bool,2> tmp(mask2, shape(extent1, extent2), neverDeleteData); 
     107    CArray<bool,2> tmp(mask2, shape(extent[0], extent[1]), neverDeleteData); 
    108108    tmp=grid_hdl->mask2.getInheritedValue(); 
    109109     CTimer::get("XIOS").suspend(); 
     
    119119 
    120120 
    121   void cxios_set_grid_mask3(grid_Ptr grid_hdl, bool* mask3, int extent1, int extent2, int extent3) 
     121  void cxios_set_grid_mask3(grid_Ptr grid_hdl, bool* mask3, int* extent) 
    122122  { 
    123123    CTimer::get("XIOS").resume(); 
    124     CArray<bool,3> tmp(mask3, shape(extent1, extent2, extent3), neverDeleteData); 
     124    CArray<bool,3> tmp(mask3, shape(extent[0], extent[1], extent[2]), neverDeleteData); 
    125125    grid_hdl->mask3.reference(tmp.copy()); 
    126126     CTimer::get("XIOS").suspend(); 
    127127  } 
    128128 
    129   void cxios_get_grid_mask3(grid_Ptr grid_hdl, bool* mask3, int extent1, int extent2, int extent3) 
     129  void cxios_get_grid_mask3(grid_Ptr grid_hdl, bool* mask3, int* extent) 
    130130  { 
    131131    CTimer::get("XIOS").resume(); 
    132     CArray<bool,3> tmp(mask3, shape(extent1, extent2, extent3), neverDeleteData); 
     132    CArray<bool,3> tmp(mask3, shape(extent[0], extent[1], extent[2]), neverDeleteData); 
    133133    tmp=grid_hdl->mask3.getInheritedValue(); 
    134134     CTimer::get("XIOS").suspend(); 
  • XIOS/trunk/src/interface/c_attr/icgridgroup_attr.cpp

    r591 r674  
    1818  typedef xios::CGridGroup* gridgroup_Ptr; 
    1919 
    20   void cxios_set_gridgroup_axis_domain_order(gridgroup_Ptr gridgroup_hdl, bool* axis_domain_order, int extent1) 
     20  void cxios_set_gridgroup_axis_domain_order(gridgroup_Ptr gridgroup_hdl, bool* axis_domain_order, int* extent) 
    2121  { 
    2222    CTimer::get("XIOS").resume(); 
    23     CArray<bool,1> tmp(axis_domain_order, shape(extent1), neverDeleteData); 
     23    CArray<bool,1> tmp(axis_domain_order, shape(extent[0]), neverDeleteData); 
    2424    gridgroup_hdl->axis_domain_order.reference(tmp.copy()); 
    2525     CTimer::get("XIOS").suspend(); 
    2626  } 
    2727 
    28   void cxios_get_gridgroup_axis_domain_order(gridgroup_Ptr gridgroup_hdl, bool* axis_domain_order, int extent1) 
     28  void cxios_get_gridgroup_axis_domain_order(gridgroup_Ptr gridgroup_hdl, bool* axis_domain_order, int* extent) 
    2929  { 
    3030    CTimer::get("XIOS").resume(); 
    31     CArray<bool,1> tmp(axis_domain_order, shape(extent1), neverDeleteData); 
     31    CArray<bool,1> tmp(axis_domain_order, shape(extent[0]), neverDeleteData); 
    3232    tmp=gridgroup_hdl->axis_domain_order.getInheritedValue(); 
    3333     CTimer::get("XIOS").suspend(); 
     
    9595 
    9696 
    97   void cxios_set_gridgroup_mask1(gridgroup_Ptr gridgroup_hdl, bool* mask1, int extent1) 
     97  void cxios_set_gridgroup_mask1(gridgroup_Ptr gridgroup_hdl, bool* mask1, int* extent) 
    9898  { 
    9999    CTimer::get("XIOS").resume(); 
    100     CArray<bool,1> tmp(mask1, shape(extent1), neverDeleteData); 
     100    CArray<bool,1> tmp(mask1, shape(extent[0]), neverDeleteData); 
    101101    gridgroup_hdl->mask1.reference(tmp.copy()); 
    102102     CTimer::get("XIOS").suspend(); 
    103103  } 
    104104 
    105   void cxios_get_gridgroup_mask1(gridgroup_Ptr gridgroup_hdl, bool* mask1, int extent1) 
     105  void cxios_get_gridgroup_mask1(gridgroup_Ptr gridgroup_hdl, bool* mask1, int* extent) 
    106106  { 
    107107    CTimer::get("XIOS").resume(); 
    108     CArray<bool,1> tmp(mask1, shape(extent1), neverDeleteData); 
     108    CArray<bool,1> tmp(mask1, shape(extent[0]), neverDeleteData); 
    109109    tmp=gridgroup_hdl->mask1.getInheritedValue(); 
    110110     CTimer::get("XIOS").suspend(); 
     
    120120 
    121121 
    122   void cxios_set_gridgroup_mask2(gridgroup_Ptr gridgroup_hdl, bool* mask2, int extent1, int extent2) 
     122  void cxios_set_gridgroup_mask2(gridgroup_Ptr gridgroup_hdl, bool* mask2, int* extent) 
    123123  { 
    124124    CTimer::get("XIOS").resume(); 
    125     CArray<bool,2> tmp(mask2, shape(extent1, extent2), neverDeleteData); 
     125    CArray<bool,2> tmp(mask2, shape(extent[0], extent[1]), neverDeleteData); 
    126126    gridgroup_hdl->mask2.reference(tmp.copy()); 
    127127     CTimer::get("XIOS").suspend(); 
    128128  } 
    129129 
    130   void cxios_get_gridgroup_mask2(gridgroup_Ptr gridgroup_hdl, bool* mask2, int extent1, int extent2) 
     130  void cxios_get_gridgroup_mask2(gridgroup_Ptr gridgroup_hdl, bool* mask2, int* extent) 
    131131  { 
    132132    CTimer::get("XIOS").resume(); 
    133     CArray<bool,2> tmp(mask2, shape(extent1, extent2), neverDeleteData); 
     133    CArray<bool,2> tmp(mask2, shape(extent[0], extent[1]), neverDeleteData); 
    134134    tmp=gridgroup_hdl->mask2.getInheritedValue(); 
    135135     CTimer::get("XIOS").suspend(); 
     
    145145 
    146146 
    147   void cxios_set_gridgroup_mask3(gridgroup_Ptr gridgroup_hdl, bool* mask3, int extent1, int extent2, int extent3) 
     147  void cxios_set_gridgroup_mask3(gridgroup_Ptr gridgroup_hdl, bool* mask3, int* extent) 
    148148  { 
    149149    CTimer::get("XIOS").resume(); 
    150     CArray<bool,3> tmp(mask3, shape(extent1, extent2, extent3), neverDeleteData); 
     150    CArray<bool,3> tmp(mask3, shape(extent[0], extent[1], extent[2]), neverDeleteData); 
    151151    gridgroup_hdl->mask3.reference(tmp.copy()); 
    152152     CTimer::get("XIOS").suspend(); 
    153153  } 
    154154 
    155   void cxios_get_gridgroup_mask3(gridgroup_Ptr gridgroup_hdl, bool* mask3, int extent1, int extent2, int extent3) 
     155  void cxios_get_gridgroup_mask3(gridgroup_Ptr gridgroup_hdl, bool* mask3, int* extent) 
    156156  { 
    157157    CTimer::get("XIOS").resume(); 
    158     CArray<bool,3> tmp(mask3, shape(extent1, extent2, extent3), neverDeleteData); 
     158    CArray<bool,3> tmp(mask3, shape(extent[0], extent[1], extent[2]), neverDeleteData); 
    159159    tmp=gridgroup_hdl->mask3.getInheritedValue(); 
    160160     CTimer::get("XIOS").suspend(); 
  • XIOS/trunk/src/interface/fortran_attr/axis_interface_attr.F90

    r666 r674  
    5050 
    5151 
    52     SUBROUTINE cxios_set_axis_bounds(axis_hdl, bounds, extent1, extent2) BIND(C) 
     52    SUBROUTINE cxios_set_axis_bounds(axis_hdl, bounds, extent) BIND(C) 
    5353      USE ISO_C_BINDING 
    5454      INTEGER (kind = C_INTPTR_T), VALUE       :: axis_hdl 
    5555      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: bounds 
    56       INTEGER (kind = C_INT), VALUE  :: extent1 
    57       INTEGER (kind = C_INT), VALUE  :: extent2 
     56      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    5857    END SUBROUTINE cxios_set_axis_bounds 
    5958 
    60     SUBROUTINE cxios_get_axis_bounds(axis_hdl, bounds, extent1, extent2) BIND(C) 
     59    SUBROUTINE cxios_get_axis_bounds(axis_hdl, bounds, extent) BIND(C) 
    6160      USE ISO_C_BINDING 
    6261      INTEGER (kind = C_INTPTR_T), VALUE       :: axis_hdl 
    6362      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: bounds 
    64       INTEGER (kind = C_INT), VALUE  :: extent1 
    65       INTEGER (kind = C_INT), VALUE  :: extent2 
     63      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    6664    END SUBROUTINE cxios_get_axis_bounds 
    6765 
     
    9290 
    9391 
    94     SUBROUTINE cxios_set_axis_data_index(axis_hdl, data_index, extent1) BIND(C) 
     92    SUBROUTINE cxios_set_axis_data_index(axis_hdl, data_index, extent) BIND(C) 
    9593      USE ISO_C_BINDING 
    9694      INTEGER (kind = C_INTPTR_T), VALUE       :: axis_hdl 
    9795      INTEGER (KIND=C_INT)     , DIMENSION(*) :: data_index 
    98       INTEGER (kind = C_INT), VALUE  :: extent1 
     96      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    9997    END SUBROUTINE cxios_set_axis_data_index 
    10098 
    101     SUBROUTINE cxios_get_axis_data_index(axis_hdl, data_index, extent1) BIND(C) 
     99    SUBROUTINE cxios_get_axis_data_index(axis_hdl, data_index, extent) BIND(C) 
    102100      USE ISO_C_BINDING 
    103101      INTEGER (kind = C_INTPTR_T), VALUE       :: axis_hdl 
    104102      INTEGER (KIND=C_INT)     , DIMENSION(*) :: data_index 
    105       INTEGER (kind = C_INT), VALUE  :: extent1 
     103      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    106104    END SUBROUTINE cxios_get_axis_data_index 
    107105 
     
    153151 
    154152 
    155     SUBROUTINE cxios_set_axis_mask(axis_hdl, mask, extent1) BIND(C) 
     153    SUBROUTINE cxios_set_axis_mask(axis_hdl, mask, extent) BIND(C) 
    156154      USE ISO_C_BINDING 
    157155      INTEGER (kind = C_INTPTR_T), VALUE       :: axis_hdl 
    158156      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask 
    159       INTEGER (kind = C_INT), VALUE  :: extent1 
     157      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    160158    END SUBROUTINE cxios_set_axis_mask 
    161159 
    162     SUBROUTINE cxios_get_axis_mask(axis_hdl, mask, extent1) BIND(C) 
     160    SUBROUTINE cxios_get_axis_mask(axis_hdl, mask, extent) BIND(C) 
    163161      USE ISO_C_BINDING 
    164162      INTEGER (kind = C_INTPTR_T), VALUE       :: axis_hdl 
    165163      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask 
    166       INTEGER (kind = C_INT), VALUE  :: extent1 
     164      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    167165    END SUBROUTINE cxios_get_axis_mask 
    168166 
     
    296294 
    297295 
    298     SUBROUTINE cxios_set_axis_value(axis_hdl, value, extent1) BIND(C) 
     296    SUBROUTINE cxios_set_axis_value(axis_hdl, value, extent) BIND(C) 
    299297      USE ISO_C_BINDING 
    300298      INTEGER (kind = C_INTPTR_T), VALUE       :: axis_hdl 
    301299      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: value 
    302       INTEGER (kind = C_INT), VALUE  :: extent1 
     300      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    303301    END SUBROUTINE cxios_set_axis_value 
    304302 
    305     SUBROUTINE cxios_get_axis_value(axis_hdl, value, extent1) BIND(C) 
     303    SUBROUTINE cxios_get_axis_value(axis_hdl, value, extent) BIND(C) 
    306304      USE ISO_C_BINDING 
    307305      INTEGER (kind = C_INTPTR_T), VALUE       :: axis_hdl 
    308306      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: value 
    309       INTEGER (kind = C_INT), VALUE  :: extent1 
     307      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    310308    END SUBROUTINE cxios_get_axis_value 
    311309 
  • XIOS/trunk/src/interface/fortran_attr/axisgroup_interface_attr.F90

    r666 r674  
    5050 
    5151 
    52     SUBROUTINE cxios_set_axisgroup_bounds(axisgroup_hdl, bounds, extent1, extent2) BIND(C) 
     52    SUBROUTINE cxios_set_axisgroup_bounds(axisgroup_hdl, bounds, extent) BIND(C) 
    5353      USE ISO_C_BINDING 
    5454      INTEGER (kind = C_INTPTR_T), VALUE       :: axisgroup_hdl 
    5555      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: bounds 
    56       INTEGER (kind = C_INT), VALUE  :: extent1 
    57       INTEGER (kind = C_INT), VALUE  :: extent2 
     56      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    5857    END SUBROUTINE cxios_set_axisgroup_bounds 
    5958 
    60     SUBROUTINE cxios_get_axisgroup_bounds(axisgroup_hdl, bounds, extent1, extent2) BIND(C) 
     59    SUBROUTINE cxios_get_axisgroup_bounds(axisgroup_hdl, bounds, extent) BIND(C) 
    6160      USE ISO_C_BINDING 
    6261      INTEGER (kind = C_INTPTR_T), VALUE       :: axisgroup_hdl 
    6362      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: bounds 
    64       INTEGER (kind = C_INT), VALUE  :: extent1 
    65       INTEGER (kind = C_INT), VALUE  :: extent2 
     63      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    6664    END SUBROUTINE cxios_get_axisgroup_bounds 
    6765 
     
    9290 
    9391 
    94     SUBROUTINE cxios_set_axisgroup_data_index(axisgroup_hdl, data_index, extent1) BIND(C) 
     92    SUBROUTINE cxios_set_axisgroup_data_index(axisgroup_hdl, data_index, extent) BIND(C) 
    9593      USE ISO_C_BINDING 
    9694      INTEGER (kind = C_INTPTR_T), VALUE       :: axisgroup_hdl 
    9795      INTEGER (KIND=C_INT)     , DIMENSION(*) :: data_index 
    98       INTEGER (kind = C_INT), VALUE  :: extent1 
     96      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    9997    END SUBROUTINE cxios_set_axisgroup_data_index 
    10098 
    101     SUBROUTINE cxios_get_axisgroup_data_index(axisgroup_hdl, data_index, extent1) BIND(C) 
     99    SUBROUTINE cxios_get_axisgroup_data_index(axisgroup_hdl, data_index, extent) BIND(C) 
    102100      USE ISO_C_BINDING 
    103101      INTEGER (kind = C_INTPTR_T), VALUE       :: axisgroup_hdl 
    104102      INTEGER (KIND=C_INT)     , DIMENSION(*) :: data_index 
    105       INTEGER (kind = C_INT), VALUE  :: extent1 
     103      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    106104    END SUBROUTINE cxios_get_axisgroup_data_index 
    107105 
     
    174172 
    175173 
    176     SUBROUTINE cxios_set_axisgroup_mask(axisgroup_hdl, mask, extent1) BIND(C) 
     174    SUBROUTINE cxios_set_axisgroup_mask(axisgroup_hdl, mask, extent) BIND(C) 
    177175      USE ISO_C_BINDING 
    178176      INTEGER (kind = C_INTPTR_T), VALUE       :: axisgroup_hdl 
    179177      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask 
    180       INTEGER (kind = C_INT), VALUE  :: extent1 
     178      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    181179    END SUBROUTINE cxios_set_axisgroup_mask 
    182180 
    183     SUBROUTINE cxios_get_axisgroup_mask(axisgroup_hdl, mask, extent1) BIND(C) 
     181    SUBROUTINE cxios_get_axisgroup_mask(axisgroup_hdl, mask, extent) BIND(C) 
    184182      USE ISO_C_BINDING 
    185183      INTEGER (kind = C_INTPTR_T), VALUE       :: axisgroup_hdl 
    186184      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask 
    187       INTEGER (kind = C_INT), VALUE  :: extent1 
     185      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    188186    END SUBROUTINE cxios_get_axisgroup_mask 
    189187 
     
    317315 
    318316 
    319     SUBROUTINE cxios_set_axisgroup_value(axisgroup_hdl, value, extent1) BIND(C) 
     317    SUBROUTINE cxios_set_axisgroup_value(axisgroup_hdl, value, extent) BIND(C) 
    320318      USE ISO_C_BINDING 
    321319      INTEGER (kind = C_INTPTR_T), VALUE       :: axisgroup_hdl 
    322320      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: value 
    323       INTEGER (kind = C_INT), VALUE  :: extent1 
     321      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    324322    END SUBROUTINE cxios_set_axisgroup_value 
    325323 
    326     SUBROUTINE cxios_get_axisgroup_value(axisgroup_hdl, value, extent1) BIND(C) 
     324    SUBROUTINE cxios_get_axisgroup_value(axisgroup_hdl, value, extent) BIND(C) 
    327325      USE ISO_C_BINDING 
    328326      INTEGER (kind = C_INTPTR_T), VALUE       :: axisgroup_hdl 
    329327      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: value 
    330       INTEGER (kind = C_INT), VALUE  :: extent1 
     328      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    331329    END SUBROUTINE cxios_get_axisgroup_value 
    332330 
  • XIOS/trunk/src/interface/fortran_attr/calendar_wrapper_interface_attr.F90

    r581 r674  
    8686 
    8787 
    88     SUBROUTINE cxios_set_calendar_wrapper_month_lengths(calendar_wrapper_hdl, month_lengths, extent1) BIND(C) 
     88    SUBROUTINE cxios_set_calendar_wrapper_month_lengths(calendar_wrapper_hdl, month_lengths, extent) BIND(C) 
    8989      USE ISO_C_BINDING 
    9090      INTEGER (kind = C_INTPTR_T), VALUE       :: calendar_wrapper_hdl 
    9191      INTEGER (KIND=C_INT)     , DIMENSION(*) :: month_lengths 
    92       INTEGER (kind = C_INT), VALUE  :: extent1 
     92      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    9393    END SUBROUTINE cxios_set_calendar_wrapper_month_lengths 
    9494 
    95     SUBROUTINE cxios_get_calendar_wrapper_month_lengths(calendar_wrapper_hdl, month_lengths, extent1) BIND(C) 
     95    SUBROUTINE cxios_get_calendar_wrapper_month_lengths(calendar_wrapper_hdl, month_lengths, extent) BIND(C) 
    9696      USE ISO_C_BINDING 
    9797      INTEGER (kind = C_INTPTR_T), VALUE       :: calendar_wrapper_hdl 
    9898      INTEGER (KIND=C_INT)     , DIMENSION(*) :: month_lengths 
    99       INTEGER (kind = C_INT), VALUE  :: extent1 
     99      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    100100    END SUBROUTINE cxios_get_calendar_wrapper_month_lengths 
    101101 
  • XIOS/trunk/src/interface/fortran_attr/domain_interface_attr.F90

    r666 r674  
    1010    ! Do not call directly / interface FORTRAN 2003 <-> C99 
    1111 
    12     SUBROUTINE cxios_set_domain_area(domain_hdl, area, extent1, extent2) BIND(C) 
     12    SUBROUTINE cxios_set_domain_area(domain_hdl, area, extent) BIND(C) 
    1313      USE ISO_C_BINDING 
    1414      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    1515      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: area 
    16       INTEGER (kind = C_INT), VALUE  :: extent1 
    17       INTEGER (kind = C_INT), VALUE  :: extent2 
     16      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    1817    END SUBROUTINE cxios_set_domain_area 
    1918 
    20     SUBROUTINE cxios_get_domain_area(domain_hdl, area, extent1, extent2) BIND(C) 
     19    SUBROUTINE cxios_get_domain_area(domain_hdl, area, extent) BIND(C) 
    2120      USE ISO_C_BINDING 
    2221      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    2322      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: area 
    24       INTEGER (kind = C_INT), VALUE  :: extent1 
    25       INTEGER (kind = C_INT), VALUE  :: extent2 
     23      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    2624    END SUBROUTINE cxios_get_domain_area 
    2725 
     
    3331 
    3432 
    35     SUBROUTINE cxios_set_domain_bounds_lat_1d(domain_hdl, bounds_lat_1d, extent1, extent2) BIND(C) 
     33    SUBROUTINE cxios_set_domain_bounds_lat_1d(domain_hdl, bounds_lat_1d, extent) BIND(C) 
    3634      USE ISO_C_BINDING 
    3735      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    3836      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: bounds_lat_1d 
    39       INTEGER (kind = C_INT), VALUE  :: extent1 
    40       INTEGER (kind = C_INT), VALUE  :: extent2 
     37      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    4138    END SUBROUTINE cxios_set_domain_bounds_lat_1d 
    4239 
    43     SUBROUTINE cxios_get_domain_bounds_lat_1d(domain_hdl, bounds_lat_1d, extent1, extent2) BIND(C) 
     40    SUBROUTINE cxios_get_domain_bounds_lat_1d(domain_hdl, bounds_lat_1d, extent) BIND(C) 
    4441      USE ISO_C_BINDING 
    4542      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    4643      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: bounds_lat_1d 
    47       INTEGER (kind = C_INT), VALUE  :: extent1 
    48       INTEGER (kind = C_INT), VALUE  :: extent2 
     44      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    4945    END SUBROUTINE cxios_get_domain_bounds_lat_1d 
    5046 
     
    5652 
    5753 
    58     SUBROUTINE cxios_set_domain_bounds_lat_2d(domain_hdl, bounds_lat_2d, extent1, extent2, extent3) BIND(C) 
     54    SUBROUTINE cxios_set_domain_bounds_lat_2d(domain_hdl, bounds_lat_2d, extent) BIND(C) 
    5955      USE ISO_C_BINDING 
    6056      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    6157      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: bounds_lat_2d 
    62       INTEGER (kind = C_INT), VALUE  :: extent1 
    63       INTEGER (kind = C_INT), VALUE  :: extent2 
    64       INTEGER (kind = C_INT), VALUE  :: extent3 
     58      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    6559    END SUBROUTINE cxios_set_domain_bounds_lat_2d 
    6660 
    67     SUBROUTINE cxios_get_domain_bounds_lat_2d(domain_hdl, bounds_lat_2d, extent1, extent2, extent3) BIND(C) 
     61    SUBROUTINE cxios_get_domain_bounds_lat_2d(domain_hdl, bounds_lat_2d, extent) BIND(C) 
    6862      USE ISO_C_BINDING 
    6963      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    7064      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: bounds_lat_2d 
    71       INTEGER (kind = C_INT), VALUE  :: extent1 
    72       INTEGER (kind = C_INT), VALUE  :: extent2 
    73       INTEGER (kind = C_INT), VALUE  :: extent3 
     65      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    7466    END SUBROUTINE cxios_get_domain_bounds_lat_2d 
    7567 
     
    8173 
    8274 
    83     SUBROUTINE cxios_set_domain_bounds_lon_1d(domain_hdl, bounds_lon_1d, extent1, extent2) BIND(C) 
     75    SUBROUTINE cxios_set_domain_bounds_lon_1d(domain_hdl, bounds_lon_1d, extent) BIND(C) 
    8476      USE ISO_C_BINDING 
    8577      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    8678      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: bounds_lon_1d 
    87       INTEGER (kind = C_INT), VALUE  :: extent1 
    88       INTEGER (kind = C_INT), VALUE  :: extent2 
     79      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    8980    END SUBROUTINE cxios_set_domain_bounds_lon_1d 
    9081 
    91     SUBROUTINE cxios_get_domain_bounds_lon_1d(domain_hdl, bounds_lon_1d, extent1, extent2) BIND(C) 
     82    SUBROUTINE cxios_get_domain_bounds_lon_1d(domain_hdl, bounds_lon_1d, extent) BIND(C) 
    9283      USE ISO_C_BINDING 
    9384      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    9485      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: bounds_lon_1d 
    95       INTEGER (kind = C_INT), VALUE  :: extent1 
    96       INTEGER (kind = C_INT), VALUE  :: extent2 
     86      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    9787    END SUBROUTINE cxios_get_domain_bounds_lon_1d 
    9888 
     
    10494 
    10595 
    106     SUBROUTINE cxios_set_domain_bounds_lon_2d(domain_hdl, bounds_lon_2d, extent1, extent2, extent3) BIND(C) 
     96    SUBROUTINE cxios_set_domain_bounds_lon_2d(domain_hdl, bounds_lon_2d, extent) BIND(C) 
    10797      USE ISO_C_BINDING 
    10898      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    10999      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: bounds_lon_2d 
    110       INTEGER (kind = C_INT), VALUE  :: extent1 
    111       INTEGER (kind = C_INT), VALUE  :: extent2 
    112       INTEGER (kind = C_INT), VALUE  :: extent3 
     100      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    113101    END SUBROUTINE cxios_set_domain_bounds_lon_2d 
    114102 
    115     SUBROUTINE cxios_get_domain_bounds_lon_2d(domain_hdl, bounds_lon_2d, extent1, extent2, extent3) BIND(C) 
     103    SUBROUTINE cxios_get_domain_bounds_lon_2d(domain_hdl, bounds_lon_2d, extent) BIND(C) 
    116104      USE ISO_C_BINDING 
    117105      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    118106      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: bounds_lon_2d 
    119       INTEGER (kind = C_INT), VALUE  :: extent1 
    120       INTEGER (kind = C_INT), VALUE  :: extent2 
    121       INTEGER (kind = C_INT), VALUE  :: extent3 
     107      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    122108    END SUBROUTINE cxios_get_domain_bounds_lon_2d 
    123109 
     
    148134 
    149135 
    150     SUBROUTINE cxios_set_domain_data_i_index(domain_hdl, data_i_index, extent1) BIND(C) 
     136    SUBROUTINE cxios_set_domain_data_i_index(domain_hdl, data_i_index, extent) BIND(C) 
    151137      USE ISO_C_BINDING 
    152138      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    153139      INTEGER (KIND=C_INT)     , DIMENSION(*) :: data_i_index 
    154       INTEGER (kind = C_INT), VALUE  :: extent1 
     140      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    155141    END SUBROUTINE cxios_set_domain_data_i_index 
    156142 
    157     SUBROUTINE cxios_get_domain_data_i_index(domain_hdl, data_i_index, extent1) BIND(C) 
     143    SUBROUTINE cxios_get_domain_data_i_index(domain_hdl, data_i_index, extent) BIND(C) 
    158144      USE ISO_C_BINDING 
    159145      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    160146      INTEGER (KIND=C_INT)     , DIMENSION(*) :: data_i_index 
    161       INTEGER (kind = C_INT), VALUE  :: extent1 
     147      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    162148    END SUBROUTINE cxios_get_domain_data_i_index 
    163149 
     
    188174 
    189175 
    190     SUBROUTINE cxios_set_domain_data_j_index(domain_hdl, data_j_index, extent1) BIND(C) 
     176    SUBROUTINE cxios_set_domain_data_j_index(domain_hdl, data_j_index, extent) BIND(C) 
    191177      USE ISO_C_BINDING 
    192178      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    193179      INTEGER (KIND=C_INT)     , DIMENSION(*) :: data_j_index 
    194       INTEGER (kind = C_INT), VALUE  :: extent1 
     180      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    195181    END SUBROUTINE cxios_set_domain_data_j_index 
    196182 
    197     SUBROUTINE cxios_get_domain_data_j_index(domain_hdl, data_j_index, extent1) BIND(C) 
     183    SUBROUTINE cxios_get_domain_data_j_index(domain_hdl, data_j_index, extent) BIND(C) 
    198184      USE ISO_C_BINDING 
    199185      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    200186      INTEGER (KIND=C_INT)     , DIMENSION(*) :: data_j_index 
    201       INTEGER (kind = C_INT), VALUE  :: extent1 
     187      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    202188    END SUBROUTINE cxios_get_domain_data_j_index 
    203189 
     
    308294 
    309295 
    310     SUBROUTINE cxios_set_domain_i_index(domain_hdl, i_index, extent1) BIND(C) 
     296    SUBROUTINE cxios_set_domain_i_index(domain_hdl, i_index, extent) BIND(C) 
    311297      USE ISO_C_BINDING 
    312298      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    313299      INTEGER (KIND=C_INT)     , DIMENSION(*) :: i_index 
    314       INTEGER (kind = C_INT), VALUE  :: extent1 
     300      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    315301    END SUBROUTINE cxios_set_domain_i_index 
    316302 
    317     SUBROUTINE cxios_get_domain_i_index(domain_hdl, i_index, extent1) BIND(C) 
     303    SUBROUTINE cxios_get_domain_i_index(domain_hdl, i_index, extent) BIND(C) 
    318304      USE ISO_C_BINDING 
    319305      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    320306      INTEGER (KIND=C_INT)     , DIMENSION(*) :: i_index 
    321       INTEGER (kind = C_INT), VALUE  :: extent1 
     307      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    322308    END SUBROUTINE cxios_get_domain_i_index 
    323309 
     
    348334 
    349335 
    350     SUBROUTINE cxios_set_domain_j_index(domain_hdl, j_index, extent1) BIND(C) 
     336    SUBROUTINE cxios_set_domain_j_index(domain_hdl, j_index, extent) BIND(C) 
    351337      USE ISO_C_BINDING 
    352338      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    353339      INTEGER (KIND=C_INT)     , DIMENSION(*) :: j_index 
    354       INTEGER (kind = C_INT), VALUE  :: extent1 
     340      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    355341    END SUBROUTINE cxios_set_domain_j_index 
    356342 
    357     SUBROUTINE cxios_get_domain_j_index(domain_hdl, j_index, extent1) BIND(C) 
     343    SUBROUTINE cxios_get_domain_j_index(domain_hdl, j_index, extent) BIND(C) 
    358344      USE ISO_C_BINDING 
    359345      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    360346      INTEGER (KIND=C_INT)     , DIMENSION(*) :: j_index 
    361       INTEGER (kind = C_INT), VALUE  :: extent1 
     347      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    362348    END SUBROUTINE cxios_get_domain_j_index 
    363349 
     
    388374 
    389375 
    390     SUBROUTINE cxios_set_domain_latvalue_1d(domain_hdl, latvalue_1d, extent1) BIND(C) 
     376    SUBROUTINE cxios_set_domain_latvalue_1d(domain_hdl, latvalue_1d, extent) BIND(C) 
    391377      USE ISO_C_BINDING 
    392378      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    393379      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: latvalue_1d 
    394       INTEGER (kind = C_INT), VALUE  :: extent1 
     380      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    395381    END SUBROUTINE cxios_set_domain_latvalue_1d 
    396382 
    397     SUBROUTINE cxios_get_domain_latvalue_1d(domain_hdl, latvalue_1d, extent1) BIND(C) 
     383    SUBROUTINE cxios_get_domain_latvalue_1d(domain_hdl, latvalue_1d, extent) BIND(C) 
    398384      USE ISO_C_BINDING 
    399385      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    400386      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: latvalue_1d 
    401       INTEGER (kind = C_INT), VALUE  :: extent1 
     387      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    402388    END SUBROUTINE cxios_get_domain_latvalue_1d 
    403389 
     
    409395 
    410396 
    411     SUBROUTINE cxios_set_domain_latvalue_2d(domain_hdl, latvalue_2d, extent1, extent2) BIND(C) 
     397    SUBROUTINE cxios_set_domain_latvalue_2d(domain_hdl, latvalue_2d, extent) BIND(C) 
    412398      USE ISO_C_BINDING 
    413399      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    414400      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: latvalue_2d 
    415       INTEGER (kind = C_INT), VALUE  :: extent1 
    416       INTEGER (kind = C_INT), VALUE  :: extent2 
     401      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    417402    END SUBROUTINE cxios_set_domain_latvalue_2d 
    418403 
    419     SUBROUTINE cxios_get_domain_latvalue_2d(domain_hdl, latvalue_2d, extent1, extent2) BIND(C) 
     404    SUBROUTINE cxios_get_domain_latvalue_2d(domain_hdl, latvalue_2d, extent) BIND(C) 
    420405      USE ISO_C_BINDING 
    421406      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    422407      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: latvalue_2d 
    423       INTEGER (kind = C_INT), VALUE  :: extent1 
    424       INTEGER (kind = C_INT), VALUE  :: extent2 
     408      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    425409    END SUBROUTINE cxios_get_domain_latvalue_2d 
    426410 
     
    453437 
    454438 
    455     SUBROUTINE cxios_set_domain_lonvalue_1d(domain_hdl, lonvalue_1d, extent1) BIND(C) 
     439    SUBROUTINE cxios_set_domain_lonvalue_1d(domain_hdl, lonvalue_1d, extent) BIND(C) 
    456440      USE ISO_C_BINDING 
    457441      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    458442      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: lonvalue_1d 
    459       INTEGER (kind = C_INT), VALUE  :: extent1 
     443      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    460444    END SUBROUTINE cxios_set_domain_lonvalue_1d 
    461445 
    462     SUBROUTINE cxios_get_domain_lonvalue_1d(domain_hdl, lonvalue_1d, extent1) BIND(C) 
     446    SUBROUTINE cxios_get_domain_lonvalue_1d(domain_hdl, lonvalue_1d, extent) BIND(C) 
    463447      USE ISO_C_BINDING 
    464448      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    465449      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: lonvalue_1d 
    466       INTEGER (kind = C_INT), VALUE  :: extent1 
     450      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    467451    END SUBROUTINE cxios_get_domain_lonvalue_1d 
    468452 
     
    474458 
    475459 
    476     SUBROUTINE cxios_set_domain_lonvalue_2d(domain_hdl, lonvalue_2d, extent1, extent2) BIND(C) 
     460    SUBROUTINE cxios_set_domain_lonvalue_2d(domain_hdl, lonvalue_2d, extent) BIND(C) 
    477461      USE ISO_C_BINDING 
    478462      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    479463      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: lonvalue_2d 
    480       INTEGER (kind = C_INT), VALUE  :: extent1 
    481       INTEGER (kind = C_INT), VALUE  :: extent2 
     464      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    482465    END SUBROUTINE cxios_set_domain_lonvalue_2d 
    483466 
    484     SUBROUTINE cxios_get_domain_lonvalue_2d(domain_hdl, lonvalue_2d, extent1, extent2) BIND(C) 
     467    SUBROUTINE cxios_get_domain_lonvalue_2d(domain_hdl, lonvalue_2d, extent) BIND(C) 
    485468      USE ISO_C_BINDING 
    486469      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    487470      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: lonvalue_2d 
    488       INTEGER (kind = C_INT), VALUE  :: extent1 
    489       INTEGER (kind = C_INT), VALUE  :: extent2 
     471      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    490472    END SUBROUTINE cxios_get_domain_lonvalue_2d 
    491473 
     
    497479 
    498480 
    499     SUBROUTINE cxios_set_domain_mask_1d(domain_hdl, mask_1d, extent1) BIND(C) 
     481    SUBROUTINE cxios_set_domain_mask_1d(domain_hdl, mask_1d, extent) BIND(C) 
    500482      USE ISO_C_BINDING 
    501483      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    502484      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask_1d 
    503       INTEGER (kind = C_INT), VALUE  :: extent1 
     485      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    504486    END SUBROUTINE cxios_set_domain_mask_1d 
    505487 
    506     SUBROUTINE cxios_get_domain_mask_1d(domain_hdl, mask_1d, extent1) BIND(C) 
     488    SUBROUTINE cxios_get_domain_mask_1d(domain_hdl, mask_1d, extent) BIND(C) 
    507489      USE ISO_C_BINDING 
    508490      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    509491      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask_1d 
    510       INTEGER (kind = C_INT), VALUE  :: extent1 
     492      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    511493    END SUBROUTINE cxios_get_domain_mask_1d 
    512494 
     
    518500 
    519501 
    520     SUBROUTINE cxios_set_domain_mask_2d(domain_hdl, mask_2d, extent1, extent2) BIND(C) 
     502    SUBROUTINE cxios_set_domain_mask_2d(domain_hdl, mask_2d, extent) BIND(C) 
    521503      USE ISO_C_BINDING 
    522504      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    523505      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask_2d 
    524       INTEGER (kind = C_INT), VALUE  :: extent1 
    525       INTEGER (kind = C_INT), VALUE  :: extent2 
     506      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    526507    END SUBROUTINE cxios_set_domain_mask_2d 
    527508 
    528     SUBROUTINE cxios_get_domain_mask_2d(domain_hdl, mask_2d, extent1, extent2) BIND(C) 
     509    SUBROUTINE cxios_get_domain_mask_2d(domain_hdl, mask_2d, extent) BIND(C) 
    529510      USE ISO_C_BINDING 
    530511      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
    531512      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask_2d 
    532       INTEGER (kind = C_INT), VALUE  :: extent1 
    533       INTEGER (kind = C_INT), VALUE  :: extent2 
     513      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    534514    END SUBROUTINE cxios_get_domain_mask_2d 
    535515 
  • XIOS/trunk/src/interface/fortran_attr/domaingroup_interface_attr.F90

    r666 r674  
    1010    ! Do not call directly / interface FORTRAN 2003 <-> C99 
    1111 
    12     SUBROUTINE cxios_set_domaingroup_area(domaingroup_hdl, area, extent1, extent2) BIND(C) 
     12    SUBROUTINE cxios_set_domaingroup_area(domaingroup_hdl, area, extent) BIND(C) 
    1313      USE ISO_C_BINDING 
    1414      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    1515      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: area 
    16       INTEGER (kind = C_INT), VALUE  :: extent1 
    17       INTEGER (kind = C_INT), VALUE  :: extent2 
     16      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    1817    END SUBROUTINE cxios_set_domaingroup_area 
    1918 
    20     SUBROUTINE cxios_get_domaingroup_area(domaingroup_hdl, area, extent1, extent2) BIND(C) 
     19    SUBROUTINE cxios_get_domaingroup_area(domaingroup_hdl, area, extent) BIND(C) 
    2120      USE ISO_C_BINDING 
    2221      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    2322      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: area 
    24       INTEGER (kind = C_INT), VALUE  :: extent1 
    25       INTEGER (kind = C_INT), VALUE  :: extent2 
     23      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    2624    END SUBROUTINE cxios_get_domaingroup_area 
    2725 
     
    3331 
    3432 
    35     SUBROUTINE cxios_set_domaingroup_bounds_lat_1d(domaingroup_hdl, bounds_lat_1d, extent1, extent2) BIND(C) 
     33    SUBROUTINE cxios_set_domaingroup_bounds_lat_1d(domaingroup_hdl, bounds_lat_1d, extent) BIND(C) 
    3634      USE ISO_C_BINDING 
    3735      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    3836      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: bounds_lat_1d 
    39       INTEGER (kind = C_INT), VALUE  :: extent1 
    40       INTEGER (kind = C_INT), VALUE  :: extent2 
     37      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    4138    END SUBROUTINE cxios_set_domaingroup_bounds_lat_1d 
    4239 
    43     SUBROUTINE cxios_get_domaingroup_bounds_lat_1d(domaingroup_hdl, bounds_lat_1d, extent1, extent2) BIND(C) 
     40    SUBROUTINE cxios_get_domaingroup_bounds_lat_1d(domaingroup_hdl, bounds_lat_1d, extent) BIND(C) 
    4441      USE ISO_C_BINDING 
    4542      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    4643      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: bounds_lat_1d 
    47       INTEGER (kind = C_INT), VALUE  :: extent1 
    48       INTEGER (kind = C_INT), VALUE  :: extent2 
     44      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    4945    END SUBROUTINE cxios_get_domaingroup_bounds_lat_1d 
    5046 
     
    5652 
    5753 
    58     SUBROUTINE cxios_set_domaingroup_bounds_lat_2d(domaingroup_hdl, bounds_lat_2d, extent1, extent2, extent3) BIND(C) 
     54    SUBROUTINE cxios_set_domaingroup_bounds_lat_2d(domaingroup_hdl, bounds_lat_2d, extent) BIND(C) 
    5955      USE ISO_C_BINDING 
    6056      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    6157      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: bounds_lat_2d 
    62       INTEGER (kind = C_INT), VALUE  :: extent1 
    63       INTEGER (kind = C_INT), VALUE  :: extent2 
    64       INTEGER (kind = C_INT), VALUE  :: extent3 
     58      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    6559    END SUBROUTINE cxios_set_domaingroup_bounds_lat_2d 
    6660 
    67     SUBROUTINE cxios_get_domaingroup_bounds_lat_2d(domaingroup_hdl, bounds_lat_2d, extent1, extent2, extent3) BIND(C) 
     61    SUBROUTINE cxios_get_domaingroup_bounds_lat_2d(domaingroup_hdl, bounds_lat_2d, extent) BIND(C) 
    6862      USE ISO_C_BINDING 
    6963      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    7064      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: bounds_lat_2d 
    71       INTEGER (kind = C_INT), VALUE  :: extent1 
    72       INTEGER (kind = C_INT), VALUE  :: extent2 
    73       INTEGER (kind = C_INT), VALUE  :: extent3 
     65      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    7466    END SUBROUTINE cxios_get_domaingroup_bounds_lat_2d 
    7567 
     
    8173 
    8274 
    83     SUBROUTINE cxios_set_domaingroup_bounds_lon_1d(domaingroup_hdl, bounds_lon_1d, extent1, extent2) BIND(C) 
     75    SUBROUTINE cxios_set_domaingroup_bounds_lon_1d(domaingroup_hdl, bounds_lon_1d, extent) BIND(C) 
    8476      USE ISO_C_BINDING 
    8577      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    8678      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: bounds_lon_1d 
    87       INTEGER (kind = C_INT), VALUE  :: extent1 
    88       INTEGER (kind = C_INT), VALUE  :: extent2 
     79      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    8980    END SUBROUTINE cxios_set_domaingroup_bounds_lon_1d 
    9081 
    91     SUBROUTINE cxios_get_domaingroup_bounds_lon_1d(domaingroup_hdl, bounds_lon_1d, extent1, extent2) BIND(C) 
     82    SUBROUTINE cxios_get_domaingroup_bounds_lon_1d(domaingroup_hdl, bounds_lon_1d, extent) BIND(C) 
    9283      USE ISO_C_BINDING 
    9384      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    9485      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: bounds_lon_1d 
    95       INTEGER (kind = C_INT), VALUE  :: extent1 
    96       INTEGER (kind = C_INT), VALUE  :: extent2 
     86      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    9787    END SUBROUTINE cxios_get_domaingroup_bounds_lon_1d 
    9888 
     
    10494 
    10595 
    106     SUBROUTINE cxios_set_domaingroup_bounds_lon_2d(domaingroup_hdl, bounds_lon_2d, extent1, extent2, extent3) BIND(C) 
     96    SUBROUTINE cxios_set_domaingroup_bounds_lon_2d(domaingroup_hdl, bounds_lon_2d, extent) BIND(C) 
    10797      USE ISO_C_BINDING 
    10898      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    10999      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: bounds_lon_2d 
    110       INTEGER (kind = C_INT), VALUE  :: extent1 
    111       INTEGER (kind = C_INT), VALUE  :: extent2 
    112       INTEGER (kind = C_INT), VALUE  :: extent3 
     100      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    113101    END SUBROUTINE cxios_set_domaingroup_bounds_lon_2d 
    114102 
    115     SUBROUTINE cxios_get_domaingroup_bounds_lon_2d(domaingroup_hdl, bounds_lon_2d, extent1, extent2, extent3) BIND(C) 
     103    SUBROUTINE cxios_get_domaingroup_bounds_lon_2d(domaingroup_hdl, bounds_lon_2d, extent) BIND(C) 
    116104      USE ISO_C_BINDING 
    117105      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    118106      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: bounds_lon_2d 
    119       INTEGER (kind = C_INT), VALUE  :: extent1 
    120       INTEGER (kind = C_INT), VALUE  :: extent2 
    121       INTEGER (kind = C_INT), VALUE  :: extent3 
     107      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    122108    END SUBROUTINE cxios_get_domaingroup_bounds_lon_2d 
    123109 
     
    148134 
    149135 
    150     SUBROUTINE cxios_set_domaingroup_data_i_index(domaingroup_hdl, data_i_index, extent1) BIND(C) 
     136    SUBROUTINE cxios_set_domaingroup_data_i_index(domaingroup_hdl, data_i_index, extent) BIND(C) 
    151137      USE ISO_C_BINDING 
    152138      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    153139      INTEGER (KIND=C_INT)     , DIMENSION(*) :: data_i_index 
    154       INTEGER (kind = C_INT), VALUE  :: extent1 
     140      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    155141    END SUBROUTINE cxios_set_domaingroup_data_i_index 
    156142 
    157     SUBROUTINE cxios_get_domaingroup_data_i_index(domaingroup_hdl, data_i_index, extent1) BIND(C) 
     143    SUBROUTINE cxios_get_domaingroup_data_i_index(domaingroup_hdl, data_i_index, extent) BIND(C) 
    158144      USE ISO_C_BINDING 
    159145      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    160146      INTEGER (KIND=C_INT)     , DIMENSION(*) :: data_i_index 
    161       INTEGER (kind = C_INT), VALUE  :: extent1 
     147      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    162148    END SUBROUTINE cxios_get_domaingroup_data_i_index 
    163149 
     
    188174 
    189175 
    190     SUBROUTINE cxios_set_domaingroup_data_j_index(domaingroup_hdl, data_j_index, extent1) BIND(C) 
     176    SUBROUTINE cxios_set_domaingroup_data_j_index(domaingroup_hdl, data_j_index, extent) BIND(C) 
    191177      USE ISO_C_BINDING 
    192178      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    193179      INTEGER (KIND=C_INT)     , DIMENSION(*) :: data_j_index 
    194       INTEGER (kind = C_INT), VALUE  :: extent1 
     180      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    195181    END SUBROUTINE cxios_set_domaingroup_data_j_index 
    196182 
    197     SUBROUTINE cxios_get_domaingroup_data_j_index(domaingroup_hdl, data_j_index, extent1) BIND(C) 
     183    SUBROUTINE cxios_get_domaingroup_data_j_index(domaingroup_hdl, data_j_index, extent) BIND(C) 
    198184      USE ISO_C_BINDING 
    199185      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    200186      INTEGER (KIND=C_INT)     , DIMENSION(*) :: data_j_index 
    201       INTEGER (kind = C_INT), VALUE  :: extent1 
     187      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    202188    END SUBROUTINE cxios_get_domaingroup_data_j_index 
    203189 
     
    329315 
    330316 
    331     SUBROUTINE cxios_set_domaingroup_i_index(domaingroup_hdl, i_index, extent1) BIND(C) 
     317    SUBROUTINE cxios_set_domaingroup_i_index(domaingroup_hdl, i_index, extent) BIND(C) 
    332318      USE ISO_C_BINDING 
    333319      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    334320      INTEGER (KIND=C_INT)     , DIMENSION(*) :: i_index 
    335       INTEGER (kind = C_INT), VALUE  :: extent1 
     321      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    336322    END SUBROUTINE cxios_set_domaingroup_i_index 
    337323 
    338     SUBROUTINE cxios_get_domaingroup_i_index(domaingroup_hdl, i_index, extent1) BIND(C) 
     324    SUBROUTINE cxios_get_domaingroup_i_index(domaingroup_hdl, i_index, extent) BIND(C) 
    339325      USE ISO_C_BINDING 
    340326      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    341327      INTEGER (KIND=C_INT)     , DIMENSION(*) :: i_index 
    342       INTEGER (kind = C_INT), VALUE  :: extent1 
     328      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    343329    END SUBROUTINE cxios_get_domaingroup_i_index 
    344330 
     
    369355 
    370356 
    371     SUBROUTINE cxios_set_domaingroup_j_index(domaingroup_hdl, j_index, extent1) BIND(C) 
     357    SUBROUTINE cxios_set_domaingroup_j_index(domaingroup_hdl, j_index, extent) BIND(C) 
    372358      USE ISO_C_BINDING 
    373359      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    374360      INTEGER (KIND=C_INT)     , DIMENSION(*) :: j_index 
    375       INTEGER (kind = C_INT), VALUE  :: extent1 
     361      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    376362    END SUBROUTINE cxios_set_domaingroup_j_index 
    377363 
    378     SUBROUTINE cxios_get_domaingroup_j_index(domaingroup_hdl, j_index, extent1) BIND(C) 
     364    SUBROUTINE cxios_get_domaingroup_j_index(domaingroup_hdl, j_index, extent) BIND(C) 
    379365      USE ISO_C_BINDING 
    380366      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    381367      INTEGER (KIND=C_INT)     , DIMENSION(*) :: j_index 
    382       INTEGER (kind = C_INT), VALUE  :: extent1 
     368      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    383369    END SUBROUTINE cxios_get_domaingroup_j_index 
    384370 
     
    409395 
    410396 
    411     SUBROUTINE cxios_set_domaingroup_latvalue_1d(domaingroup_hdl, latvalue_1d, extent1) BIND(C) 
     397    SUBROUTINE cxios_set_domaingroup_latvalue_1d(domaingroup_hdl, latvalue_1d, extent) BIND(C) 
    412398      USE ISO_C_BINDING 
    413399      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    414400      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: latvalue_1d 
    415       INTEGER (kind = C_INT), VALUE  :: extent1 
     401      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    416402    END SUBROUTINE cxios_set_domaingroup_latvalue_1d 
    417403 
    418     SUBROUTINE cxios_get_domaingroup_latvalue_1d(domaingroup_hdl, latvalue_1d, extent1) BIND(C) 
     404    SUBROUTINE cxios_get_domaingroup_latvalue_1d(domaingroup_hdl, latvalue_1d, extent) BIND(C) 
    419405      USE ISO_C_BINDING 
    420406      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    421407      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: latvalue_1d 
    422       INTEGER (kind = C_INT), VALUE  :: extent1 
     408      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    423409    END SUBROUTINE cxios_get_domaingroup_latvalue_1d 
    424410 
     
    430416 
    431417 
    432     SUBROUTINE cxios_set_domaingroup_latvalue_2d(domaingroup_hdl, latvalue_2d, extent1, extent2) BIND(C) 
     418    SUBROUTINE cxios_set_domaingroup_latvalue_2d(domaingroup_hdl, latvalue_2d, extent) BIND(C) 
    433419      USE ISO_C_BINDING 
    434420      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    435421      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: latvalue_2d 
    436       INTEGER (kind = C_INT), VALUE  :: extent1 
    437       INTEGER (kind = C_INT), VALUE  :: extent2 
     422      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    438423    END SUBROUTINE cxios_set_domaingroup_latvalue_2d 
    439424 
    440     SUBROUTINE cxios_get_domaingroup_latvalue_2d(domaingroup_hdl, latvalue_2d, extent1, extent2) BIND(C) 
     425    SUBROUTINE cxios_get_domaingroup_latvalue_2d(domaingroup_hdl, latvalue_2d, extent) BIND(C) 
    441426      USE ISO_C_BINDING 
    442427      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    443428      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: latvalue_2d 
    444       INTEGER (kind = C_INT), VALUE  :: extent1 
    445       INTEGER (kind = C_INT), VALUE  :: extent2 
     429      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    446430    END SUBROUTINE cxios_get_domaingroup_latvalue_2d 
    447431 
     
    474458 
    475459 
    476     SUBROUTINE cxios_set_domaingroup_lonvalue_1d(domaingroup_hdl, lonvalue_1d, extent1) BIND(C) 
     460    SUBROUTINE cxios_set_domaingroup_lonvalue_1d(domaingroup_hdl, lonvalue_1d, extent) BIND(C) 
    477461      USE ISO_C_BINDING 
    478462      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    479463      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: lonvalue_1d 
    480       INTEGER (kind = C_INT), VALUE  :: extent1 
     464      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    481465    END SUBROUTINE cxios_set_domaingroup_lonvalue_1d 
    482466 
    483     SUBROUTINE cxios_get_domaingroup_lonvalue_1d(domaingroup_hdl, lonvalue_1d, extent1) BIND(C) 
     467    SUBROUTINE cxios_get_domaingroup_lonvalue_1d(domaingroup_hdl, lonvalue_1d, extent) BIND(C) 
    484468      USE ISO_C_BINDING 
    485469      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    486470      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: lonvalue_1d 
    487       INTEGER (kind = C_INT), VALUE  :: extent1 
     471      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    488472    END SUBROUTINE cxios_get_domaingroup_lonvalue_1d 
    489473 
     
    495479 
    496480 
    497     SUBROUTINE cxios_set_domaingroup_lonvalue_2d(domaingroup_hdl, lonvalue_2d, extent1, extent2) BIND(C) 
     481    SUBROUTINE cxios_set_domaingroup_lonvalue_2d(domaingroup_hdl, lonvalue_2d, extent) BIND(C) 
    498482      USE ISO_C_BINDING 
    499483      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    500484      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: lonvalue_2d 
    501       INTEGER (kind = C_INT), VALUE  :: extent1 
    502       INTEGER (kind = C_INT), VALUE  :: extent2 
     485      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    503486    END SUBROUTINE cxios_set_domaingroup_lonvalue_2d 
    504487 
    505     SUBROUTINE cxios_get_domaingroup_lonvalue_2d(domaingroup_hdl, lonvalue_2d, extent1, extent2) BIND(C) 
     488    SUBROUTINE cxios_get_domaingroup_lonvalue_2d(domaingroup_hdl, lonvalue_2d, extent) BIND(C) 
    506489      USE ISO_C_BINDING 
    507490      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    508491      REAL (KIND=C_DOUBLE)     , DIMENSION(*) :: lonvalue_2d 
    509       INTEGER (kind = C_INT), VALUE  :: extent1 
    510       INTEGER (kind = C_INT), VALUE  :: extent2 
     492      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    511493    END SUBROUTINE cxios_get_domaingroup_lonvalue_2d 
    512494 
     
    518500 
    519501 
    520     SUBROUTINE cxios_set_domaingroup_mask_1d(domaingroup_hdl, mask_1d, extent1) BIND(C) 
     502    SUBROUTINE cxios_set_domaingroup_mask_1d(domaingroup_hdl, mask_1d, extent) BIND(C) 
    521503      USE ISO_C_BINDING 
    522504      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    523505      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask_1d 
    524       INTEGER (kind = C_INT), VALUE  :: extent1 
     506      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    525507    END SUBROUTINE cxios_set_domaingroup_mask_1d 
    526508 
    527     SUBROUTINE cxios_get_domaingroup_mask_1d(domaingroup_hdl, mask_1d, extent1) BIND(C) 
     509    SUBROUTINE cxios_get_domaingroup_mask_1d(domaingroup_hdl, mask_1d, extent) BIND(C) 
    528510      USE ISO_C_BINDING 
    529511      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    530512      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask_1d 
    531       INTEGER (kind = C_INT), VALUE  :: extent1 
     513      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    532514    END SUBROUTINE cxios_get_domaingroup_mask_1d 
    533515 
     
    539521 
    540522 
    541     SUBROUTINE cxios_set_domaingroup_mask_2d(domaingroup_hdl, mask_2d, extent1, extent2) BIND(C) 
     523    SUBROUTINE cxios_set_domaingroup_mask_2d(domaingroup_hdl, mask_2d, extent) BIND(C) 
    542524      USE ISO_C_BINDING 
    543525      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    544526      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask_2d 
    545       INTEGER (kind = C_INT), VALUE  :: extent1 
    546       INTEGER (kind = C_INT), VALUE  :: extent2 
     527      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    547528    END SUBROUTINE cxios_set_domaingroup_mask_2d 
    548529 
    549     SUBROUTINE cxios_get_domaingroup_mask_2d(domaingroup_hdl, mask_2d, extent1, extent2) BIND(C) 
     530    SUBROUTINE cxios_get_domaingroup_mask_2d(domaingroup_hdl, mask_2d, extent) BIND(C) 
    550531      USE ISO_C_BINDING 
    551532      INTEGER (kind = C_INTPTR_T), VALUE       :: domaingroup_hdl 
    552533      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask_2d 
    553       INTEGER (kind = C_INT), VALUE  :: extent1 
    554       INTEGER (kind = C_INT), VALUE  :: extent2 
     534      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    555535    END SUBROUTINE cxios_get_domaingroup_mask_2d 
    556536 
  • XIOS/trunk/src/interface/fortran_attr/grid_interface_attr.F90

    r581 r674  
    1010    ! Do not call directly / interface FORTRAN 2003 <-> C99 
    1111 
    12     SUBROUTINE cxios_set_grid_axis_domain_order(grid_hdl, axis_domain_order, extent1) BIND(C) 
     12    SUBROUTINE cxios_set_grid_axis_domain_order(grid_hdl, axis_domain_order, extent) BIND(C) 
    1313      USE ISO_C_BINDING 
    1414      INTEGER (kind = C_INTPTR_T), VALUE       :: grid_hdl 
    1515      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: axis_domain_order 
    16       INTEGER (kind = C_INT), VALUE  :: extent1 
     16      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    1717    END SUBROUTINE cxios_set_grid_axis_domain_order 
    1818 
    19     SUBROUTINE cxios_get_grid_axis_domain_order(grid_hdl, axis_domain_order, extent1) BIND(C) 
     19    SUBROUTINE cxios_get_grid_axis_domain_order(grid_hdl, axis_domain_order, extent) BIND(C) 
    2020      USE ISO_C_BINDING 
    2121      INTEGER (kind = C_INTPTR_T), VALUE       :: grid_hdl 
    2222      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: axis_domain_order 
    23       INTEGER (kind = C_INT), VALUE  :: extent1 
     23      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    2424    END SUBROUTINE cxios_get_grid_axis_domain_order 
    2525 
     
    5252 
    5353 
    54     SUBROUTINE cxios_set_grid_mask1(grid_hdl, mask1, extent1) BIND(C) 
     54    SUBROUTINE cxios_set_grid_mask1(grid_hdl, mask1, extent) BIND(C) 
    5555      USE ISO_C_BINDING 
    5656      INTEGER (kind = C_INTPTR_T), VALUE       :: grid_hdl 
    5757      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask1 
    58       INTEGER (kind = C_INT), VALUE  :: extent1 
     58      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    5959    END SUBROUTINE cxios_set_grid_mask1 
    6060 
    61     SUBROUTINE cxios_get_grid_mask1(grid_hdl, mask1, extent1) BIND(C) 
     61    SUBROUTINE cxios_get_grid_mask1(grid_hdl, mask1, extent) BIND(C) 
    6262      USE ISO_C_BINDING 
    6363      INTEGER (kind = C_INTPTR_T), VALUE       :: grid_hdl 
    6464      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask1 
    65       INTEGER (kind = C_INT), VALUE  :: extent1 
     65      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    6666    END SUBROUTINE cxios_get_grid_mask1 
    6767 
     
    7373 
    7474 
    75     SUBROUTINE cxios_set_grid_mask2(grid_hdl, mask2, extent1, extent2) BIND(C) 
     75    SUBROUTINE cxios_set_grid_mask2(grid_hdl, mask2, extent) BIND(C) 
    7676      USE ISO_C_BINDING 
    7777      INTEGER (kind = C_INTPTR_T), VALUE       :: grid_hdl 
    7878      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask2 
    79       INTEGER (kind = C_INT), VALUE  :: extent1 
    80       INTEGER (kind = C_INT), VALUE  :: extent2 
     79      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    8180    END SUBROUTINE cxios_set_grid_mask2 
    8281 
    83     SUBROUTINE cxios_get_grid_mask2(grid_hdl, mask2, extent1, extent2) BIND(C) 
     82    SUBROUTINE cxios_get_grid_mask2(grid_hdl, mask2, extent) BIND(C) 
    8483      USE ISO_C_BINDING 
    8584      INTEGER (kind = C_INTPTR_T), VALUE       :: grid_hdl 
    8685      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask2 
    87       INTEGER (kind = C_INT), VALUE  :: extent1 
    88       INTEGER (kind = C_INT), VALUE  :: extent2 
     86      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    8987    END SUBROUTINE cxios_get_grid_mask2 
    9088 
     
    9694 
    9795 
    98     SUBROUTINE cxios_set_grid_mask3(grid_hdl, mask3, extent1, extent2, extent3) BIND(C) 
     96    SUBROUTINE cxios_set_grid_mask3(grid_hdl, mask3, extent) BIND(C) 
    9997      USE ISO_C_BINDING 
    10098      INTEGER (kind = C_INTPTR_T), VALUE       :: grid_hdl 
    10199      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask3 
    102       INTEGER (kind = C_INT), VALUE  :: extent1 
    103       INTEGER (kind = C_INT), VALUE  :: extent2 
    104       INTEGER (kind = C_INT), VALUE  :: extent3 
     100      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    105101    END SUBROUTINE cxios_set_grid_mask3 
    106102 
    107     SUBROUTINE cxios_get_grid_mask3(grid_hdl, mask3, extent1, extent2, extent3) BIND(C) 
     103    SUBROUTINE cxios_get_grid_mask3(grid_hdl, mask3, extent) BIND(C) 
    108104      USE ISO_C_BINDING 
    109105      INTEGER (kind = C_INTPTR_T), VALUE       :: grid_hdl 
    110106      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask3 
    111       INTEGER (kind = C_INT), VALUE  :: extent1 
    112       INTEGER (kind = C_INT), VALUE  :: extent2 
    113       INTEGER (kind = C_INT), VALUE  :: extent3 
     107      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    114108    END SUBROUTINE cxios_get_grid_mask3 
    115109 
  • XIOS/trunk/src/interface/fortran_attr/gridgroup_interface_attr.F90

    r581 r674  
    1010    ! Do not call directly / interface FORTRAN 2003 <-> C99 
    1111 
    12     SUBROUTINE cxios_set_gridgroup_axis_domain_order(gridgroup_hdl, axis_domain_order, extent1) BIND(C) 
     12    SUBROUTINE cxios_set_gridgroup_axis_domain_order(gridgroup_hdl, axis_domain_order, extent) BIND(C) 
    1313      USE ISO_C_BINDING 
    1414      INTEGER (kind = C_INTPTR_T), VALUE       :: gridgroup_hdl 
    1515      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: axis_domain_order 
    16       INTEGER (kind = C_INT), VALUE  :: extent1 
     16      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    1717    END SUBROUTINE cxios_set_gridgroup_axis_domain_order 
    1818 
    19     SUBROUTINE cxios_get_gridgroup_axis_domain_order(gridgroup_hdl, axis_domain_order, extent1) BIND(C) 
     19    SUBROUTINE cxios_get_gridgroup_axis_domain_order(gridgroup_hdl, axis_domain_order, extent) BIND(C) 
    2020      USE ISO_C_BINDING 
    2121      INTEGER (kind = C_INTPTR_T), VALUE       :: gridgroup_hdl 
    2222      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: axis_domain_order 
    23       INTEGER (kind = C_INT), VALUE  :: extent1 
     23      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    2424    END SUBROUTINE cxios_get_gridgroup_axis_domain_order 
    2525 
     
    7373 
    7474 
    75     SUBROUTINE cxios_set_gridgroup_mask1(gridgroup_hdl, mask1, extent1) BIND(C) 
     75    SUBROUTINE cxios_set_gridgroup_mask1(gridgroup_hdl, mask1, extent) BIND(C) 
    7676      USE ISO_C_BINDING 
    7777      INTEGER (kind = C_INTPTR_T), VALUE       :: gridgroup_hdl 
    7878      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask1 
    79       INTEGER (kind = C_INT), VALUE  :: extent1 
     79      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    8080    END SUBROUTINE cxios_set_gridgroup_mask1 
    8181 
    82     SUBROUTINE cxios_get_gridgroup_mask1(gridgroup_hdl, mask1, extent1) BIND(C) 
     82    SUBROUTINE cxios_get_gridgroup_mask1(gridgroup_hdl, mask1, extent) BIND(C) 
    8383      USE ISO_C_BINDING 
    8484      INTEGER (kind = C_INTPTR_T), VALUE       :: gridgroup_hdl 
    8585      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask1 
    86       INTEGER (kind = C_INT), VALUE  :: extent1 
     86      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    8787    END SUBROUTINE cxios_get_gridgroup_mask1 
    8888 
     
    9494 
    9595 
    96     SUBROUTINE cxios_set_gridgroup_mask2(gridgroup_hdl, mask2, extent1, extent2) BIND(C) 
     96    SUBROUTINE cxios_set_gridgroup_mask2(gridgroup_hdl, mask2, extent) BIND(C) 
    9797      USE ISO_C_BINDING 
    9898      INTEGER (kind = C_INTPTR_T), VALUE       :: gridgroup_hdl 
    9999      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask2 
    100       INTEGER (kind = C_INT), VALUE  :: extent1 
    101       INTEGER (kind = C_INT), VALUE  :: extent2 
     100      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    102101    END SUBROUTINE cxios_set_gridgroup_mask2 
    103102 
    104     SUBROUTINE cxios_get_gridgroup_mask2(gridgroup_hdl, mask2, extent1, extent2) BIND(C) 
     103    SUBROUTINE cxios_get_gridgroup_mask2(gridgroup_hdl, mask2, extent) BIND(C) 
    105104      USE ISO_C_BINDING 
    106105      INTEGER (kind = C_INTPTR_T), VALUE       :: gridgroup_hdl 
    107106      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask2 
    108       INTEGER (kind = C_INT), VALUE  :: extent1 
    109       INTEGER (kind = C_INT), VALUE  :: extent2 
     107      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    110108    END SUBROUTINE cxios_get_gridgroup_mask2 
    111109 
     
    117115 
    118116 
    119     SUBROUTINE cxios_set_gridgroup_mask3(gridgroup_hdl, mask3, extent1, extent2, extent3) BIND(C) 
     117    SUBROUTINE cxios_set_gridgroup_mask3(gridgroup_hdl, mask3, extent) BIND(C) 
    120118      USE ISO_C_BINDING 
    121119      INTEGER (kind = C_INTPTR_T), VALUE       :: gridgroup_hdl 
    122120      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask3 
    123       INTEGER (kind = C_INT), VALUE  :: extent1 
    124       INTEGER (kind = C_INT), VALUE  :: extent2 
    125       INTEGER (kind = C_INT), VALUE  :: extent3 
     121      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    126122    END SUBROUTINE cxios_set_gridgroup_mask3 
    127123 
    128     SUBROUTINE cxios_get_gridgroup_mask3(gridgroup_hdl, mask3, extent1, extent2, extent3) BIND(C) 
     124    SUBROUTINE cxios_get_gridgroup_mask3(gridgroup_hdl, mask3, extent) BIND(C) 
    129125      USE ISO_C_BINDING 
    130126      INTEGER (kind = C_INTPTR_T), VALUE       :: gridgroup_hdl 
    131127      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask3 
    132       INTEGER (kind = C_INT), VALUE  :: extent1 
    133       INTEGER (kind = C_INT), VALUE  :: extent2 
    134       INTEGER (kind = C_INT), VALUE  :: extent3 
     128      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    135129    END SUBROUTINE cxios_get_gridgroup_mask3 
    136130 
  • XIOS/trunk/src/interface/fortran_attr/iaxis_attr.F90

    r666 r674  
    103103 
    104104      IF (PRESENT(bounds_)) THEN 
    105         CALL cxios_set_axis_bounds(axis_hdl%daddr, bounds_, size(bounds_,1), size(bounds_,2)) 
     105        CALL cxios_set_axis_bounds(axis_hdl%daddr, bounds_, SHAPE(bounds_)) 
    106106      ENDIF 
    107107 
     
    111111 
    112112      IF (PRESENT(data_index_)) THEN 
    113         CALL cxios_set_axis_data_index(axis_hdl%daddr, data_index_, size(data_index_,1)) 
     113        CALL cxios_set_axis_data_index(axis_hdl%daddr, data_index_, SHAPE(data_index_)) 
    114114      ENDIF 
    115115 
     
    123123 
    124124      IF (PRESENT(mask_)) THEN 
    125         ALLOCATE(mask__tmp(size(mask_,1))) 
     125        ALLOCATE(mask__tmp(SIZE(mask_,1))) 
    126126        mask__tmp = mask_ 
    127         CALL cxios_set_axis_mask(axis_hdl%daddr, mask__tmp, size(mask_,1)) 
     127        CALL cxios_set_axis_mask(axis_hdl%daddr, mask__tmp, SHAPE(mask_)) 
    128128      ENDIF 
    129129 
     
    153153 
    154154      IF (PRESENT(value_)) THEN 
    155         CALL cxios_set_axis_value(axis_hdl%daddr, value_, size(value_,1)) 
     155        CALL cxios_set_axis_value(axis_hdl%daddr, value_, SHAPE(value_)) 
    156156      ENDIF 
    157157 
     
    250250 
    251251      IF (PRESENT(bounds_)) THEN 
    252         CALL cxios_get_axis_bounds(axis_hdl%daddr, bounds_, size(bounds_,1), size(bounds_,2)) 
     252        CALL cxios_get_axis_bounds(axis_hdl%daddr, bounds_, SHAPE(bounds_)) 
    253253      ENDIF 
    254254 
     
    258258 
    259259      IF (PRESENT(data_index_)) THEN 
    260         CALL cxios_get_axis_data_index(axis_hdl%daddr, data_index_, size(data_index_,1)) 
     260        CALL cxios_get_axis_data_index(axis_hdl%daddr, data_index_, SHAPE(data_index_)) 
    261261      ENDIF 
    262262 
     
    270270 
    271271      IF (PRESENT(mask_)) THEN 
    272         ALLOCATE(mask__tmp(size(mask_,1))) 
    273         CALL cxios_get_axis_mask(axis_hdl%daddr, mask__tmp, size(mask_,1)) 
     272        ALLOCATE(mask__tmp(SIZE(mask_,1))) 
     273        CALL cxios_get_axis_mask(axis_hdl%daddr, mask__tmp, SHAPE(mask_)) 
    274274        mask_ = mask__tmp 
    275275      ENDIF 
     
    300300 
    301301      IF (PRESENT(value_)) THEN 
    302         CALL cxios_get_axis_value(axis_hdl%daddr, value_, size(value_,1)) 
     302        CALL cxios_get_axis_value(axis_hdl%daddr, value_, SHAPE(value_)) 
    303303      ENDIF 
    304304 
  • XIOS/trunk/src/interface/fortran_attr/iaxisgroup_attr.F90

    r666 r674  
    106106 
    107107      IF (PRESENT(bounds_)) THEN 
    108         CALL cxios_set_axisgroup_bounds(axisgroup_hdl%daddr, bounds_, size(bounds_,1), size(bounds_,2)) 
     108        CALL cxios_set_axisgroup_bounds(axisgroup_hdl%daddr, bounds_, SHAPE(bounds_)) 
    109109      ENDIF 
    110110 
     
    114114 
    115115      IF (PRESENT(data_index_)) THEN 
    116         CALL cxios_set_axisgroup_data_index(axisgroup_hdl%daddr, data_index_, size(data_index_,1)) 
     116        CALL cxios_set_axisgroup_data_index(axisgroup_hdl%daddr, data_index_, SHAPE(data_index_)) 
    117117      ENDIF 
    118118 
     
    130130 
    131131      IF (PRESENT(mask_)) THEN 
    132         ALLOCATE(mask__tmp(size(mask_,1))) 
     132        ALLOCATE(mask__tmp(SIZE(mask_,1))) 
    133133        mask__tmp = mask_ 
    134         CALL cxios_set_axisgroup_mask(axisgroup_hdl%daddr, mask__tmp, size(mask_,1)) 
     134        CALL cxios_set_axisgroup_mask(axisgroup_hdl%daddr, mask__tmp, SHAPE(mask_)) 
    135135      ENDIF 
    136136 
     
    160160 
    161161      IF (PRESENT(value_)) THEN 
    162         CALL cxios_set_axisgroup_value(axisgroup_hdl%daddr, value_, size(value_,1)) 
     162        CALL cxios_set_axisgroup_value(axisgroup_hdl%daddr, value_, SHAPE(value_)) 
    163163      ENDIF 
    164164 
     
    260260 
    261261      IF (PRESENT(bounds_)) THEN 
    262         CALL cxios_get_axisgroup_bounds(axisgroup_hdl%daddr, bounds_, size(bounds_,1), size(bounds_,2)) 
     262        CALL cxios_get_axisgroup_bounds(axisgroup_hdl%daddr, bounds_, SHAPE(bounds_)) 
    263263      ENDIF 
    264264 
     
    268268 
    269269      IF (PRESENT(data_index_)) THEN 
    270         CALL cxios_get_axisgroup_data_index(axisgroup_hdl%daddr, data_index_, size(data_index_,1)) 
     270        CALL cxios_get_axisgroup_data_index(axisgroup_hdl%daddr, data_index_, SHAPE(data_index_)) 
    271271      ENDIF 
    272272 
     
    284284 
    285285      IF (PRESENT(mask_)) THEN 
    286         ALLOCATE(mask__tmp(size(mask_,1))) 
    287         CALL cxios_get_axisgroup_mask(axisgroup_hdl%daddr, mask__tmp, size(mask_,1)) 
     286        ALLOCATE(mask__tmp(SIZE(mask_,1))) 
     287        CALL cxios_get_axisgroup_mask(axisgroup_hdl%daddr, mask__tmp, SHAPE(mask_)) 
    288288        mask_ = mask__tmp 
    289289      ENDIF 
     
    314314 
    315315      IF (PRESENT(value_)) THEN 
    316         CALL cxios_get_axisgroup_value(axisgroup_hdl%daddr, value_, size(value_,1)) 
     316        CALL cxios_get_axisgroup_value(axisgroup_hdl%daddr, value_, SHAPE(value_)) 
    317317      ENDIF 
    318318 
  • XIOS/trunk/src/interface/fortran_attr/icalendar_wrapper_attr.F90

    r581 r674  
    9393 
    9494      IF (PRESENT(month_lengths_)) THEN 
    95         CALL cxios_set_calendar_wrapper_month_lengths(calendar_wrapper_hdl%daddr, month_lengths_, size(month_lengths_,1)) 
     95        CALL cxios_set_calendar_wrapper_month_lengths(calendar_wrapper_hdl%daddr, month_lengths_, SHAPE(month_lengths_)) 
    9696      ENDIF 
    9797 
     
    200200 
    201201      IF (PRESENT(month_lengths_)) THEN 
    202         CALL cxios_get_calendar_wrapper_month_lengths(calendar_wrapper_hdl%daddr, month_lengths_, size(month_lengths_,1)) 
     202        CALL cxios_get_calendar_wrapper_month_lengths(calendar_wrapper_hdl%daddr, month_lengths_, SHAPE(month_lengths_)) 
    203203      ENDIF 
    204204 
  • XIOS/trunk/src/interface/fortran_attr/idomain_attr.F90

    r666 r674  
    163163 
    164164      IF (PRESENT(area_)) THEN 
    165         CALL cxios_set_domain_area(domain_hdl%daddr, area_, size(area_,1), size(area_,2)) 
     165        CALL cxios_set_domain_area(domain_hdl%daddr, area_, SHAPE(area_)) 
    166166      ENDIF 
    167167 
    168168      IF (PRESENT(bounds_lat_1d_)) THEN 
    169         CALL cxios_set_domain_bounds_lat_1d(domain_hdl%daddr, bounds_lat_1d_, size(bounds_lat_1d_,1), size(bounds_lat_1d_,2)) 
     169        CALL cxios_set_domain_bounds_lat_1d(domain_hdl%daddr, bounds_lat_1d_, SHAPE(bounds_lat_1d_)) 
    170170      ENDIF 
    171171 
    172172      IF (PRESENT(bounds_lat_2d_)) THEN 
    173         CALL cxios_set_domain_bounds_lat_2d(domain_hdl%daddr, bounds_lat_2d_, size(bounds_lat_2d_,1), size(bounds_lat_2d_,2), size(bounds_lat_2d_,3)) 
     173        CALL cxios_set_domain_bounds_lat_2d(domain_hdl%daddr, bounds_lat_2d_, SHAPE(bounds_lat_2d_)) 
    174174      ENDIF 
    175175 
    176176      IF (PRESENT(bounds_lon_1d_)) THEN 
    177         CALL cxios_set_domain_bounds_lon_1d(domain_hdl%daddr, bounds_lon_1d_, size(bounds_lon_1d_,1), size(bounds_lon_1d_,2)) 
     177        CALL cxios_set_domain_bounds_lon_1d(domain_hdl%daddr, bounds_lon_1d_, SHAPE(bounds_lon_1d_)) 
    178178      ENDIF 
    179179 
    180180      IF (PRESENT(bounds_lon_2d_)) THEN 
    181         CALL cxios_set_domain_bounds_lon_2d(domain_hdl%daddr, bounds_lon_2d_, size(bounds_lon_2d_,1), size(bounds_lon_2d_,2), size(bounds_lon_2d_,3)) 
     181        CALL cxios_set_domain_bounds_lon_2d(domain_hdl%daddr, bounds_lon_2d_, SHAPE(bounds_lon_2d_)) 
    182182      ENDIF 
    183183 
     
    187187 
    188188      IF (PRESENT(data_i_index_)) THEN 
    189         CALL cxios_set_domain_data_i_index(domain_hdl%daddr, data_i_index_, size(data_i_index_,1)) 
     189        CALL cxios_set_domain_data_i_index(domain_hdl%daddr, data_i_index_, SHAPE(data_i_index_)) 
    190190      ENDIF 
    191191 
     
    195195 
    196196      IF (PRESENT(data_j_index_)) THEN 
    197         CALL cxios_set_domain_data_j_index(domain_hdl%daddr, data_j_index_, size(data_j_index_,1)) 
     197        CALL cxios_set_domain_data_j_index(domain_hdl%daddr, data_j_index_, SHAPE(data_j_index_)) 
    198198      ENDIF 
    199199 
     
    219219 
    220220      IF (PRESENT(i_index_)) THEN 
    221         CALL cxios_set_domain_i_index(domain_hdl%daddr, i_index_, size(i_index_,1)) 
     221        CALL cxios_set_domain_i_index(domain_hdl%daddr, i_index_, SHAPE(i_index_)) 
    222222      ENDIF 
    223223 
     
    227227 
    228228      IF (PRESENT(j_index_)) THEN 
    229         CALL cxios_set_domain_j_index(domain_hdl%daddr, j_index_, size(j_index_,1)) 
     229        CALL cxios_set_domain_j_index(domain_hdl%daddr, j_index_, SHAPE(j_index_)) 
    230230      ENDIF 
    231231 
     
    235235 
    236236      IF (PRESENT(latvalue_1d_)) THEN 
    237         CALL cxios_set_domain_latvalue_1d(domain_hdl%daddr, latvalue_1d_, size(latvalue_1d_,1)) 
     237        CALL cxios_set_domain_latvalue_1d(domain_hdl%daddr, latvalue_1d_, SHAPE(latvalue_1d_)) 
    238238      ENDIF 
    239239 
    240240      IF (PRESENT(latvalue_2d_)) THEN 
    241         CALL cxios_set_domain_latvalue_2d(domain_hdl%daddr, latvalue_2d_, size(latvalue_2d_,1), size(latvalue_2d_,2)) 
     241        CALL cxios_set_domain_latvalue_2d(domain_hdl%daddr, latvalue_2d_, SHAPE(latvalue_2d_)) 
    242242      ENDIF 
    243243 
     
    247247 
    248248      IF (PRESENT(lonvalue_1d_)) THEN 
    249         CALL cxios_set_domain_lonvalue_1d(domain_hdl%daddr, lonvalue_1d_, size(lonvalue_1d_,1)) 
     249        CALL cxios_set_domain_lonvalue_1d(domain_hdl%daddr, lonvalue_1d_, SHAPE(lonvalue_1d_)) 
    250250      ENDIF 
    251251 
    252252      IF (PRESENT(lonvalue_2d_)) THEN 
    253         CALL cxios_set_domain_lonvalue_2d(domain_hdl%daddr, lonvalue_2d_, size(lonvalue_2d_,1), size(lonvalue_2d_,2)) 
     253        CALL cxios_set_domain_lonvalue_2d(domain_hdl%daddr, lonvalue_2d_, SHAPE(lonvalue_2d_)) 
    254254      ENDIF 
    255255 
    256256      IF (PRESENT(mask_1d_)) THEN 
    257         ALLOCATE(mask_1d__tmp(size(mask_1d_,1))) 
     257        ALLOCATE(mask_1d__tmp(SIZE(mask_1d_,1))) 
    258258        mask_1d__tmp = mask_1d_ 
    259         CALL cxios_set_domain_mask_1d(domain_hdl%daddr, mask_1d__tmp, size(mask_1d_,1)) 
     259        CALL cxios_set_domain_mask_1d(domain_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_)) 
    260260      ENDIF 
    261261 
    262262      IF (PRESENT(mask_2d_)) THEN 
    263         ALLOCATE(mask_2d__tmp(size(mask_2d_,1), size(mask_2d_,2))) 
     263        ALLOCATE(mask_2d__tmp(SIZE(mask_2d_,1), SIZE(mask_2d_,2))) 
    264264        mask_2d__tmp = mask_2d_ 
    265         CALL cxios_set_domain_mask_2d(domain_hdl%daddr, mask_2d__tmp, size(mask_2d_,1), size(mask_2d_,2)) 
     265        CALL cxios_set_domain_mask_2d(domain_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_)) 
    266266      ENDIF 
    267267 
     
    452452 
    453453      IF (PRESENT(area_)) THEN 
    454         CALL cxios_get_domain_area(domain_hdl%daddr, area_, size(area_,1), size(area_,2)) 
     454        CALL cxios_get_domain_area(domain_hdl%daddr, area_, SHAPE(area_)) 
    455455      ENDIF 
    456456 
    457457      IF (PRESENT(bounds_lat_1d_)) THEN 
    458         CALL cxios_get_domain_bounds_lat_1d(domain_hdl%daddr, bounds_lat_1d_, size(bounds_lat_1d_,1), size(bounds_lat_1d_,2)) 
     458        CALL cxios_get_domain_bounds_lat_1d(domain_hdl%daddr, bounds_lat_1d_, SHAPE(bounds_lat_1d_)) 
    459459      ENDIF 
    460460 
    461461      IF (PRESENT(bounds_lat_2d_)) THEN 
    462         CALL cxios_get_domain_bounds_lat_2d(domain_hdl%daddr, bounds_lat_2d_, size(bounds_lat_2d_,1), size(bounds_lat_2d_,2), size(bounds_lat_2d_,3)) 
     462        CALL cxios_get_domain_bounds_lat_2d(domain_hdl%daddr, bounds_lat_2d_, SHAPE(bounds_lat_2d_)) 
    463463      ENDIF 
    464464 
    465465      IF (PRESENT(bounds_lon_1d_)) THEN 
    466         CALL cxios_get_domain_bounds_lon_1d(domain_hdl%daddr, bounds_lon_1d_, size(bounds_lon_1d_,1), size(bounds_lon_1d_,2)) 
     466        CALL cxios_get_domain_bounds_lon_1d(domain_hdl%daddr, bounds_lon_1d_, SHAPE(bounds_lon_1d_)) 
    467467      ENDIF 
    468468 
    469469      IF (PRESENT(bounds_lon_2d_)) THEN 
    470         CALL cxios_get_domain_bounds_lon_2d(domain_hdl%daddr, bounds_lon_2d_, size(bounds_lon_2d_,1), size(bounds_lon_2d_,2), size(bounds_lon_2d_,3)) 
     470        CALL cxios_get_domain_bounds_lon_2d(domain_hdl%daddr, bounds_lon_2d_, SHAPE(bounds_lon_2d_)) 
    471471      ENDIF 
    472472 
     
    476476 
    477477      IF (PRESENT(data_i_index_)) THEN 
    478         CALL cxios_get_domain_data_i_index(domain_hdl%daddr, data_i_index_, size(data_i_index_,1)) 
     478        CALL cxios_get_domain_data_i_index(domain_hdl%daddr, data_i_index_, SHAPE(data_i_index_)) 
    479479      ENDIF 
    480480 
     
    484484 
    485485      IF (PRESENT(data_j_index_)) THEN 
    486         CALL cxios_get_domain_data_j_index(domain_hdl%daddr, data_j_index_, size(data_j_index_,1)) 
     486        CALL cxios_get_domain_data_j_index(domain_hdl%daddr, data_j_index_, SHAPE(data_j_index_)) 
    487487      ENDIF 
    488488 
     
    508508 
    509509      IF (PRESENT(i_index_)) THEN 
    510         CALL cxios_get_domain_i_index(domain_hdl%daddr, i_index_, size(i_index_,1)) 
     510        CALL cxios_get_domain_i_index(domain_hdl%daddr, i_index_, SHAPE(i_index_)) 
    511511      ENDIF 
    512512 
     
    516516 
    517517      IF (PRESENT(j_index_)) THEN 
    518         CALL cxios_get_domain_j_index(domain_hdl%daddr, j_index_, size(j_index_,1)) 
     518        CALL cxios_get_domain_j_index(domain_hdl%daddr, j_index_, SHAPE(j_index_)) 
    519519      ENDIF 
    520520 
     
    524524 
    525525      IF (PRESENT(latvalue_1d_)) THEN 
    526         CALL cxios_get_domain_latvalue_1d(domain_hdl%daddr, latvalue_1d_, size(latvalue_1d_,1)) 
     526        CALL cxios_get_domain_latvalue_1d(domain_hdl%daddr, latvalue_1d_, SHAPE(latvalue_1d_)) 
    527527      ENDIF 
    528528 
    529529      IF (PRESENT(latvalue_2d_)) THEN 
    530         CALL cxios_get_domain_latvalue_2d(domain_hdl%daddr, latvalue_2d_, size(latvalue_2d_,1), size(latvalue_2d_,2)) 
     530        CALL cxios_get_domain_latvalue_2d(domain_hdl%daddr, latvalue_2d_, SHAPE(latvalue_2d_)) 
    531531      ENDIF 
    532532 
     
    536536 
    537537      IF (PRESENT(lonvalue_1d_)) THEN 
    538         CALL cxios_get_domain_lonvalue_1d(domain_hdl%daddr, lonvalue_1d_, size(lonvalue_1d_,1)) 
     538        CALL cxios_get_domain_lonvalue_1d(domain_hdl%daddr, lonvalue_1d_, SHAPE(lonvalue_1d_)) 
    539539      ENDIF 
    540540 
    541541      IF (PRESENT(lonvalue_2d_)) THEN 
    542         CALL cxios_get_domain_lonvalue_2d(domain_hdl%daddr, lonvalue_2d_, size(lonvalue_2d_,1), size(lonvalue_2d_,2)) 
     542        CALL cxios_get_domain_lonvalue_2d(domain_hdl%daddr, lonvalue_2d_, SHAPE(lonvalue_2d_)) 
    543543      ENDIF 
    544544 
    545545      IF (PRESENT(mask_1d_)) THEN 
    546         ALLOCATE(mask_1d__tmp(size(mask_1d_,1))) 
    547         CALL cxios_get_domain_mask_1d(domain_hdl%daddr, mask_1d__tmp, size(mask_1d_,1)) 
     546        ALLOCATE(mask_1d__tmp(SIZE(mask_1d_,1))) 
     547        CALL cxios_get_domain_mask_1d(domain_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_)) 
    548548        mask_1d_ = mask_1d__tmp 
    549549      ENDIF 
    550550 
    551551      IF (PRESENT(mask_2d_)) THEN 
    552         ALLOCATE(mask_2d__tmp(size(mask_2d_,1), size(mask_2d_,2))) 
    553         CALL cxios_get_domain_mask_2d(domain_hdl%daddr, mask_2d__tmp, size(mask_2d_,1), size(mask_2d_,2)) 
     552        ALLOCATE(mask_2d__tmp(SIZE(mask_2d_,1), SIZE(mask_2d_,2))) 
     553        CALL cxios_get_domain_mask_2d(domain_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_)) 
    554554        mask_2d_ = mask_2d__tmp 
    555555      ENDIF 
  • XIOS/trunk/src/interface/fortran_attr/idomaingroup_attr.F90

    r666 r674  
    170170 
    171171      IF (PRESENT(area_)) THEN 
    172         CALL cxios_set_domaingroup_area(domaingroup_hdl%daddr, area_, size(area_,1), size(area_,2)) 
     172        CALL cxios_set_domaingroup_area(domaingroup_hdl%daddr, area_, SHAPE(area_)) 
    173173      ENDIF 
    174174 
    175175      IF (PRESENT(bounds_lat_1d_)) THEN 
    176         CALL cxios_set_domaingroup_bounds_lat_1d(domaingroup_hdl%daddr, bounds_lat_1d_, size(bounds_lat_1d_,1), size(bounds_lat_1d_,2)) 
     176        CALL cxios_set_domaingroup_bounds_lat_1d(domaingroup_hdl%daddr, bounds_lat_1d_, SHAPE(bounds_lat_1d_)) 
    177177      ENDIF 
    178178 
    179179      IF (PRESENT(bounds_lat_2d_)) THEN 
    180         CALL cxios_set_domaingroup_bounds_lat_2d(domaingroup_hdl%daddr, bounds_lat_2d_, size(bounds_lat_2d_,1), size(bounds_lat_2d_,2), size(bounds_lat_2d_,3)) 
     180        CALL cxios_set_domaingroup_bounds_lat_2d(domaingroup_hdl%daddr, bounds_lat_2d_, SHAPE(bounds_lat_2d_)) 
    181181      ENDIF 
    182182 
    183183      IF (PRESENT(bounds_lon_1d_)) THEN 
    184         CALL cxios_set_domaingroup_bounds_lon_1d(domaingroup_hdl%daddr, bounds_lon_1d_, size(bounds_lon_1d_,1), size(bounds_lon_1d_,2)) 
     184        CALL cxios_set_domaingroup_bounds_lon_1d(domaingroup_hdl%daddr, bounds_lon_1d_, SHAPE(bounds_lon_1d_)) 
    185185      ENDIF 
    186186 
    187187      IF (PRESENT(bounds_lon_2d_)) THEN 
    188         CALL cxios_set_domaingroup_bounds_lon_2d(domaingroup_hdl%daddr, bounds_lon_2d_, size(bounds_lon_2d_,1), size(bounds_lon_2d_,2), size(bounds_lon_2d_,3)) 
     188        CALL cxios_set_domaingroup_bounds_lon_2d(domaingroup_hdl%daddr, bounds_lon_2d_, SHAPE(bounds_lon_2d_)) 
    189189      ENDIF 
    190190 
     
    194194 
    195195      IF (PRESENT(data_i_index_)) THEN 
    196         CALL cxios_set_domaingroup_data_i_index(domaingroup_hdl%daddr, data_i_index_, size(data_i_index_,1)) 
     196        CALL cxios_set_domaingroup_data_i_index(domaingroup_hdl%daddr, data_i_index_, SHAPE(data_i_index_)) 
    197197      ENDIF 
    198198 
     
    202202 
    203203      IF (PRESENT(data_j_index_)) THEN 
    204         CALL cxios_set_domaingroup_data_j_index(domaingroup_hdl%daddr, data_j_index_, size(data_j_index_,1)) 
     204        CALL cxios_set_domaingroup_data_j_index(domaingroup_hdl%daddr, data_j_index_, SHAPE(data_j_index_)) 
    205205      ENDIF 
    206206 
     
    230230 
    231231      IF (PRESENT(i_index_)) THEN 
    232         CALL cxios_set_domaingroup_i_index(domaingroup_hdl%daddr, i_index_, size(i_index_,1)) 
     232        CALL cxios_set_domaingroup_i_index(domaingroup_hdl%daddr, i_index_, SHAPE(i_index_)) 
    233233      ENDIF 
    234234 
     
    238238 
    239239      IF (PRESENT(j_index_)) THEN 
    240         CALL cxios_set_domaingroup_j_index(domaingroup_hdl%daddr, j_index_, size(j_index_,1)) 
     240        CALL cxios_set_domaingroup_j_index(domaingroup_hdl%daddr, j_index_, SHAPE(j_index_)) 
    241241      ENDIF 
    242242 
     
    246246 
    247247      IF (PRESENT(latvalue_1d_)) THEN 
    248         CALL cxios_set_domaingroup_latvalue_1d(domaingroup_hdl%daddr, latvalue_1d_, size(latvalue_1d_,1)) 
     248        CALL cxios_set_domaingroup_latvalue_1d(domaingroup_hdl%daddr, latvalue_1d_, SHAPE(latvalue_1d_)) 
    249249      ENDIF 
    250250 
    251251      IF (PRESENT(latvalue_2d_)) THEN 
    252         CALL cxios_set_domaingroup_latvalue_2d(domaingroup_hdl%daddr, latvalue_2d_, size(latvalue_2d_,1), size(latvalue_2d_,2)) 
     252        CALL cxios_set_domaingroup_latvalue_2d(domaingroup_hdl%daddr, latvalue_2d_, SHAPE(latvalue_2d_)) 
    253253      ENDIF 
    254254 
     
    258258 
    259259      IF (PRESENT(lonvalue_1d_)) THEN 
    260         CALL cxios_set_domaingroup_lonvalue_1d(domaingroup_hdl%daddr, lonvalue_1d_, size(lonvalue_1d_,1)) 
     260        CALL cxios_set_domaingroup_lonvalue_1d(domaingroup_hdl%daddr, lonvalue_1d_, SHAPE(lonvalue_1d_)) 
    261261      ENDIF 
    262262 
    263263      IF (PRESENT(lonvalue_2d_)) THEN 
    264         CALL cxios_set_domaingroup_lonvalue_2d(domaingroup_hdl%daddr, lonvalue_2d_, size(lonvalue_2d_,1), size(lonvalue_2d_,2)) 
     264        CALL cxios_set_domaingroup_lonvalue_2d(domaingroup_hdl%daddr, lonvalue_2d_, SHAPE(lonvalue_2d_)) 
    265265      ENDIF 
    266266 
    267267      IF (PRESENT(mask_1d_)) THEN 
    268         ALLOCATE(mask_1d__tmp(size(mask_1d_,1))) 
     268        ALLOCATE(mask_1d__tmp(SIZE(mask_1d_,1))) 
    269269        mask_1d__tmp = mask_1d_ 
    270         CALL cxios_set_domaingroup_mask_1d(domaingroup_hdl%daddr, mask_1d__tmp, size(mask_1d_,1)) 
     270        CALL cxios_set_domaingroup_mask_1d(domaingroup_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_)) 
    271271      ENDIF 
    272272 
    273273      IF (PRESENT(mask_2d_)) THEN 
    274         ALLOCATE(mask_2d__tmp(size(mask_2d_,1), size(mask_2d_,2))) 
     274        ALLOCATE(mask_2d__tmp(SIZE(mask_2d_,1), SIZE(mask_2d_,2))) 
    275275        mask_2d__tmp = mask_2d_ 
    276         CALL cxios_set_domaingroup_mask_2d(domaingroup_hdl%daddr, mask_2d__tmp, size(mask_2d_,1), size(mask_2d_,2)) 
     276        CALL cxios_set_domaingroup_mask_2d(domaingroup_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_)) 
    277277      ENDIF 
    278278 
     
    470470 
    471471      IF (PRESENT(area_)) THEN 
    472         CALL cxios_get_domaingroup_area(domaingroup_hdl%daddr, area_, size(area_,1), size(area_,2)) 
     472        CALL cxios_get_domaingroup_area(domaingroup_hdl%daddr, area_, SHAPE(area_)) 
    473473      ENDIF 
    474474 
    475475      IF (PRESENT(bounds_lat_1d_)) THEN 
    476         CALL cxios_get_domaingroup_bounds_lat_1d(domaingroup_hdl%daddr, bounds_lat_1d_, size(bounds_lat_1d_,1), size(bounds_lat_1d_,2)) 
     476        CALL cxios_get_domaingroup_bounds_lat_1d(domaingroup_hdl%daddr, bounds_lat_1d_, SHAPE(bounds_lat_1d_)) 
    477477      ENDIF 
    478478 
    479479      IF (PRESENT(bounds_lat_2d_)) THEN 
    480         CALL cxios_get_domaingroup_bounds_lat_2d(domaingroup_hdl%daddr, bounds_lat_2d_, size(bounds_lat_2d_,1), size(bounds_lat_2d_,2), size(bounds_lat_2d_,3)) 
     480        CALL cxios_get_domaingroup_bounds_lat_2d(domaingroup_hdl%daddr, bounds_lat_2d_, SHAPE(bounds_lat_2d_)) 
    481481      ENDIF 
    482482 
    483483      IF (PRESENT(bounds_lon_1d_)) THEN 
    484         CALL cxios_get_domaingroup_bounds_lon_1d(domaingroup_hdl%daddr, bounds_lon_1d_, size(bounds_lon_1d_,1), size(bounds_lon_1d_,2)) 
     484        CALL cxios_get_domaingroup_bounds_lon_1d(domaingroup_hdl%daddr, bounds_lon_1d_, SHAPE(bounds_lon_1d_)) 
    485485      ENDIF 
    486486 
    487487      IF (PRESENT(bounds_lon_2d_)) THEN 
    488         CALL cxios_get_domaingroup_bounds_lon_2d(domaingroup_hdl%daddr, bounds_lon_2d_, size(bounds_lon_2d_,1), size(bounds_lon_2d_,2), size(bounds_lon_2d_,3)) 
     488        CALL cxios_get_domaingroup_bounds_lon_2d(domaingroup_hdl%daddr, bounds_lon_2d_, SHAPE(bounds_lon_2d_)) 
    489489      ENDIF 
    490490 
     
    494494 
    495495      IF (PRESENT(data_i_index_)) THEN 
    496         CALL cxios_get_domaingroup_data_i_index(domaingroup_hdl%daddr, data_i_index_, size(data_i_index_,1)) 
     496        CALL cxios_get_domaingroup_data_i_index(domaingroup_hdl%daddr, data_i_index_, SHAPE(data_i_index_)) 
    497497      ENDIF 
    498498 
     
    502502 
    503503      IF (PRESENT(data_j_index_)) THEN 
    504         CALL cxios_get_domaingroup_data_j_index(domaingroup_hdl%daddr, data_j_index_, size(data_j_index_,1)) 
     504        CALL cxios_get_domaingroup_data_j_index(domaingroup_hdl%daddr, data_j_index_, SHAPE(data_j_index_)) 
    505505      ENDIF 
    506506 
     
    530530 
    531531      IF (PRESENT(i_index_)) THEN 
    532         CALL cxios_get_domaingroup_i_index(domaingroup_hdl%daddr, i_index_, size(i_index_,1)) 
     532        CALL cxios_get_domaingroup_i_index(domaingroup_hdl%daddr, i_index_, SHAPE(i_index_)) 
    533533      ENDIF 
    534534 
     
    538538 
    539539      IF (PRESENT(j_index_)) THEN 
    540         CALL cxios_get_domaingroup_j_index(domaingroup_hdl%daddr, j_index_, size(j_index_,1)) 
     540        CALL cxios_get_domaingroup_j_index(domaingroup_hdl%daddr, j_index_, SHAPE(j_index_)) 
    541541      ENDIF 
    542542 
     
    546546 
    547547      IF (PRESENT(latvalue_1d_)) THEN 
    548         CALL cxios_get_domaingroup_latvalue_1d(domaingroup_hdl%daddr, latvalue_1d_, size(latvalue_1d_,1)) 
     548        CALL cxios_get_domaingroup_latvalue_1d(domaingroup_hdl%daddr, latvalue_1d_, SHAPE(latvalue_1d_)) 
    549549      ENDIF 
    550550 
    551551      IF (PRESENT(latvalue_2d_)) THEN 
    552         CALL cxios_get_domaingroup_latvalue_2d(domaingroup_hdl%daddr, latvalue_2d_, size(latvalue_2d_,1), size(latvalue_2d_,2)) 
     552        CALL cxios_get_domaingroup_latvalue_2d(domaingroup_hdl%daddr, latvalue_2d_, SHAPE(latvalue_2d_)) 
    553553      ENDIF 
    554554 
     
    558558 
    559559      IF (PRESENT(lonvalue_1d_)) THEN 
    560         CALL cxios_get_domaingroup_lonvalue_1d(domaingroup_hdl%daddr, lonvalue_1d_, size(lonvalue_1d_,1)) 
     560        CALL cxios_get_domaingroup_lonvalue_1d(domaingroup_hdl%daddr, lonvalue_1d_, SHAPE(lonvalue_1d_)) 
    561561      ENDIF 
    562562 
    563563      IF (PRESENT(lonvalue_2d_)) THEN 
    564         CALL cxios_get_domaingroup_lonvalue_2d(domaingroup_hdl%daddr, lonvalue_2d_, size(lonvalue_2d_,1), size(lonvalue_2d_,2)) 
     564        CALL cxios_get_domaingroup_lonvalue_2d(domaingroup_hdl%daddr, lonvalue_2d_, SHAPE(lonvalue_2d_)) 
    565565      ENDIF 
    566566 
    567567      IF (PRESENT(mask_1d_)) THEN 
    568         ALLOCATE(mask_1d__tmp(size(mask_1d_,1))) 
    569         CALL cxios_get_domaingroup_mask_1d(domaingroup_hdl%daddr, mask_1d__tmp, size(mask_1d_,1)) 
     568        ALLOCATE(mask_1d__tmp(SIZE(mask_1d_,1))) 
     569        CALL cxios_get_domaingroup_mask_1d(domaingroup_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_)) 
    570570        mask_1d_ = mask_1d__tmp 
    571571      ENDIF 
    572572 
    573573      IF (PRESENT(mask_2d_)) THEN 
    574         ALLOCATE(mask_2d__tmp(size(mask_2d_,1), size(mask_2d_,2))) 
    575         CALL cxios_get_domaingroup_mask_2d(domaingroup_hdl%daddr, mask_2d__tmp, size(mask_2d_,1), size(mask_2d_,2)) 
     574        ALLOCATE(mask_2d__tmp(SIZE(mask_2d_,1), SIZE(mask_2d_,2))) 
     575        CALL cxios_get_domaingroup_mask_2d(domaingroup_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_)) 
    576576        mask_2d_ = mask_2d__tmp 
    577577      ENDIF 
  • XIOS/trunk/src/interface/fortran_attr/igrid_attr.F90

    r581 r674  
    7272 
    7373      IF (PRESENT(axis_domain_order_)) THEN 
    74         ALLOCATE(axis_domain_order__tmp(size(axis_domain_order_,1))) 
     74        ALLOCATE(axis_domain_order__tmp(SIZE(axis_domain_order_,1))) 
    7575        axis_domain_order__tmp = axis_domain_order_ 
    76         CALL cxios_set_grid_axis_domain_order(grid_hdl%daddr, axis_domain_order__tmp, size(axis_domain_order_,1)) 
     76        CALL cxios_set_grid_axis_domain_order(grid_hdl%daddr, axis_domain_order__tmp, SHAPE(axis_domain_order_)) 
    7777      ENDIF 
    7878 
     
    8282 
    8383      IF (PRESENT(mask1_)) THEN 
    84         ALLOCATE(mask1__tmp(size(mask1_,1))) 
     84        ALLOCATE(mask1__tmp(SIZE(mask1_,1))) 
    8585        mask1__tmp = mask1_ 
    86         CALL cxios_set_grid_mask1(grid_hdl%daddr, mask1__tmp, size(mask1_,1)) 
     86        CALL cxios_set_grid_mask1(grid_hdl%daddr, mask1__tmp, SHAPE(mask1_)) 
    8787      ENDIF 
    8888 
    8989      IF (PRESENT(mask2_)) THEN 
    90         ALLOCATE(mask2__tmp(size(mask2_,1), size(mask2_,2))) 
     90        ALLOCATE(mask2__tmp(SIZE(mask2_,1), SIZE(mask2_,2))) 
    9191        mask2__tmp = mask2_ 
    92         CALL cxios_set_grid_mask2(grid_hdl%daddr, mask2__tmp, size(mask2_,1), size(mask2_,2)) 
     92        CALL cxios_set_grid_mask2(grid_hdl%daddr, mask2__tmp, SHAPE(mask2_)) 
    9393      ENDIF 
    9494 
    9595      IF (PRESENT(mask3_)) THEN 
    96         ALLOCATE(mask3__tmp(size(mask3_,1), size(mask3_,2), size(mask3_,3))) 
     96        ALLOCATE(mask3__tmp(SIZE(mask3_,1), SIZE(mask3_,2), SIZE(mask3_,3))) 
    9797        mask3__tmp = mask3_ 
    98         CALL cxios_set_grid_mask3(grid_hdl%daddr, mask3__tmp, size(mask3_,1), size(mask3_,2), size(mask3_,3)) 
     98        CALL cxios_set_grid_mask3(grid_hdl%daddr, mask3__tmp, SHAPE(mask3_)) 
    9999      ENDIF 
    100100 
     
    166166 
    167167      IF (PRESENT(axis_domain_order_)) THEN 
    168         ALLOCATE(axis_domain_order__tmp(size(axis_domain_order_,1))) 
    169         CALL cxios_get_grid_axis_domain_order(grid_hdl%daddr, axis_domain_order__tmp, size(axis_domain_order_,1)) 
     168        ALLOCATE(axis_domain_order__tmp(SIZE(axis_domain_order_,1))) 
     169        CALL cxios_get_grid_axis_domain_order(grid_hdl%daddr, axis_domain_order__tmp, SHAPE(axis_domain_order_)) 
    170170        axis_domain_order_ = axis_domain_order__tmp 
    171171      ENDIF 
     
    176176 
    177177      IF (PRESENT(mask1_)) THEN 
    178         ALLOCATE(mask1__tmp(size(mask1_,1))) 
    179         CALL cxios_get_grid_mask1(grid_hdl%daddr, mask1__tmp, size(mask1_,1)) 
     178        ALLOCATE(mask1__tmp(SIZE(mask1_,1))) 
     179        CALL cxios_get_grid_mask1(grid_hdl%daddr, mask1__tmp, SHAPE(mask1_)) 
    180180        mask1_ = mask1__tmp 
    181181      ENDIF 
    182182 
    183183      IF (PRESENT(mask2_)) THEN 
    184         ALLOCATE(mask2__tmp(size(mask2_,1), size(mask2_,2))) 
    185         CALL cxios_get_grid_mask2(grid_hdl%daddr, mask2__tmp, size(mask2_,1), size(mask2_,2)) 
     184        ALLOCATE(mask2__tmp(SIZE(mask2_,1), SIZE(mask2_,2))) 
     185        CALL cxios_get_grid_mask2(grid_hdl%daddr, mask2__tmp, SHAPE(mask2_)) 
    186186        mask2_ = mask2__tmp 
    187187      ENDIF 
    188188 
    189189      IF (PRESENT(mask3_)) THEN 
    190         ALLOCATE(mask3__tmp(size(mask3_,1), size(mask3_,2), size(mask3_,3))) 
    191         CALL cxios_get_grid_mask3(grid_hdl%daddr, mask3__tmp, size(mask3_,1), size(mask3_,2), size(mask3_,3)) 
     190        ALLOCATE(mask3__tmp(SIZE(mask3_,1), SIZE(mask3_,2), SIZE(mask3_,3))) 
     191        CALL cxios_get_grid_mask3(grid_hdl%daddr, mask3__tmp, SHAPE(mask3_)) 
    192192        mask3_ = mask3__tmp 
    193193      ENDIF 
  • XIOS/trunk/src/interface/fortran_attr/igridgroup_attr.F90

    r581 r674  
    7676 
    7777      IF (PRESENT(axis_domain_order_)) THEN 
    78         ALLOCATE(axis_domain_order__tmp(size(axis_domain_order_,1))) 
     78        ALLOCATE(axis_domain_order__tmp(SIZE(axis_domain_order_,1))) 
    7979        axis_domain_order__tmp = axis_domain_order_ 
    80         CALL cxios_set_gridgroup_axis_domain_order(gridgroup_hdl%daddr, axis_domain_order__tmp, size(axis_domain_order_,1)) 
     80        CALL cxios_set_gridgroup_axis_domain_order(gridgroup_hdl%daddr, axis_domain_order__tmp, SHAPE(axis_domain_order_)) 
    8181      ENDIF 
    8282 
     
    9090 
    9191      IF (PRESENT(mask1_)) THEN 
    92         ALLOCATE(mask1__tmp(size(mask1_,1))) 
     92        ALLOCATE(mask1__tmp(SIZE(mask1_,1))) 
    9393        mask1__tmp = mask1_ 
    94         CALL cxios_set_gridgroup_mask1(gridgroup_hdl%daddr, mask1__tmp, size(mask1_,1)) 
     94        CALL cxios_set_gridgroup_mask1(gridgroup_hdl%daddr, mask1__tmp, SHAPE(mask1_)) 
    9595      ENDIF 
    9696 
    9797      IF (PRESENT(mask2_)) THEN 
    98         ALLOCATE(mask2__tmp(size(mask2_,1), size(mask2_,2))) 
     98        ALLOCATE(mask2__tmp(SIZE(mask2_,1), SIZE(mask2_,2))) 
    9999        mask2__tmp = mask2_ 
    100         CALL cxios_set_gridgroup_mask2(gridgroup_hdl%daddr, mask2__tmp, size(mask2_,1), size(mask2_,2)) 
     100        CALL cxios_set_gridgroup_mask2(gridgroup_hdl%daddr, mask2__tmp, SHAPE(mask2_)) 
    101101      ENDIF 
    102102 
    103103      IF (PRESENT(mask3_)) THEN 
    104         ALLOCATE(mask3__tmp(size(mask3_,1), size(mask3_,2), size(mask3_,3))) 
     104        ALLOCATE(mask3__tmp(SIZE(mask3_,1), SIZE(mask3_,2), SIZE(mask3_,3))) 
    105105        mask3__tmp = mask3_ 
    106         CALL cxios_set_gridgroup_mask3(gridgroup_hdl%daddr, mask3__tmp, size(mask3_,1), size(mask3_,2), size(mask3_,3)) 
     106        CALL cxios_set_gridgroup_mask3(gridgroup_hdl%daddr, mask3__tmp, SHAPE(mask3_)) 
    107107      ENDIF 
    108108 
     
    178178 
    179179      IF (PRESENT(axis_domain_order_)) THEN 
    180         ALLOCATE(axis_domain_order__tmp(size(axis_domain_order_,1))) 
    181         CALL cxios_get_gridgroup_axis_domain_order(gridgroup_hdl%daddr, axis_domain_order__tmp, size(axis_domain_order_,1)) 
     180        ALLOCATE(axis_domain_order__tmp(SIZE(axis_domain_order_,1))) 
     181        CALL cxios_get_gridgroup_axis_domain_order(gridgroup_hdl%daddr, axis_domain_order__tmp, SHAPE(axis_domain_order_)) 
    182182        axis_domain_order_ = axis_domain_order__tmp 
    183183      ENDIF 
     
    192192 
    193193      IF (PRESENT(mask1_)) THEN 
    194         ALLOCATE(mask1__tmp(size(mask1_,1))) 
    195         CALL cxios_get_gridgroup_mask1(gridgroup_hdl%daddr, mask1__tmp, size(mask1_,1)) 
     194        ALLOCATE(mask1__tmp(SIZE(mask1_,1))) 
     195        CALL cxios_get_gridgroup_mask1(gridgroup_hdl%daddr, mask1__tmp, SHAPE(mask1_)) 
    196196        mask1_ = mask1__tmp 
    197197      ENDIF 
    198198 
    199199      IF (PRESENT(mask2_)) THEN 
    200         ALLOCATE(mask2__tmp(size(mask2_,1), size(mask2_,2))) 
    201         CALL cxios_get_gridgroup_mask2(gridgroup_hdl%daddr, mask2__tmp, size(mask2_,1), size(mask2_,2)) 
     200        ALLOCATE(mask2__tmp(SIZE(mask2_,1), SIZE(mask2_,2))) 
     201        CALL cxios_get_gridgroup_mask2(gridgroup_hdl%daddr, mask2__tmp, SHAPE(mask2_)) 
    202202        mask2_ = mask2__tmp 
    203203      ENDIF 
    204204 
    205205      IF (PRESENT(mask3_)) THEN 
    206         ALLOCATE(mask3__tmp(size(mask3_,1), size(mask3_,2), size(mask3_,3))) 
    207         CALL cxios_get_gridgroup_mask3(gridgroup_hdl%daddr, mask3__tmp, size(mask3_,1), size(mask3_,2), size(mask3_,3)) 
     206        ALLOCATE(mask3__tmp(SIZE(mask3_,1), SIZE(mask3_,2), SIZE(mask3_,3))) 
     207        CALL cxios_get_gridgroup_mask3(gridgroup_hdl%daddr, mask3__tmp, SHAPE(mask3_)) 
    208208        mask3_ = mask3__tmp 
    209209      ENDIF 
Note: See TracChangeset for help on using the changeset viewer.