Changeset 1052


Ignore:
Timestamp:
02/07/17 12:00:27 (7 years ago)
Author:
ymipsl
Message:

Generate fortran interface for new attributes from previous commit.

YM

Location:
XIOS/trunk/src/interface
Files:
24 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/src/interface/c_attr/icaxis_attr.cpp

    r817 r1052  
    188188 
    189189 
     190  void cxios_set_axis_label(axis_Ptr axis_hdl, char* label, int str_len, int* str_size, int* extent) 
     191  { 
     192    CTimer::get("XIOS").resume(); 
     193    axis_hdl->label.resize(shape(extent[0])); 
     194    Array<StdString,1>::iterator it, itb=axis_hdl->label.begin(), ite=axis_hdl->label.end() ; 
     195    int i, n ; 
     196    for(it=itb, i=0, n=0 ; it!=ite ; ++it,n+=str_len,++i) *it=StdString(&label[n],str_size[i]) ; 
     197    CTimer::get("XIOS").suspend(); 
     198  } 
     199 
     200  void cxios_get_axis_label(axis_Ptr axis_hdl, char* label, int str_size, int* extent) 
     201  { 
     202    CTimer::get("XIOS").resume(); 
     203    Array<StdString,1>::const_iterator it, itb=axis_hdl->label.getInheritedValue().begin(), ite=axis_hdl->label.getInheritedValue().end() ; 
     204    int n ; 
     205    for(it=itb, n=0 ; it!=ite ; ++it, n+=str_size) it->copy(&label[n],it->size()) ;  
     206    CTimer::get("XIOS").suspend(); 
     207  } 
     208 
     209  bool cxios_is_defined_axis_label(axis_Ptr axis_hdl) 
     210  { 
     211     CTimer::get("XIOS").resume(); 
     212     bool isDefined = axis_hdl->label.hasInheritedValue(); 
     213     CTimer::get("XIOS").suspend(); 
     214     return isDefined; 
     215  } 
     216 
     217 
    190218  void cxios_set_axis_long_name(axis_Ptr axis_hdl, const char * long_name, int long_name_size) 
    191219  { 
     
    360388 
    361389 
     390  void cxios_set_axis_prec(axis_Ptr axis_hdl, int prec) 
     391  { 
     392    CTimer::get("XIOS").resume(); 
     393    axis_hdl->prec.setValue(prec); 
     394    CTimer::get("XIOS").suspend(); 
     395  } 
     396 
     397  void cxios_get_axis_prec(axis_Ptr axis_hdl, int* prec) 
     398  { 
     399    CTimer::get("XIOS").resume(); 
     400    *prec = axis_hdl->prec.getInheritedValue(); 
     401    CTimer::get("XIOS").suspend(); 
     402  } 
     403 
     404  bool cxios_is_defined_axis_prec(axis_Ptr axis_hdl) 
     405  { 
     406     CTimer::get("XIOS").resume(); 
     407     bool isDefined = axis_hdl->prec.hasInheritedValue(); 
     408     CTimer::get("XIOS").suspend(); 
     409     return isDefined; 
     410  } 
     411 
     412 
    362413  void cxios_set_axis_standard_name(axis_Ptr axis_hdl, const char * standard_name, int standard_name_size) 
    363414  { 
  • XIOS/trunk/src/interface/c_attr/icaxisgroup_attr.cpp

    r817 r1052  
    214214 
    215215 
     216  void cxios_set_axisgroup_label(axisgroup_Ptr axisgroup_hdl, char* label, int str_len, int* str_size, int* extent) 
     217  { 
     218    CTimer::get("XIOS").resume(); 
     219    axisgroup_hdl->label.resize(shape(extent[0])); 
     220    Array<StdString,1>::iterator it, itb=axisgroup_hdl->label.begin(), ite=axisgroup_hdl->label.end() ; 
     221    int i, n ; 
     222    for(it=itb, i=0, n=0 ; it!=ite ; ++it,n+=str_len,++i) *it=StdString(&label[n],str_size[i]) ; 
     223    CTimer::get("XIOS").suspend(); 
     224  } 
     225 
     226  void cxios_get_axisgroup_label(axisgroup_Ptr axisgroup_hdl, char* label, int str_size, int* extent) 
     227  { 
     228    CTimer::get("XIOS").resume(); 
     229    Array<StdString,1>::const_iterator it, itb=axisgroup_hdl->label.getInheritedValue().begin(), ite=axisgroup_hdl->label.getInheritedValue().end() ; 
     230    int n ; 
     231    for(it=itb, n=0 ; it!=ite ; ++it, n+=str_size) it->copy(&label[n],it->size()) ;  
     232    CTimer::get("XIOS").suspend(); 
     233  } 
     234 
     235  bool cxios_is_defined_axisgroup_label(axisgroup_Ptr axisgroup_hdl) 
     236  { 
     237     CTimer::get("XIOS").resume(); 
     238     bool isDefined = axisgroup_hdl->label.hasInheritedValue(); 
     239     CTimer::get("XIOS").suspend(); 
     240     return isDefined; 
     241  } 
     242 
     243 
    216244  void cxios_set_axisgroup_long_name(axisgroup_Ptr axisgroup_hdl, const char * long_name, int long_name_size) 
    217245  { 
     
    386414 
    387415 
     416  void cxios_set_axisgroup_prec(axisgroup_Ptr axisgroup_hdl, int prec) 
     417  { 
     418    CTimer::get("XIOS").resume(); 
     419    axisgroup_hdl->prec.setValue(prec); 
     420    CTimer::get("XIOS").suspend(); 
     421  } 
     422 
     423  void cxios_get_axisgroup_prec(axisgroup_Ptr axisgroup_hdl, int* prec) 
     424  { 
     425    CTimer::get("XIOS").resume(); 
     426    *prec = axisgroup_hdl->prec.getInheritedValue(); 
     427    CTimer::get("XIOS").suspend(); 
     428  } 
     429 
     430  bool cxios_is_defined_axisgroup_prec(axisgroup_Ptr axisgroup_hdl) 
     431  { 
     432     CTimer::get("XIOS").resume(); 
     433     bool isDefined = axisgroup_hdl->prec.hasInheritedValue(); 
     434     CTimer::get("XIOS").suspend(); 
     435     return isDefined; 
     436  } 
     437 
     438 
    388439  void cxios_set_axisgroup_standard_name(axisgroup_Ptr axisgroup_hdl, const char * standard_name, int standard_name_size) 
    389440  { 
  • XIOS/trunk/src/interface/c_attr/icdomain_attr.cpp

    r789 r1052  
    747747 
    748748 
     749  void cxios_set_domain_prec(domain_Ptr domain_hdl, int prec) 
     750  { 
     751    CTimer::get("XIOS").resume(); 
     752    domain_hdl->prec.setValue(prec); 
     753    CTimer::get("XIOS").suspend(); 
     754  } 
     755 
     756  void cxios_get_domain_prec(domain_Ptr domain_hdl, int* prec) 
     757  { 
     758    CTimer::get("XIOS").resume(); 
     759    *prec = domain_hdl->prec.getInheritedValue(); 
     760    CTimer::get("XIOS").suspend(); 
     761  } 
     762 
     763  bool cxios_is_defined_domain_prec(domain_Ptr domain_hdl) 
     764  { 
     765     CTimer::get("XIOS").resume(); 
     766     bool isDefined = domain_hdl->prec.hasInheritedValue(); 
     767     CTimer::get("XIOS").suspend(); 
     768     return isDefined; 
     769  } 
     770 
     771 
    749772  void cxios_set_domain_standard_name(domain_Ptr domain_hdl, const char * standard_name, int standard_name_size) 
    750773  { 
  • XIOS/trunk/src/interface/c_attr/icdomaingroup_attr.cpp

    r789 r1052  
    773773 
    774774 
     775  void cxios_set_domaingroup_prec(domaingroup_Ptr domaingroup_hdl, int prec) 
     776  { 
     777    CTimer::get("XIOS").resume(); 
     778    domaingroup_hdl->prec.setValue(prec); 
     779    CTimer::get("XIOS").suspend(); 
     780  } 
     781 
     782  void cxios_get_domaingroup_prec(domaingroup_Ptr domaingroup_hdl, int* prec) 
     783  { 
     784    CTimer::get("XIOS").resume(); 
     785    *prec = domaingroup_hdl->prec.getInheritedValue(); 
     786    CTimer::get("XIOS").suspend(); 
     787  } 
     788 
     789  bool cxios_is_defined_domaingroup_prec(domaingroup_Ptr domaingroup_hdl) 
     790  { 
     791     CTimer::get("XIOS").resume(); 
     792     bool isDefined = domaingroup_hdl->prec.hasInheritedValue(); 
     793     CTimer::get("XIOS").suspend(); 
     794     return isDefined; 
     795  } 
     796 
     797 
    775798  void cxios_set_domaingroup_standard_name(domaingroup_Ptr domaingroup_hdl, const char * standard_name, int standard_name_size) 
    776799  { 
  • XIOS/trunk/src/interface/c_attr/icfile_attr.cpp

    r932 r1052  
    553553 
    554554 
     555  void cxios_set_file_time_stamp_format(file_Ptr file_hdl, const char * time_stamp_format, int time_stamp_format_size) 
     556  { 
     557    std::string time_stamp_format_str; 
     558    if (!cstr2string(time_stamp_format, time_stamp_format_size, time_stamp_format_str)) return; 
     559    CTimer::get("XIOS").resume(); 
     560    file_hdl->time_stamp_format.setValue(time_stamp_format_str); 
     561    CTimer::get("XIOS").suspend(); 
     562  } 
     563 
     564  void cxios_get_file_time_stamp_format(file_Ptr file_hdl, char * time_stamp_format, int time_stamp_format_size) 
     565  { 
     566    CTimer::get("XIOS").resume(); 
     567    if (!string_copy(file_hdl->time_stamp_format.getInheritedValue(), time_stamp_format, time_stamp_format_size)) 
     568      ERROR("void cxios_get_file_time_stamp_format(file_Ptr file_hdl, char * time_stamp_format, int time_stamp_format_size)", << "Input string is too short"); 
     569    CTimer::get("XIOS").suspend(); 
     570  } 
     571 
     572  bool cxios_is_defined_file_time_stamp_format(file_Ptr file_hdl) 
     573  { 
     574     CTimer::get("XIOS").resume(); 
     575     bool isDefined = file_hdl->time_stamp_format.hasInheritedValue(); 
     576     CTimer::get("XIOS").suspend(); 
     577     return isDefined; 
     578  } 
     579 
     580 
     581  void cxios_set_file_time_stamp_name(file_Ptr file_hdl, const char * time_stamp_name, int time_stamp_name_size) 
     582  { 
     583    std::string time_stamp_name_str; 
     584    if (!cstr2string(time_stamp_name, time_stamp_name_size, time_stamp_name_str)) return; 
     585    CTimer::get("XIOS").resume(); 
     586    file_hdl->time_stamp_name.setValue(time_stamp_name_str); 
     587    CTimer::get("XIOS").suspend(); 
     588  } 
     589 
     590  void cxios_get_file_time_stamp_name(file_Ptr file_hdl, char * time_stamp_name, int time_stamp_name_size) 
     591  { 
     592    CTimer::get("XIOS").resume(); 
     593    if (!string_copy(file_hdl->time_stamp_name.getInheritedValue(), time_stamp_name, time_stamp_name_size)) 
     594      ERROR("void cxios_get_file_time_stamp_name(file_Ptr file_hdl, char * time_stamp_name, int time_stamp_name_size)", << "Input string is too short"); 
     595    CTimer::get("XIOS").suspend(); 
     596  } 
     597 
     598  bool cxios_is_defined_file_time_stamp_name(file_Ptr file_hdl) 
     599  { 
     600     CTimer::get("XIOS").resume(); 
     601     bool isDefined = file_hdl->time_stamp_name.hasInheritedValue(); 
     602     CTimer::get("XIOS").suspend(); 
     603     return isDefined; 
     604  } 
     605 
     606 
     607  void cxios_set_file_time_units(file_Ptr file_hdl, const char * time_units, int time_units_size) 
     608  { 
     609    std::string time_units_str; 
     610    if (!cstr2string(time_units, time_units_size, time_units_str)) return; 
     611    CTimer::get("XIOS").resume(); 
     612    file_hdl->time_units.fromString(time_units_str); 
     613    CTimer::get("XIOS").suspend(); 
     614  } 
     615 
     616  void cxios_get_file_time_units(file_Ptr file_hdl, char * time_units, int time_units_size) 
     617  { 
     618    CTimer::get("XIOS").resume(); 
     619    if (!string_copy(file_hdl->time_units.getInheritedStringValue(), time_units, time_units_size)) 
     620      ERROR("void cxios_get_file_time_units(file_Ptr file_hdl, char * time_units, int time_units_size)", << "Input string is too short"); 
     621    CTimer::get("XIOS").suspend(); 
     622  } 
     623 
     624  bool cxios_is_defined_file_time_units(file_Ptr file_hdl) 
     625  { 
     626     CTimer::get("XIOS").resume(); 
     627     bool isDefined = file_hdl->time_units.hasInheritedValue(); 
     628     CTimer::get("XIOS").suspend(); 
     629     return isDefined; 
     630  } 
     631 
     632 
    555633  void cxios_set_file_timeseries(file_Ptr file_hdl, const char * timeseries, int timeseries_size) 
    556634  { 
     
    629707     return isDefined; 
    630708  } 
     709 
     710 
     711  void cxios_set_file_uuid_format(file_Ptr file_hdl, const char * uuid_format, int uuid_format_size) 
     712  { 
     713    std::string uuid_format_str; 
     714    if (!cstr2string(uuid_format, uuid_format_size, uuid_format_str)) return; 
     715    CTimer::get("XIOS").resume(); 
     716    file_hdl->uuid_format.setValue(uuid_format_str); 
     717    CTimer::get("XIOS").suspend(); 
     718  } 
     719 
     720  void cxios_get_file_uuid_format(file_Ptr file_hdl, char * uuid_format, int uuid_format_size) 
     721  { 
     722    CTimer::get("XIOS").resume(); 
     723    if (!string_copy(file_hdl->uuid_format.getInheritedValue(), uuid_format, uuid_format_size)) 
     724      ERROR("void cxios_get_file_uuid_format(file_Ptr file_hdl, char * uuid_format, int uuid_format_size)", << "Input string is too short"); 
     725    CTimer::get("XIOS").suspend(); 
     726  } 
     727 
     728  bool cxios_is_defined_file_uuid_format(file_Ptr file_hdl) 
     729  { 
     730     CTimer::get("XIOS").resume(); 
     731     bool isDefined = file_hdl->uuid_format.hasInheritedValue(); 
     732     CTimer::get("XIOS").suspend(); 
     733     return isDefined; 
     734  } 
     735 
     736 
     737  void cxios_set_file_uuid_name(file_Ptr file_hdl, const char * uuid_name, int uuid_name_size) 
     738  { 
     739    std::string uuid_name_str; 
     740    if (!cstr2string(uuid_name, uuid_name_size, uuid_name_str)) return; 
     741    CTimer::get("XIOS").resume(); 
     742    file_hdl->uuid_name.setValue(uuid_name_str); 
     743    CTimer::get("XIOS").suspend(); 
     744  } 
     745 
     746  void cxios_get_file_uuid_name(file_Ptr file_hdl, char * uuid_name, int uuid_name_size) 
     747  { 
     748    CTimer::get("XIOS").resume(); 
     749    if (!string_copy(file_hdl->uuid_name.getInheritedValue(), uuid_name, uuid_name_size)) 
     750      ERROR("void cxios_get_file_uuid_name(file_Ptr file_hdl, char * uuid_name, int uuid_name_size)", << "Input string is too short"); 
     751    CTimer::get("XIOS").suspend(); 
     752  } 
     753 
     754  bool cxios_is_defined_file_uuid_name(file_Ptr file_hdl) 
     755  { 
     756     CTimer::get("XIOS").resume(); 
     757     bool isDefined = file_hdl->uuid_name.hasInheritedValue(); 
     758     CTimer::get("XIOS").suspend(); 
     759     return isDefined; 
     760  } 
    631761} 
  • XIOS/trunk/src/interface/c_attr/icfilegroup_attr.cpp

    r932 r1052  
    579579 
    580580 
     581  void cxios_set_filegroup_time_stamp_format(filegroup_Ptr filegroup_hdl, const char * time_stamp_format, int time_stamp_format_size) 
     582  { 
     583    std::string time_stamp_format_str; 
     584    if (!cstr2string(time_stamp_format, time_stamp_format_size, time_stamp_format_str)) return; 
     585    CTimer::get("XIOS").resume(); 
     586    filegroup_hdl->time_stamp_format.setValue(time_stamp_format_str); 
     587    CTimer::get("XIOS").suspend(); 
     588  } 
     589 
     590  void cxios_get_filegroup_time_stamp_format(filegroup_Ptr filegroup_hdl, char * time_stamp_format, int time_stamp_format_size) 
     591  { 
     592    CTimer::get("XIOS").resume(); 
     593    if (!string_copy(filegroup_hdl->time_stamp_format.getInheritedValue(), time_stamp_format, time_stamp_format_size)) 
     594      ERROR("void cxios_get_filegroup_time_stamp_format(filegroup_Ptr filegroup_hdl, char * time_stamp_format, int time_stamp_format_size)", << "Input string is too short"); 
     595    CTimer::get("XIOS").suspend(); 
     596  } 
     597 
     598  bool cxios_is_defined_filegroup_time_stamp_format(filegroup_Ptr filegroup_hdl) 
     599  { 
     600     CTimer::get("XIOS").resume(); 
     601     bool isDefined = filegroup_hdl->time_stamp_format.hasInheritedValue(); 
     602     CTimer::get("XIOS").suspend(); 
     603     return isDefined; 
     604  } 
     605 
     606 
     607  void cxios_set_filegroup_time_stamp_name(filegroup_Ptr filegroup_hdl, const char * time_stamp_name, int time_stamp_name_size) 
     608  { 
     609    std::string time_stamp_name_str; 
     610    if (!cstr2string(time_stamp_name, time_stamp_name_size, time_stamp_name_str)) return; 
     611    CTimer::get("XIOS").resume(); 
     612    filegroup_hdl->time_stamp_name.setValue(time_stamp_name_str); 
     613    CTimer::get("XIOS").suspend(); 
     614  } 
     615 
     616  void cxios_get_filegroup_time_stamp_name(filegroup_Ptr filegroup_hdl, char * time_stamp_name, int time_stamp_name_size) 
     617  { 
     618    CTimer::get("XIOS").resume(); 
     619    if (!string_copy(filegroup_hdl->time_stamp_name.getInheritedValue(), time_stamp_name, time_stamp_name_size)) 
     620      ERROR("void cxios_get_filegroup_time_stamp_name(filegroup_Ptr filegroup_hdl, char * time_stamp_name, int time_stamp_name_size)", << "Input string is too short"); 
     621    CTimer::get("XIOS").suspend(); 
     622  } 
     623 
     624  bool cxios_is_defined_filegroup_time_stamp_name(filegroup_Ptr filegroup_hdl) 
     625  { 
     626     CTimer::get("XIOS").resume(); 
     627     bool isDefined = filegroup_hdl->time_stamp_name.hasInheritedValue(); 
     628     CTimer::get("XIOS").suspend(); 
     629     return isDefined; 
     630  } 
     631 
     632 
     633  void cxios_set_filegroup_time_units(filegroup_Ptr filegroup_hdl, const char * time_units, int time_units_size) 
     634  { 
     635    std::string time_units_str; 
     636    if (!cstr2string(time_units, time_units_size, time_units_str)) return; 
     637    CTimer::get("XIOS").resume(); 
     638    filegroup_hdl->time_units.fromString(time_units_str); 
     639    CTimer::get("XIOS").suspend(); 
     640  } 
     641 
     642  void cxios_get_filegroup_time_units(filegroup_Ptr filegroup_hdl, char * time_units, int time_units_size) 
     643  { 
     644    CTimer::get("XIOS").resume(); 
     645    if (!string_copy(filegroup_hdl->time_units.getInheritedStringValue(), time_units, time_units_size)) 
     646      ERROR("void cxios_get_filegroup_time_units(filegroup_Ptr filegroup_hdl, char * time_units, int time_units_size)", << "Input string is too short"); 
     647    CTimer::get("XIOS").suspend(); 
     648  } 
     649 
     650  bool cxios_is_defined_filegroup_time_units(filegroup_Ptr filegroup_hdl) 
     651  { 
     652     CTimer::get("XIOS").resume(); 
     653     bool isDefined = filegroup_hdl->time_units.hasInheritedValue(); 
     654     CTimer::get("XIOS").suspend(); 
     655     return isDefined; 
     656  } 
     657 
     658 
    581659  void cxios_set_filegroup_timeseries(filegroup_Ptr filegroup_hdl, const char * timeseries, int timeseries_size) 
    582660  { 
     
    655733     return isDefined; 
    656734  } 
     735 
     736 
     737  void cxios_set_filegroup_uuid_format(filegroup_Ptr filegroup_hdl, const char * uuid_format, int uuid_format_size) 
     738  { 
     739    std::string uuid_format_str; 
     740    if (!cstr2string(uuid_format, uuid_format_size, uuid_format_str)) return; 
     741    CTimer::get("XIOS").resume(); 
     742    filegroup_hdl->uuid_format.setValue(uuid_format_str); 
     743    CTimer::get("XIOS").suspend(); 
     744  } 
     745 
     746  void cxios_get_filegroup_uuid_format(filegroup_Ptr filegroup_hdl, char * uuid_format, int uuid_format_size) 
     747  { 
     748    CTimer::get("XIOS").resume(); 
     749    if (!string_copy(filegroup_hdl->uuid_format.getInheritedValue(), uuid_format, uuid_format_size)) 
     750      ERROR("void cxios_get_filegroup_uuid_format(filegroup_Ptr filegroup_hdl, char * uuid_format, int uuid_format_size)", << "Input string is too short"); 
     751    CTimer::get("XIOS").suspend(); 
     752  } 
     753 
     754  bool cxios_is_defined_filegroup_uuid_format(filegroup_Ptr filegroup_hdl) 
     755  { 
     756     CTimer::get("XIOS").resume(); 
     757     bool isDefined = filegroup_hdl->uuid_format.hasInheritedValue(); 
     758     CTimer::get("XIOS").suspend(); 
     759     return isDefined; 
     760  } 
     761 
     762 
     763  void cxios_set_filegroup_uuid_name(filegroup_Ptr filegroup_hdl, const char * uuid_name, int uuid_name_size) 
     764  { 
     765    std::string uuid_name_str; 
     766    if (!cstr2string(uuid_name, uuid_name_size, uuid_name_str)) return; 
     767    CTimer::get("XIOS").resume(); 
     768    filegroup_hdl->uuid_name.setValue(uuid_name_str); 
     769    CTimer::get("XIOS").suspend(); 
     770  } 
     771 
     772  void cxios_get_filegroup_uuid_name(filegroup_Ptr filegroup_hdl, char * uuid_name, int uuid_name_size) 
     773  { 
     774    CTimer::get("XIOS").resume(); 
     775    if (!string_copy(filegroup_hdl->uuid_name.getInheritedValue(), uuid_name, uuid_name_size)) 
     776      ERROR("void cxios_get_filegroup_uuid_name(filegroup_Ptr filegroup_hdl, char * uuid_name, int uuid_name_size)", << "Input string is too short"); 
     777    CTimer::get("XIOS").suspend(); 
     778  } 
     779 
     780  bool cxios_is_defined_filegroup_uuid_name(filegroup_Ptr filegroup_hdl) 
     781  { 
     782     CTimer::get("XIOS").resume(); 
     783     bool isDefined = filegroup_hdl->uuid_name.hasInheritedValue(); 
     784     CTimer::get("XIOS").suspend(); 
     785     return isDefined; 
     786  } 
    657787} 
  • XIOS/trunk/src/interface/c_attr/icscalar_attr.cpp

    r891 r1052  
    6565     CTimer::get("XIOS").resume(); 
    6666     bool isDefined = scalar_hdl->name.hasInheritedValue(); 
     67     CTimer::get("XIOS").suspend(); 
     68     return isDefined; 
     69  } 
     70 
     71 
     72  void cxios_set_scalar_prec(scalar_Ptr scalar_hdl, int prec) 
     73  { 
     74    CTimer::get("XIOS").resume(); 
     75    scalar_hdl->prec.setValue(prec); 
     76    CTimer::get("XIOS").suspend(); 
     77  } 
     78 
     79  void cxios_get_scalar_prec(scalar_Ptr scalar_hdl, int* prec) 
     80  { 
     81    CTimer::get("XIOS").resume(); 
     82    *prec = scalar_hdl->prec.getInheritedValue(); 
     83    CTimer::get("XIOS").suspend(); 
     84  } 
     85 
     86  bool cxios_is_defined_scalar_prec(scalar_Ptr scalar_hdl) 
     87  { 
     88     CTimer::get("XIOS").resume(); 
     89     bool isDefined = scalar_hdl->prec.hasInheritedValue(); 
    6790     CTimer::get("XIOS").suspend(); 
    6891     return isDefined; 
  • XIOS/trunk/src/interface/c_attr/icscalargroup_attr.cpp

    r891 r1052  
    9696 
    9797 
     98  void cxios_set_scalargroup_prec(scalargroup_Ptr scalargroup_hdl, int prec) 
     99  { 
     100    CTimer::get("XIOS").resume(); 
     101    scalargroup_hdl->prec.setValue(prec); 
     102    CTimer::get("XIOS").suspend(); 
     103  } 
     104 
     105  void cxios_get_scalargroup_prec(scalargroup_Ptr scalargroup_hdl, int* prec) 
     106  { 
     107    CTimer::get("XIOS").resume(); 
     108    *prec = scalargroup_hdl->prec.getInheritedValue(); 
     109    CTimer::get("XIOS").suspend(); 
     110  } 
     111 
     112  bool cxios_is_defined_scalargroup_prec(scalargroup_Ptr scalargroup_hdl) 
     113  { 
     114     CTimer::get("XIOS").resume(); 
     115     bool isDefined = scalargroup_hdl->prec.hasInheritedValue(); 
     116     CTimer::get("XIOS").suspend(); 
     117     return isDefined; 
     118  } 
     119 
     120 
    98121  void cxios_set_scalargroup_scalar_ref(scalargroup_Ptr scalargroup_hdl, const char * scalar_ref, int scalar_ref_size) 
    99122  { 
  • XIOS/trunk/src/interface/fortran_attr/axis_interface_attr.F90

    r817 r1052  
    151151 
    152152 
     153    SUBROUTINE cxios_set_axis_label(axis_hdl, label, str_len, str_size, extent) BIND(C) 
     154      USE ISO_C_BINDING 
     155      INTEGER (kind = C_INTPTR_T), VALUE       :: axis_hdl 
     156      CHARACTER (KIND=C_CHAR), DIMENSION(*)    :: label 
     157      INTEGER (kind = C_INT), VALUE            :: str_len 
     158      INTEGER (kind = C_INT), DIMENSION(*)     :: str_size 
     159      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
     160    END SUBROUTINE cxios_set_axis_label 
     161 
     162    SUBROUTINE cxios_get_axis_label(axis_hdl, label, str_size, extent) BIND(C) 
     163      USE ISO_C_BINDING 
     164      INTEGER (kind = C_INTPTR_T), VALUE       :: axis_hdl 
     165      CHARACTER (KIND=C_CHAR), DIMENSION(*)    :: label 
     166      INTEGER (kind = C_INT), VALUE            :: str_size 
     167      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
     168    END SUBROUTINE cxios_get_axis_label 
     169 
     170    FUNCTION cxios_is_defined_axis_label(axis_hdl) BIND(C) 
     171      USE ISO_C_BINDING 
     172      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axis_label 
     173      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 
     174    END FUNCTION cxios_is_defined_axis_label 
     175 
     176 
    153177    SUBROUTINE cxios_set_axis_long_name(axis_hdl, long_name, long_name_size) BIND(C) 
    154178      USE ISO_C_BINDING 
     
    292316 
    293317 
     318    SUBROUTINE cxios_set_axis_prec(axis_hdl, prec) BIND(C) 
     319      USE ISO_C_BINDING 
     320      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 
     321      INTEGER (KIND=C_INT)      , VALUE :: prec 
     322    END SUBROUTINE cxios_set_axis_prec 
     323 
     324    SUBROUTINE cxios_get_axis_prec(axis_hdl, prec) BIND(C) 
     325      USE ISO_C_BINDING 
     326      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 
     327      INTEGER (KIND=C_INT)             :: prec 
     328    END SUBROUTINE cxios_get_axis_prec 
     329 
     330    FUNCTION cxios_is_defined_axis_prec(axis_hdl) BIND(C) 
     331      USE ISO_C_BINDING 
     332      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axis_prec 
     333      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 
     334    END FUNCTION cxios_is_defined_axis_prec 
     335 
     336 
    294337    SUBROUTINE cxios_set_axis_standard_name(axis_hdl, standard_name, standard_name_size) BIND(C) 
    295338      USE ISO_C_BINDING 
  • XIOS/trunk/src/interface/fortran_attr/axisgroup_interface_attr.F90

    r817 r1052  
    172172 
    173173 
     174    SUBROUTINE cxios_set_axisgroup_label(axisgroup_hdl, label, str_len, str_size, extent) BIND(C) 
     175      USE ISO_C_BINDING 
     176      INTEGER (kind = C_INTPTR_T), VALUE       :: axisgroup_hdl 
     177      CHARACTER (KIND=C_CHAR), DIMENSION(*)    :: label 
     178      INTEGER (kind = C_INT), VALUE            :: str_len 
     179      INTEGER (kind = C_INT), DIMENSION(*)     :: str_size 
     180      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
     181    END SUBROUTINE cxios_set_axisgroup_label 
     182 
     183    SUBROUTINE cxios_get_axisgroup_label(axisgroup_hdl, label, str_size, extent) BIND(C) 
     184      USE ISO_C_BINDING 
     185      INTEGER (kind = C_INTPTR_T), VALUE       :: axisgroup_hdl 
     186      CHARACTER (KIND=C_CHAR), DIMENSION(*)    :: label 
     187      INTEGER (kind = C_INT), VALUE            :: str_size 
     188      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
     189    END SUBROUTINE cxios_get_axisgroup_label 
     190 
     191    FUNCTION cxios_is_defined_axisgroup_label(axisgroup_hdl) BIND(C) 
     192      USE ISO_C_BINDING 
     193      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axisgroup_label 
     194      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 
     195    END FUNCTION cxios_is_defined_axisgroup_label 
     196 
     197 
    174198    SUBROUTINE cxios_set_axisgroup_long_name(axisgroup_hdl, long_name, long_name_size) BIND(C) 
    175199      USE ISO_C_BINDING 
     
    313337 
    314338 
     339    SUBROUTINE cxios_set_axisgroup_prec(axisgroup_hdl, prec) BIND(C) 
     340      USE ISO_C_BINDING 
     341      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 
     342      INTEGER (KIND=C_INT)      , VALUE :: prec 
     343    END SUBROUTINE cxios_set_axisgroup_prec 
     344 
     345    SUBROUTINE cxios_get_axisgroup_prec(axisgroup_hdl, prec) BIND(C) 
     346      USE ISO_C_BINDING 
     347      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 
     348      INTEGER (KIND=C_INT)             :: prec 
     349    END SUBROUTINE cxios_get_axisgroup_prec 
     350 
     351    FUNCTION cxios_is_defined_axisgroup_prec(axisgroup_hdl) BIND(C) 
     352      USE ISO_C_BINDING 
     353      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axisgroup_prec 
     354      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 
     355    END FUNCTION cxios_is_defined_axisgroup_prec 
     356 
     357 
    315358    SUBROUTINE cxios_set_axisgroup_standard_name(axisgroup_hdl, standard_name, standard_name_size) BIND(C) 
    316359      USE ISO_C_BINDING 
  • XIOS/trunk/src/interface/fortran_attr/domain_interface_attr.F90

    r789 r1052  
    616616 
    617617 
     618    SUBROUTINE cxios_set_domain_prec(domain_hdl, prec) BIND(C) 
     619      USE ISO_C_BINDING 
     620      INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 
     621      INTEGER (KIND=C_INT)      , VALUE :: prec 
     622    END SUBROUTINE cxios_set_domain_prec 
     623 
     624    SUBROUTINE cxios_get_domain_prec(domain_hdl, prec) BIND(C) 
     625      USE ISO_C_BINDING 
     626      INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 
     627      INTEGER (KIND=C_INT)             :: prec 
     628    END SUBROUTINE cxios_get_domain_prec 
     629 
     630    FUNCTION cxios_is_defined_domain_prec(domain_hdl) BIND(C) 
     631      USE ISO_C_BINDING 
     632      LOGICAL(kind=C_BOOL) :: cxios_is_defined_domain_prec 
     633      INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 
     634    END FUNCTION cxios_is_defined_domain_prec 
     635 
     636 
    618637    SUBROUTINE cxios_set_domain_standard_name(domain_hdl, standard_name, standard_name_size) BIND(C) 
    619638      USE ISO_C_BINDING 
  • XIOS/trunk/src/interface/fortran_attr/domaingroup_interface_attr.F90

    r789 r1052  
    637637 
    638638 
     639    SUBROUTINE cxios_set_domaingroup_prec(domaingroup_hdl, prec) BIND(C) 
     640      USE ISO_C_BINDING 
     641      INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 
     642      INTEGER (KIND=C_INT)      , VALUE :: prec 
     643    END SUBROUTINE cxios_set_domaingroup_prec 
     644 
     645    SUBROUTINE cxios_get_domaingroup_prec(domaingroup_hdl, prec) BIND(C) 
     646      USE ISO_C_BINDING 
     647      INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 
     648      INTEGER (KIND=C_INT)             :: prec 
     649    END SUBROUTINE cxios_get_domaingroup_prec 
     650 
     651    FUNCTION cxios_is_defined_domaingroup_prec(domaingroup_hdl) BIND(C) 
     652      USE ISO_C_BINDING 
     653      LOGICAL(kind=C_BOOL) :: cxios_is_defined_domaingroup_prec 
     654      INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 
     655    END FUNCTION cxios_is_defined_domaingroup_prec 
     656 
     657 
    639658    SUBROUTINE cxios_set_domaingroup_standard_name(domaingroup_hdl, standard_name, standard_name_size) BIND(C) 
    640659      USE ISO_C_BINDING 
  • XIOS/trunk/src/interface/fortran_attr/file_interface_attr.F90

    r932 r1052  
    416416 
    417417 
     418    SUBROUTINE cxios_set_file_time_stamp_format(file_hdl, time_stamp_format, time_stamp_format_size) BIND(C) 
     419      USE ISO_C_BINDING 
     420      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     421      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: time_stamp_format 
     422      INTEGER  (kind = C_INT)     , VALUE        :: time_stamp_format_size 
     423    END SUBROUTINE cxios_set_file_time_stamp_format 
     424 
     425    SUBROUTINE cxios_get_file_time_stamp_format(file_hdl, time_stamp_format, time_stamp_format_size) BIND(C) 
     426      USE ISO_C_BINDING 
     427      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     428      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: time_stamp_format 
     429      INTEGER  (kind = C_INT)     , VALUE        :: time_stamp_format_size 
     430    END SUBROUTINE cxios_get_file_time_stamp_format 
     431 
     432    FUNCTION cxios_is_defined_file_time_stamp_format(file_hdl) BIND(C) 
     433      USE ISO_C_BINDING 
     434      LOGICAL(kind=C_BOOL) :: cxios_is_defined_file_time_stamp_format 
     435      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     436    END FUNCTION cxios_is_defined_file_time_stamp_format 
     437 
     438 
     439    SUBROUTINE cxios_set_file_time_stamp_name(file_hdl, time_stamp_name, time_stamp_name_size) BIND(C) 
     440      USE ISO_C_BINDING 
     441      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     442      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: time_stamp_name 
     443      INTEGER  (kind = C_INT)     , VALUE        :: time_stamp_name_size 
     444    END SUBROUTINE cxios_set_file_time_stamp_name 
     445 
     446    SUBROUTINE cxios_get_file_time_stamp_name(file_hdl, time_stamp_name, time_stamp_name_size) BIND(C) 
     447      USE ISO_C_BINDING 
     448      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     449      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: time_stamp_name 
     450      INTEGER  (kind = C_INT)     , VALUE        :: time_stamp_name_size 
     451    END SUBROUTINE cxios_get_file_time_stamp_name 
     452 
     453    FUNCTION cxios_is_defined_file_time_stamp_name(file_hdl) BIND(C) 
     454      USE ISO_C_BINDING 
     455      LOGICAL(kind=C_BOOL) :: cxios_is_defined_file_time_stamp_name 
     456      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     457    END FUNCTION cxios_is_defined_file_time_stamp_name 
     458 
     459 
     460    SUBROUTINE cxios_set_file_time_units(file_hdl, time_units, time_units_size) BIND(C) 
     461      USE ISO_C_BINDING 
     462      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     463      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: time_units 
     464      INTEGER  (kind = C_INT)     , VALUE        :: time_units_size 
     465    END SUBROUTINE cxios_set_file_time_units 
     466 
     467    SUBROUTINE cxios_get_file_time_units(file_hdl, time_units, time_units_size) BIND(C) 
     468      USE ISO_C_BINDING 
     469      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     470      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: time_units 
     471      INTEGER  (kind = C_INT)     , VALUE        :: time_units_size 
     472    END SUBROUTINE cxios_get_file_time_units 
     473 
     474    FUNCTION cxios_is_defined_file_time_units(file_hdl) BIND(C) 
     475      USE ISO_C_BINDING 
     476      LOGICAL(kind=C_BOOL) :: cxios_is_defined_file_time_units 
     477      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     478    END FUNCTION cxios_is_defined_file_time_units 
     479 
     480 
    418481    SUBROUTINE cxios_set_file_timeseries(file_hdl, timeseries, timeseries_size) BIND(C) 
    419482      USE ISO_C_BINDING 
     
    478541    END FUNCTION cxios_is_defined_file_type 
    479542 
     543 
     544    SUBROUTINE cxios_set_file_uuid_format(file_hdl, uuid_format, uuid_format_size) BIND(C) 
     545      USE ISO_C_BINDING 
     546      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     547      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: uuid_format 
     548      INTEGER  (kind = C_INT)     , VALUE        :: uuid_format_size 
     549    END SUBROUTINE cxios_set_file_uuid_format 
     550 
     551    SUBROUTINE cxios_get_file_uuid_format(file_hdl, uuid_format, uuid_format_size) BIND(C) 
     552      USE ISO_C_BINDING 
     553      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     554      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: uuid_format 
     555      INTEGER  (kind = C_INT)     , VALUE        :: uuid_format_size 
     556    END SUBROUTINE cxios_get_file_uuid_format 
     557 
     558    FUNCTION cxios_is_defined_file_uuid_format(file_hdl) BIND(C) 
     559      USE ISO_C_BINDING 
     560      LOGICAL(kind=C_BOOL) :: cxios_is_defined_file_uuid_format 
     561      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     562    END FUNCTION cxios_is_defined_file_uuid_format 
     563 
     564 
     565    SUBROUTINE cxios_set_file_uuid_name(file_hdl, uuid_name, uuid_name_size) BIND(C) 
     566      USE ISO_C_BINDING 
     567      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     568      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: uuid_name 
     569      INTEGER  (kind = C_INT)     , VALUE        :: uuid_name_size 
     570    END SUBROUTINE cxios_set_file_uuid_name 
     571 
     572    SUBROUTINE cxios_get_file_uuid_name(file_hdl, uuid_name, uuid_name_size) BIND(C) 
     573      USE ISO_C_BINDING 
     574      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     575      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: uuid_name 
     576      INTEGER  (kind = C_INT)     , VALUE        :: uuid_name_size 
     577    END SUBROUTINE cxios_get_file_uuid_name 
     578 
     579    FUNCTION cxios_is_defined_file_uuid_name(file_hdl) BIND(C) 
     580      USE ISO_C_BINDING 
     581      LOGICAL(kind=C_BOOL) :: cxios_is_defined_file_uuid_name 
     582      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     583    END FUNCTION cxios_is_defined_file_uuid_name 
     584 
    480585  END INTERFACE 
    481586 
  • XIOS/trunk/src/interface/fortran_attr/filegroup_interface_attr.F90

    r932 r1052  
    437437 
    438438 
     439    SUBROUTINE cxios_set_filegroup_time_stamp_format(filegroup_hdl, time_stamp_format, time_stamp_format_size) BIND(C) 
     440      USE ISO_C_BINDING 
     441      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     442      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: time_stamp_format 
     443      INTEGER  (kind = C_INT)     , VALUE        :: time_stamp_format_size 
     444    END SUBROUTINE cxios_set_filegroup_time_stamp_format 
     445 
     446    SUBROUTINE cxios_get_filegroup_time_stamp_format(filegroup_hdl, time_stamp_format, time_stamp_format_size) BIND(C) 
     447      USE ISO_C_BINDING 
     448      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     449      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: time_stamp_format 
     450      INTEGER  (kind = C_INT)     , VALUE        :: time_stamp_format_size 
     451    END SUBROUTINE cxios_get_filegroup_time_stamp_format 
     452 
     453    FUNCTION cxios_is_defined_filegroup_time_stamp_format(filegroup_hdl) BIND(C) 
     454      USE ISO_C_BINDING 
     455      LOGICAL(kind=C_BOOL) :: cxios_is_defined_filegroup_time_stamp_format 
     456      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     457    END FUNCTION cxios_is_defined_filegroup_time_stamp_format 
     458 
     459 
     460    SUBROUTINE cxios_set_filegroup_time_stamp_name(filegroup_hdl, time_stamp_name, time_stamp_name_size) BIND(C) 
     461      USE ISO_C_BINDING 
     462      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     463      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: time_stamp_name 
     464      INTEGER  (kind = C_INT)     , VALUE        :: time_stamp_name_size 
     465    END SUBROUTINE cxios_set_filegroup_time_stamp_name 
     466 
     467    SUBROUTINE cxios_get_filegroup_time_stamp_name(filegroup_hdl, time_stamp_name, time_stamp_name_size) BIND(C) 
     468      USE ISO_C_BINDING 
     469      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     470      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: time_stamp_name 
     471      INTEGER  (kind = C_INT)     , VALUE        :: time_stamp_name_size 
     472    END SUBROUTINE cxios_get_filegroup_time_stamp_name 
     473 
     474    FUNCTION cxios_is_defined_filegroup_time_stamp_name(filegroup_hdl) BIND(C) 
     475      USE ISO_C_BINDING 
     476      LOGICAL(kind=C_BOOL) :: cxios_is_defined_filegroup_time_stamp_name 
     477      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     478    END FUNCTION cxios_is_defined_filegroup_time_stamp_name 
     479 
     480 
     481    SUBROUTINE cxios_set_filegroup_time_units(filegroup_hdl, time_units, time_units_size) BIND(C) 
     482      USE ISO_C_BINDING 
     483      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     484      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: time_units 
     485      INTEGER  (kind = C_INT)     , VALUE        :: time_units_size 
     486    END SUBROUTINE cxios_set_filegroup_time_units 
     487 
     488    SUBROUTINE cxios_get_filegroup_time_units(filegroup_hdl, time_units, time_units_size) BIND(C) 
     489      USE ISO_C_BINDING 
     490      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     491      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: time_units 
     492      INTEGER  (kind = C_INT)     , VALUE        :: time_units_size 
     493    END SUBROUTINE cxios_get_filegroup_time_units 
     494 
     495    FUNCTION cxios_is_defined_filegroup_time_units(filegroup_hdl) BIND(C) 
     496      USE ISO_C_BINDING 
     497      LOGICAL(kind=C_BOOL) :: cxios_is_defined_filegroup_time_units 
     498      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     499    END FUNCTION cxios_is_defined_filegroup_time_units 
     500 
     501 
    439502    SUBROUTINE cxios_set_filegroup_timeseries(filegroup_hdl, timeseries, timeseries_size) BIND(C) 
    440503      USE ISO_C_BINDING 
     
    499562    END FUNCTION cxios_is_defined_filegroup_type 
    500563 
     564 
     565    SUBROUTINE cxios_set_filegroup_uuid_format(filegroup_hdl, uuid_format, uuid_format_size) BIND(C) 
     566      USE ISO_C_BINDING 
     567      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     568      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: uuid_format 
     569      INTEGER  (kind = C_INT)     , VALUE        :: uuid_format_size 
     570    END SUBROUTINE cxios_set_filegroup_uuid_format 
     571 
     572    SUBROUTINE cxios_get_filegroup_uuid_format(filegroup_hdl, uuid_format, uuid_format_size) BIND(C) 
     573      USE ISO_C_BINDING 
     574      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     575      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: uuid_format 
     576      INTEGER  (kind = C_INT)     , VALUE        :: uuid_format_size 
     577    END SUBROUTINE cxios_get_filegroup_uuid_format 
     578 
     579    FUNCTION cxios_is_defined_filegroup_uuid_format(filegroup_hdl) BIND(C) 
     580      USE ISO_C_BINDING 
     581      LOGICAL(kind=C_BOOL) :: cxios_is_defined_filegroup_uuid_format 
     582      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     583    END FUNCTION cxios_is_defined_filegroup_uuid_format 
     584 
     585 
     586    SUBROUTINE cxios_set_filegroup_uuid_name(filegroup_hdl, uuid_name, uuid_name_size) BIND(C) 
     587      USE ISO_C_BINDING 
     588      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     589      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: uuid_name 
     590      INTEGER  (kind = C_INT)     , VALUE        :: uuid_name_size 
     591    END SUBROUTINE cxios_set_filegroup_uuid_name 
     592 
     593    SUBROUTINE cxios_get_filegroup_uuid_name(filegroup_hdl, uuid_name, uuid_name_size) BIND(C) 
     594      USE ISO_C_BINDING 
     595      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     596      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: uuid_name 
     597      INTEGER  (kind = C_INT)     , VALUE        :: uuid_name_size 
     598    END SUBROUTINE cxios_get_filegroup_uuid_name 
     599 
     600    FUNCTION cxios_is_defined_filegroup_uuid_name(filegroup_hdl) BIND(C) 
     601      USE ISO_C_BINDING 
     602      LOGICAL(kind=C_BOOL) :: cxios_is_defined_filegroup_uuid_name 
     603      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     604    END FUNCTION cxios_is_defined_filegroup_uuid_name 
     605 
    501606  END INTERFACE 
    502607 
  • XIOS/trunk/src/interface/fortran_attr/iaxis_attr.F90

    r966 r1052  
    1212 
    1313  SUBROUTINE xios(set_axis_attr)  & 
    14     ( axis_id, axis_ref, begin, bounds, data_begin, data_index, data_n, index, long_name, mask, n  & 
    15     , n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     14    ( axis_id, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
     15    , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
     16     ) 
    1617 
    1718    IMPLICIT NONE 
     
    2526      INTEGER  , OPTIONAL, INTENT(IN) :: data_n 
    2627      INTEGER  , OPTIONAL, INTENT(IN) :: index(:) 
     28      CHARACTER(len=*) , OPTIONAL, INTENT(IN) :: label(:) 
    2729      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name 
    2830      LOGICAL  , OPTIONAL, INTENT(IN) :: mask(:) 
     
    3335      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name 
    3436      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: positive 
     37      INTEGER  , OPTIONAL, INTENT(IN) :: prec 
    3538      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name 
    3639      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: unit 
     
    4043      (axis_id,axis_hdl) 
    4144      CALL xios(set_axis_attr_hdl_)   & 
    42       ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, long_name, mask  & 
    43       , n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     45      ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
     46      , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
     47       ) 
    4448 
    4549  END SUBROUTINE xios(set_axis_attr) 
    4650 
    4751  SUBROUTINE xios(set_axis_attr_hdl)  & 
    48     ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, long_name, mask  & 
    49     , n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     52    ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
     53    , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
     54     ) 
    5055 
    5156    IMPLICIT NONE 
     
    5863      INTEGER  , OPTIONAL, INTENT(IN) :: data_n 
    5964      INTEGER  , OPTIONAL, INTENT(IN) :: index(:) 
     65      CHARACTER(len=*) , OPTIONAL, INTENT(IN) :: label(:) 
    6066      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name 
    6167      LOGICAL  , OPTIONAL, INTENT(IN) :: mask(:) 
     
    6672      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name 
    6773      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: positive 
     74      INTEGER  , OPTIONAL, INTENT(IN) :: prec 
    6875      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name 
    6976      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: unit 
     
    7178 
    7279      CALL xios(set_axis_attr_hdl_)  & 
    73       ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, long_name, mask  & 
    74       , n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     80      ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
     81      , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
     82       ) 
    7583 
    7684  END SUBROUTINE xios(set_axis_attr_hdl) 
    7785 
    7886  SUBROUTINE xios(set_axis_attr_hdl_)   & 
    79     ( axis_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, index_, long_name_  & 
    80     , mask_, n_, n_distributed_partition_, n_glo_, name_, positive_, standard_name_, unit_, value_  & 
    81     ) 
     87    ( axis_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, index_, label_, long_name_  & 
     88    , mask_, n_, n_distributed_partition_, n_glo_, name_, positive_, prec_, standard_name_, unit_  & 
     89    , value_ ) 
    8290 
    8391    IMPLICIT NONE 
     
    9098      INTEGER  , OPTIONAL, INTENT(IN) :: data_n_ 
    9199      INTEGER  , OPTIONAL, INTENT(IN) :: index_(:) 
     100      CHARACTER(len=*) , OPTIONAL, INTENT(IN) :: label_(:) 
    92101      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name_ 
    93102      LOGICAL  , OPTIONAL, INTENT(IN) :: mask_(:) 
     
    98107      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_ 
    99108      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: positive_ 
     109      INTEGER  , OPTIONAL, INTENT(IN) :: prec_ 
    100110      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name_ 
    101111      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: unit_ 
     
    135145        CALL cxios_set_axis_index & 
    136146      (axis_hdl%daddr, index_, SHAPE(index_)) 
     147      ENDIF 
     148 
     149      IF (PRESENT(label_)) THEN 
     150        CALL cxios_set_axis_label & 
     151      (axis_hdl%daddr, label_, LEN(label_), LEN_TRIM(label_), SHAPE(label_)) 
    137152      ENDIF 
    138153 
     
    174189      ENDIF 
    175190 
     191      IF (PRESENT(prec_)) THEN 
     192        CALL cxios_set_axis_prec & 
     193      (axis_hdl%daddr, prec_) 
     194      ENDIF 
     195 
    176196      IF (PRESENT(standard_name_)) THEN 
    177197        CALL cxios_set_axis_standard_name & 
     
    192212 
    193213  SUBROUTINE xios(get_axis_attr)  & 
    194     ( axis_id, axis_ref, begin, bounds, data_begin, data_index, data_n, index, long_name, mask, n  & 
    195     , n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     214    ( axis_id, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
     215    , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
     216     ) 
    196217 
    197218    IMPLICIT NONE 
     
    205226      INTEGER  , OPTIONAL, INTENT(OUT) :: data_n 
    206227      INTEGER  , OPTIONAL, INTENT(OUT) :: index(:) 
     228      CHARACTER(len=*) , OPTIONAL, INTENT(OUT) :: label(:) 
    207229      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name 
    208230      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask(:) 
     
    213235      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name 
    214236      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: positive 
     237      INTEGER  , OPTIONAL, INTENT(OUT) :: prec 
    215238      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name 
    216239      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: unit 
     
    220243      (axis_id,axis_hdl) 
    221244      CALL xios(get_axis_attr_hdl_)   & 
    222       ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, long_name, mask  & 
    223       , n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     245      ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
     246      , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
     247       ) 
    224248 
    225249  END SUBROUTINE xios(get_axis_attr) 
    226250 
    227251  SUBROUTINE xios(get_axis_attr_hdl)  & 
    228     ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, long_name, mask  & 
    229     , n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     252    ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
     253    , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
     254     ) 
    230255 
    231256    IMPLICIT NONE 
     
    238263      INTEGER  , OPTIONAL, INTENT(OUT) :: data_n 
    239264      INTEGER  , OPTIONAL, INTENT(OUT) :: index(:) 
     265      CHARACTER(len=*) , OPTIONAL, INTENT(OUT) :: label(:) 
    240266      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name 
    241267      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask(:) 
     
    246272      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name 
    247273      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: positive 
     274      INTEGER  , OPTIONAL, INTENT(OUT) :: prec 
    248275      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name 
    249276      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: unit 
     
    251278 
    252279      CALL xios(get_axis_attr_hdl_)  & 
    253       ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, long_name, mask  & 
    254       , n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     280      ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
     281      , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
     282       ) 
    255283 
    256284  END SUBROUTINE xios(get_axis_attr_hdl) 
    257285 
    258286  SUBROUTINE xios(get_axis_attr_hdl_)   & 
    259     ( axis_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, index_, long_name_  & 
    260     , mask_, n_, n_distributed_partition_, n_glo_, name_, positive_, standard_name_, unit_, value_  & 
    261     ) 
     287    ( axis_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, index_, label_, long_name_  & 
     288    , mask_, n_, n_distributed_partition_, n_glo_, name_, positive_, prec_, standard_name_, unit_  & 
     289    , value_ ) 
    262290 
    263291    IMPLICIT NONE 
     
    270298      INTEGER  , OPTIONAL, INTENT(OUT) :: data_n_ 
    271299      INTEGER  , OPTIONAL, INTENT(OUT) :: index_(:) 
     300      CHARACTER(len=*) , OPTIONAL, INTENT(OUT) :: label_(:) 
    272301      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name_ 
    273302      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask_(:) 
     
    278307      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_ 
    279308      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: positive_ 
     309      INTEGER  , OPTIONAL, INTENT(OUT) :: prec_ 
    280310      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name_ 
    281311      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: unit_ 
     
    315345        CALL cxios_get_axis_index & 
    316346      (axis_hdl%daddr, index_, SHAPE(index_)) 
     347      ENDIF 
     348 
     349      IF (PRESENT(label_)) THEN 
     350        CALL cxios_get_axis_label & 
     351      (axis_hdl%daddr, label_, LEN(label_), SHAPE(label_)) 
    317352      ENDIF 
    318353 
     
    354389      ENDIF 
    355390 
     391      IF (PRESENT(prec_)) THEN 
     392        CALL cxios_get_axis_prec & 
     393      (axis_hdl%daddr, prec_) 
     394      ENDIF 
     395 
    356396      IF (PRESENT(standard_name_)) THEN 
    357397        CALL cxios_get_axis_standard_name & 
     
    372412 
    373413  SUBROUTINE xios(is_defined_axis_attr)  & 
    374     ( axis_id, axis_ref, begin, bounds, data_begin, data_index, data_n, index, long_name, mask, n  & 
    375     , n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     414    ( axis_id, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
     415    , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
     416     ) 
    376417 
    377418    IMPLICIT NONE 
     
    392433      LOGICAL, OPTIONAL, INTENT(OUT) :: index 
    393434      LOGICAL(KIND=C_BOOL) :: index_tmp 
     435      LOGICAL, OPTIONAL, INTENT(OUT) :: label 
     436      LOGICAL(KIND=C_BOOL) :: label_tmp 
    394437      LOGICAL, OPTIONAL, INTENT(OUT) :: long_name 
    395438      LOGICAL(KIND=C_BOOL) :: long_name_tmp 
     
    406449      LOGICAL, OPTIONAL, INTENT(OUT) :: positive 
    407450      LOGICAL(KIND=C_BOOL) :: positive_tmp 
     451      LOGICAL, OPTIONAL, INTENT(OUT) :: prec 
     452      LOGICAL(KIND=C_BOOL) :: prec_tmp 
    408453      LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name 
    409454      LOGICAL(KIND=C_BOOL) :: standard_name_tmp 
     
    416461      (axis_id,axis_hdl) 
    417462      CALL xios(is_defined_axis_attr_hdl_)   & 
    418       ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, long_name, mask  & 
    419       , n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     463      ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
     464      , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
     465       ) 
    420466 
    421467  END SUBROUTINE xios(is_defined_axis_attr) 
    422468 
    423469  SUBROUTINE xios(is_defined_axis_attr_hdl)  & 
    424     ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, long_name, mask  & 
    425     , n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     470    ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
     471    , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
     472     ) 
    426473 
    427474    IMPLICIT NONE 
     
    441488      LOGICAL, OPTIONAL, INTENT(OUT) :: index 
    442489      LOGICAL(KIND=C_BOOL) :: index_tmp 
     490      LOGICAL, OPTIONAL, INTENT(OUT) :: label 
     491      LOGICAL(KIND=C_BOOL) :: label_tmp 
    443492      LOGICAL, OPTIONAL, INTENT(OUT) :: long_name 
    444493      LOGICAL(KIND=C_BOOL) :: long_name_tmp 
     
    455504      LOGICAL, OPTIONAL, INTENT(OUT) :: positive 
    456505      LOGICAL(KIND=C_BOOL) :: positive_tmp 
     506      LOGICAL, OPTIONAL, INTENT(OUT) :: prec 
     507      LOGICAL(KIND=C_BOOL) :: prec_tmp 
    457508      LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name 
    458509      LOGICAL(KIND=C_BOOL) :: standard_name_tmp 
     
    463514 
    464515      CALL xios(is_defined_axis_attr_hdl_)  & 
    465       ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, long_name, mask  & 
    466       , n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     516      ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
     517      , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
     518       ) 
    467519 
    468520  END SUBROUTINE xios(is_defined_axis_attr_hdl) 
    469521 
    470522  SUBROUTINE xios(is_defined_axis_attr_hdl_)   & 
    471     ( axis_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, index_, long_name_  & 
    472     , mask_, n_, n_distributed_partition_, n_glo_, name_, positive_, standard_name_, unit_, value_  & 
    473     ) 
     523    ( axis_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, index_, label_, long_name_  & 
     524    , mask_, n_, n_distributed_partition_, n_glo_, name_, positive_, prec_, standard_name_, unit_  & 
     525    , value_ ) 
    474526 
    475527    IMPLICIT NONE 
     
    489541      LOGICAL, OPTIONAL, INTENT(OUT) :: index_ 
    490542      LOGICAL(KIND=C_BOOL) :: index__tmp 
     543      LOGICAL, OPTIONAL, INTENT(OUT) :: label_ 
     544      LOGICAL(KIND=C_BOOL) :: label__tmp 
    491545      LOGICAL, OPTIONAL, INTENT(OUT) :: long_name_ 
    492546      LOGICAL(KIND=C_BOOL) :: long_name__tmp 
     
    503557      LOGICAL, OPTIONAL, INTENT(OUT) :: positive_ 
    504558      LOGICAL(KIND=C_BOOL) :: positive__tmp 
     559      LOGICAL, OPTIONAL, INTENT(OUT) :: prec_ 
     560      LOGICAL(KIND=C_BOOL) :: prec__tmp 
    505561      LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name_ 
    506562      LOGICAL(KIND=C_BOOL) :: standard_name__tmp 
     
    552608      ENDIF 
    553609 
     610      IF (PRESENT(label_)) THEN 
     611        label__tmp = cxios_is_defined_axis_label & 
     612      (axis_hdl%daddr) 
     613        label_ = label__tmp 
     614      ENDIF 
     615 
    554616      IF (PRESENT(long_name_)) THEN 
    555617        long_name__tmp = cxios_is_defined_axis_long_name & 
     
    594656      ENDIF 
    595657 
     658      IF (PRESENT(prec_)) THEN 
     659        prec__tmp = cxios_is_defined_axis_prec & 
     660      (axis_hdl%daddr) 
     661        prec_ = prec__tmp 
     662      ENDIF 
     663 
    596664      IF (PRESENT(standard_name_)) THEN 
    597665        standard_name__tmp = cxios_is_defined_axis_standard_name & 
  • XIOS/trunk/src/interface/fortran_attr/iaxisgroup_attr.F90

    r966 r1052  
    1212 
    1313  SUBROUTINE xios(set_axisgroup_attr)  & 
    14     ( axisgroup_id, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, long_name  & 
    15     , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     14    ( axisgroup_id, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, label  & 
     15    , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     16    , value ) 
    1617 
    1718    IMPLICIT NONE 
     
    2627      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 
    2728      INTEGER  , OPTIONAL, INTENT(IN) :: index(:) 
     29      CHARACTER(len=*) , OPTIONAL, INTENT(IN) :: label(:) 
    2830      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name 
    2931      LOGICAL  , OPTIONAL, INTENT(IN) :: mask(:) 
     
    3436      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name 
    3537      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: positive 
     38      INTEGER  , OPTIONAL, INTENT(IN) :: prec 
    3639      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name 
    3740      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: unit 
     
    4144      (axisgroup_id,axisgroup_hdl) 
    4245      CALL xios(set_axisgroup_attr_hdl_)   & 
    43       ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, long_name  & 
    44       , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     46      ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, label  & 
     47      , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     48      , value ) 
    4549 
    4650  END SUBROUTINE xios(set_axisgroup_attr) 
    4751 
    4852  SUBROUTINE xios(set_axisgroup_attr_hdl)  & 
    49     ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, long_name  & 
    50     , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     53    ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, label  & 
     54    , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     55    , value ) 
    5156 
    5257    IMPLICIT NONE 
     
    6065      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 
    6166      INTEGER  , OPTIONAL, INTENT(IN) :: index(:) 
     67      CHARACTER(len=*) , OPTIONAL, INTENT(IN) :: label(:) 
    6268      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name 
    6369      LOGICAL  , OPTIONAL, INTENT(IN) :: mask(:) 
     
    6874      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name 
    6975      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: positive 
     76      INTEGER  , OPTIONAL, INTENT(IN) :: prec 
    7077      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name 
    7178      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: unit 
     
    7380 
    7481      CALL xios(set_axisgroup_attr_hdl_)  & 
    75       ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, long_name  & 
    76       , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     82      ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, label  & 
     83      , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     84      , value ) 
    7785 
    7886  END SUBROUTINE xios(set_axisgroup_attr_hdl) 
     
    8088  SUBROUTINE xios(set_axisgroup_attr_hdl_)   & 
    8189    ( axisgroup_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, group_ref_, index_  & 
    82     , long_name_, mask_, n_, n_distributed_partition_, n_glo_, name_, positive_, standard_name_  & 
     90    , label_, long_name_, mask_, n_, n_distributed_partition_, n_glo_, name_, positive_, prec_, standard_name_  & 
    8391    , unit_, value_ ) 
    8492 
     
    93101      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref_ 
    94102      INTEGER  , OPTIONAL, INTENT(IN) :: index_(:) 
     103      CHARACTER(len=*) , OPTIONAL, INTENT(IN) :: label_(:) 
    95104      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name_ 
    96105      LOGICAL  , OPTIONAL, INTENT(IN) :: mask_(:) 
     
    101110      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_ 
    102111      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: positive_ 
     112      INTEGER  , OPTIONAL, INTENT(IN) :: prec_ 
    103113      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name_ 
    104114      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: unit_ 
     
    143153        CALL cxios_set_axisgroup_index & 
    144154      (axisgroup_hdl%daddr, index_, SHAPE(index_)) 
     155      ENDIF 
     156 
     157      IF (PRESENT(label_)) THEN 
     158        CALL cxios_set_axisgroup_label & 
     159      (axisgroup_hdl%daddr, label_, LEN(label_), LEN_TRIM(label_), SHAPE(label_)) 
    145160      ENDIF 
    146161 
     
    182197      ENDIF 
    183198 
     199      IF (PRESENT(prec_)) THEN 
     200        CALL cxios_set_axisgroup_prec & 
     201      (axisgroup_hdl%daddr, prec_) 
     202      ENDIF 
     203 
    184204      IF (PRESENT(standard_name_)) THEN 
    185205        CALL cxios_set_axisgroup_standard_name & 
     
    200220 
    201221  SUBROUTINE xios(get_axisgroup_attr)  & 
    202     ( axisgroup_id, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, long_name  & 
    203     , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     222    ( axisgroup_id, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, label  & 
     223    , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     224    , value ) 
    204225 
    205226    IMPLICIT NONE 
     
    214235      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 
    215236      INTEGER  , OPTIONAL, INTENT(OUT) :: index(:) 
     237      CHARACTER(len=*) , OPTIONAL, INTENT(OUT) :: label(:) 
    216238      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name 
    217239      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask(:) 
     
    222244      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name 
    223245      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: positive 
     246      INTEGER  , OPTIONAL, INTENT(OUT) :: prec 
    224247      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name 
    225248      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: unit 
     
    229252      (axisgroup_id,axisgroup_hdl) 
    230253      CALL xios(get_axisgroup_attr_hdl_)   & 
    231       ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, long_name  & 
    232       , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     254      ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, label  & 
     255      , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     256      , value ) 
    233257 
    234258  END SUBROUTINE xios(get_axisgroup_attr) 
    235259 
    236260  SUBROUTINE xios(get_axisgroup_attr_hdl)  & 
    237     ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, long_name  & 
    238     , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     261    ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, label  & 
     262    , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     263    , value ) 
    239264 
    240265    IMPLICIT NONE 
     
    248273      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 
    249274      INTEGER  , OPTIONAL, INTENT(OUT) :: index(:) 
     275      CHARACTER(len=*) , OPTIONAL, INTENT(OUT) :: label(:) 
    250276      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name 
    251277      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask(:) 
     
    256282      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name 
    257283      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: positive 
     284      INTEGER  , OPTIONAL, INTENT(OUT) :: prec 
    258285      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name 
    259286      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: unit 
     
    261288 
    262289      CALL xios(get_axisgroup_attr_hdl_)  & 
    263       ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, long_name  & 
    264       , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     290      ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, label  & 
     291      , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     292      , value ) 
    265293 
    266294  END SUBROUTINE xios(get_axisgroup_attr_hdl) 
     
    268296  SUBROUTINE xios(get_axisgroup_attr_hdl_)   & 
    269297    ( axisgroup_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, group_ref_, index_  & 
    270     , long_name_, mask_, n_, n_distributed_partition_, n_glo_, name_, positive_, standard_name_  & 
     298    , label_, long_name_, mask_, n_, n_distributed_partition_, n_glo_, name_, positive_, prec_, standard_name_  & 
    271299    , unit_, value_ ) 
    272300 
     
    281309      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref_ 
    282310      INTEGER  , OPTIONAL, INTENT(OUT) :: index_(:) 
     311      CHARACTER(len=*) , OPTIONAL, INTENT(OUT) :: label_(:) 
    283312      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name_ 
    284313      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask_(:) 
     
    289318      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_ 
    290319      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: positive_ 
     320      INTEGER  , OPTIONAL, INTENT(OUT) :: prec_ 
    291321      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name_ 
    292322      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: unit_ 
     
    331361        CALL cxios_get_axisgroup_index & 
    332362      (axisgroup_hdl%daddr, index_, SHAPE(index_)) 
     363      ENDIF 
     364 
     365      IF (PRESENT(label_)) THEN 
     366        CALL cxios_get_axisgroup_label & 
     367      (axisgroup_hdl%daddr, label_, LEN(label_), SHAPE(label_)) 
    333368      ENDIF 
    334369 
     
    370405      ENDIF 
    371406 
     407      IF (PRESENT(prec_)) THEN 
     408        CALL cxios_get_axisgroup_prec & 
     409      (axisgroup_hdl%daddr, prec_) 
     410      ENDIF 
     411 
    372412      IF (PRESENT(standard_name_)) THEN 
    373413        CALL cxios_get_axisgroup_standard_name & 
     
    388428 
    389429  SUBROUTINE xios(is_defined_axisgroup_attr)  & 
    390     ( axisgroup_id, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, long_name  & 
    391     , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     430    ( axisgroup_id, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, label  & 
     431    , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     432    , value ) 
    392433 
    393434    IMPLICIT NONE 
     
    410451      LOGICAL, OPTIONAL, INTENT(OUT) :: index 
    411452      LOGICAL(KIND=C_BOOL) :: index_tmp 
     453      LOGICAL, OPTIONAL, INTENT(OUT) :: label 
     454      LOGICAL(KIND=C_BOOL) :: label_tmp 
    412455      LOGICAL, OPTIONAL, INTENT(OUT) :: long_name 
    413456      LOGICAL(KIND=C_BOOL) :: long_name_tmp 
     
    424467      LOGICAL, OPTIONAL, INTENT(OUT) :: positive 
    425468      LOGICAL(KIND=C_BOOL) :: positive_tmp 
     469      LOGICAL, OPTIONAL, INTENT(OUT) :: prec 
     470      LOGICAL(KIND=C_BOOL) :: prec_tmp 
    426471      LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name 
    427472      LOGICAL(KIND=C_BOOL) :: standard_name_tmp 
     
    434479      (axisgroup_id,axisgroup_hdl) 
    435480      CALL xios(is_defined_axisgroup_attr_hdl_)   & 
    436       ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, long_name  & 
    437       , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     481      ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, label  & 
     482      , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     483      , value ) 
    438484 
    439485  END SUBROUTINE xios(is_defined_axisgroup_attr) 
    440486 
    441487  SUBROUTINE xios(is_defined_axisgroup_attr_hdl)  & 
    442     ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, long_name  & 
    443     , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     488    ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, label  & 
     489    , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     490    , value ) 
    444491 
    445492    IMPLICIT NONE 
     
    461508      LOGICAL, OPTIONAL, INTENT(OUT) :: index 
    462509      LOGICAL(KIND=C_BOOL) :: index_tmp 
     510      LOGICAL, OPTIONAL, INTENT(OUT) :: label 
     511      LOGICAL(KIND=C_BOOL) :: label_tmp 
    463512      LOGICAL, OPTIONAL, INTENT(OUT) :: long_name 
    464513      LOGICAL(KIND=C_BOOL) :: long_name_tmp 
     
    475524      LOGICAL, OPTIONAL, INTENT(OUT) :: positive 
    476525      LOGICAL(KIND=C_BOOL) :: positive_tmp 
     526      LOGICAL, OPTIONAL, INTENT(OUT) :: prec 
     527      LOGICAL(KIND=C_BOOL) :: prec_tmp 
    477528      LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name 
    478529      LOGICAL(KIND=C_BOOL) :: standard_name_tmp 
     
    483534 
    484535      CALL xios(is_defined_axisgroup_attr_hdl_)  & 
    485       ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, long_name  & 
    486       , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
     536      ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, index, label  & 
     537      , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     538      , value ) 
    487539 
    488540  END SUBROUTINE xios(is_defined_axisgroup_attr_hdl) 
     
    490542  SUBROUTINE xios(is_defined_axisgroup_attr_hdl_)   & 
    491543    ( axisgroup_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, group_ref_, index_  & 
    492     , long_name_, mask_, n_, n_distributed_partition_, n_glo_, name_, positive_, standard_name_  & 
     544    , label_, long_name_, mask_, n_, n_distributed_partition_, n_glo_, name_, positive_, prec_, standard_name_  & 
    493545    , unit_, value_ ) 
    494546 
     
    511563      LOGICAL, OPTIONAL, INTENT(OUT) :: index_ 
    512564      LOGICAL(KIND=C_BOOL) :: index__tmp 
     565      LOGICAL, OPTIONAL, INTENT(OUT) :: label_ 
     566      LOGICAL(KIND=C_BOOL) :: label__tmp 
    513567      LOGICAL, OPTIONAL, INTENT(OUT) :: long_name_ 
    514568      LOGICAL(KIND=C_BOOL) :: long_name__tmp 
     
    525579      LOGICAL, OPTIONAL, INTENT(OUT) :: positive_ 
    526580      LOGICAL(KIND=C_BOOL) :: positive__tmp 
     581      LOGICAL, OPTIONAL, INTENT(OUT) :: prec_ 
     582      LOGICAL(KIND=C_BOOL) :: prec__tmp 
    527583      LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name_ 
    528584      LOGICAL(KIND=C_BOOL) :: standard_name__tmp 
     
    580636      ENDIF 
    581637 
     638      IF (PRESENT(label_)) THEN 
     639        label__tmp = cxios_is_defined_axisgroup_label & 
     640      (axisgroup_hdl%daddr) 
     641        label_ = label__tmp 
     642      ENDIF 
     643 
    582644      IF (PRESENT(long_name_)) THEN 
    583645        long_name__tmp = cxios_is_defined_axisgroup_long_name & 
     
    622684      ENDIF 
    623685 
     686      IF (PRESENT(prec_)) THEN 
     687        prec__tmp = cxios_is_defined_axisgroup_prec & 
     688      (axisgroup_hdl%daddr) 
     689        prec_ = prec__tmp 
     690      ENDIF 
     691 
    624692      IF (PRESENT(standard_name_)) THEN 
    625693        standard_name__tmp = cxios_is_defined_axisgroup_standard_name & 
  • XIOS/trunk/src/interface/fortran_attr/idomain_attr.F90

    r966 r1052  
    1515    , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
    1616    , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
    17     , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     17    , ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    1818 
    1919    IMPLICIT NONE 
     
    5252      INTEGER  , OPTIONAL, INTENT(IN) :: nj_glo 
    5353      INTEGER  , OPTIONAL, INTENT(IN) :: nvertex 
     54      INTEGER  , OPTIONAL, INTENT(IN) :: prec 
    5455      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name 
    5556      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type 
     
    6162      , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
    6263      , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
    63       , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     64      , ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    6465 
    6566  END SUBROUTINE xios(set_domain_attr) 
     
    6970    , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
    7071    , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
    71     , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     72    , ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    7273 
    7374    IMPLICIT NONE 
     
    105106      INTEGER  , OPTIONAL, INTENT(IN) :: nj_glo 
    106107      INTEGER  , OPTIONAL, INTENT(IN) :: nvertex 
     108      INTEGER  , OPTIONAL, INTENT(IN) :: prec 
    107109      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name 
    108110      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type 
     
    112114      , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
    113115      , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
    114       , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     116      , ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    115117 
    116118  END SUBROUTINE xios(set_domain_attr_hdl) 
     
    120122    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_ref_  & 
    121123    , i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_, long_name_, lonvalue_1d_  & 
    122     , lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, standard_name_  & 
     124    , lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, prec_, standard_name_  & 
    123125    , type_ ) 
    124126 
     
    157159      INTEGER  , OPTIONAL, INTENT(IN) :: nj_glo_ 
    158160      INTEGER  , OPTIONAL, INTENT(IN) :: nvertex_ 
     161      INTEGER  , OPTIONAL, INTENT(IN) :: prec_ 
    159162      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name_ 
    160163      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type_ 
     
    314317      ENDIF 
    315318 
     319      IF (PRESENT(prec_)) THEN 
     320        CALL cxios_set_domain_prec & 
     321      (domain_hdl%daddr, prec_) 
     322      ENDIF 
     323 
    316324      IF (PRESENT(standard_name_)) THEN 
    317325        CALL cxios_set_domain_standard_name & 
     
    330338    , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
    331339    , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
    332     , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     340    , ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    333341 
    334342    IMPLICIT NONE 
     
    367375      INTEGER  , OPTIONAL, INTENT(OUT) :: nj_glo 
    368376      INTEGER  , OPTIONAL, INTENT(OUT) :: nvertex 
     377      INTEGER  , OPTIONAL, INTENT(OUT) :: prec 
    369378      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name 
    370379      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type 
     
    376385      , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
    377386      , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
    378       , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     387      , ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    379388 
    380389  END SUBROUTINE xios(get_domain_attr) 
     
    384393    , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
    385394    , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
    386     , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     395    , ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    387396 
    388397    IMPLICIT NONE 
     
    420429      INTEGER  , OPTIONAL, INTENT(OUT) :: nj_glo 
    421430      INTEGER  , OPTIONAL, INTENT(OUT) :: nvertex 
     431      INTEGER  , OPTIONAL, INTENT(OUT) :: prec 
    422432      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name 
    423433      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type 
     
    427437      , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
    428438      , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
    429       , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     439      , ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    430440 
    431441  END SUBROUTINE xios(get_domain_attr_hdl) 
     
    435445    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_ref_  & 
    436446    , i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_, long_name_, lonvalue_1d_  & 
    437     , lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, standard_name_  & 
     447    , lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, prec_, standard_name_  & 
    438448    , type_ ) 
    439449 
     
    472482      INTEGER  , OPTIONAL, INTENT(OUT) :: nj_glo_ 
    473483      INTEGER  , OPTIONAL, INTENT(OUT) :: nvertex_ 
     484      INTEGER  , OPTIONAL, INTENT(OUT) :: prec_ 
    474485      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name_ 
    475486      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type_ 
     
    629640      ENDIF 
    630641 
     642      IF (PRESENT(prec_)) THEN 
     643        CALL cxios_get_domain_prec & 
     644      (domain_hdl%daddr, prec_) 
     645      ENDIF 
     646 
    631647      IF (PRESENT(standard_name_)) THEN 
    632648        CALL cxios_get_domain_standard_name & 
     
    645661    , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
    646662    , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
    647     , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     663    , ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    648664 
    649665    IMPLICIT NONE 
     
    710726      LOGICAL, OPTIONAL, INTENT(OUT) :: nvertex 
    711727      LOGICAL(KIND=C_BOOL) :: nvertex_tmp 
     728      LOGICAL, OPTIONAL, INTENT(OUT) :: prec 
     729      LOGICAL(KIND=C_BOOL) :: prec_tmp 
    712730      LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name 
    713731      LOGICAL(KIND=C_BOOL) :: standard_name_tmp 
     
    721739      , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
    722740      , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
    723       , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     741      , ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    724742 
    725743  END SUBROUTINE xios(is_defined_domain_attr) 
     
    729747    , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
    730748    , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
    731     , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     749    , ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    732750 
    733751    IMPLICIT NONE 
     
    793811      LOGICAL, OPTIONAL, INTENT(OUT) :: nvertex 
    794812      LOGICAL(KIND=C_BOOL) :: nvertex_tmp 
     813      LOGICAL, OPTIONAL, INTENT(OUT) :: prec 
     814      LOGICAL(KIND=C_BOOL) :: prec_tmp 
    795815      LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name 
    796816      LOGICAL(KIND=C_BOOL) :: standard_name_tmp 
     
    802822      , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
    803823      , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
    804       , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     824      , ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    805825 
    806826  END SUBROUTINE xios(is_defined_domain_attr_hdl) 
     
    810830    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_ref_  & 
    811831    , i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_, long_name_, lonvalue_1d_  & 
    812     , lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, standard_name_  & 
     832    , lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, prec_, standard_name_  & 
    813833    , type_ ) 
    814834 
     
    875895      LOGICAL, OPTIONAL, INTENT(OUT) :: nvertex_ 
    876896      LOGICAL(KIND=C_BOOL) :: nvertex__tmp 
     897      LOGICAL, OPTIONAL, INTENT(OUT) :: prec_ 
     898      LOGICAL(KIND=C_BOOL) :: prec__tmp 
    877899      LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name_ 
    878900      LOGICAL(KIND=C_BOOL) :: standard_name__tmp 
     
    10601082      ENDIF 
    10611083 
     1084      IF (PRESENT(prec_)) THEN 
     1085        prec__tmp = cxios_is_defined_domain_prec & 
     1086      (domain_hdl%daddr) 
     1087        prec_ = prec__tmp 
     1088      ENDIF 
     1089 
    10621090      IF (PRESENT(standard_name_)) THEN 
    10631091        standard_name__tmp = cxios_is_defined_domain_standard_name & 
  • XIOS/trunk/src/interface/fortran_attr/idomaingroup_attr.F90

    r966 r1052  
    1515    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
    1616    , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
    17     , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     17    , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    1818 
    1919    IMPLICIT NONE 
     
    5353      INTEGER  , OPTIONAL, INTENT(IN) :: nj_glo 
    5454      INTEGER  , OPTIONAL, INTENT(IN) :: nvertex 
     55      INTEGER  , OPTIONAL, INTENT(IN) :: prec 
    5556      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name 
    5657      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type 
     
    6263      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
    6364      , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
    64       , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     65      , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    6566 
    6667  END SUBROUTINE xios(set_domaingroup_attr) 
     
    7071    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
    7172    , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
    72     , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     73    , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    7374 
    7475    IMPLICIT NONE 
     
    107108      INTEGER  , OPTIONAL, INTENT(IN) :: nj_glo 
    108109      INTEGER  , OPTIONAL, INTENT(IN) :: nvertex 
     110      INTEGER  , OPTIONAL, INTENT(IN) :: prec 
    109111      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name 
    110112      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type 
     
    114116      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
    115117      , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
    116       , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     118      , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    117119 
    118120  END SUBROUTINE xios(set_domaingroup_attr_hdl) 
     
    122124    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_ref_  & 
    123125    , group_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_, long_name_, lonvalue_1d_  & 
    124     , lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, standard_name_  & 
     126    , lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, prec_, standard_name_  & 
    125127    , type_ ) 
    126128 
     
    160162      INTEGER  , OPTIONAL, INTENT(IN) :: nj_glo_ 
    161163      INTEGER  , OPTIONAL, INTENT(IN) :: nvertex_ 
     164      INTEGER  , OPTIONAL, INTENT(IN) :: prec_ 
    162165      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name_ 
    163166      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type_ 
     
    322325      ENDIF 
    323326 
     327      IF (PRESENT(prec_)) THEN 
     328        CALL cxios_set_domaingroup_prec & 
     329      (domaingroup_hdl%daddr, prec_) 
     330      ENDIF 
     331 
    324332      IF (PRESENT(standard_name_)) THEN 
    325333        CALL cxios_set_domaingroup_standard_name & 
     
    338346    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
    339347    , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
    340     , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     348    , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    341349 
    342350    IMPLICIT NONE 
     
    376384      INTEGER  , OPTIONAL, INTENT(OUT) :: nj_glo 
    377385      INTEGER  , OPTIONAL, INTENT(OUT) :: nvertex 
     386      INTEGER  , OPTIONAL, INTENT(OUT) :: prec 
    378387      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name 
    379388      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type 
     
    385394      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
    386395      , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
    387       , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     396      , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    388397 
    389398  END SUBROUTINE xios(get_domaingroup_attr) 
     
    393402    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
    394403    , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
    395     , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     404    , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    396405 
    397406    IMPLICIT NONE 
     
    430439      INTEGER  , OPTIONAL, INTENT(OUT) :: nj_glo 
    431440      INTEGER  , OPTIONAL, INTENT(OUT) :: nvertex 
     441      INTEGER  , OPTIONAL, INTENT(OUT) :: prec 
    432442      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name 
    433443      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type 
     
    437447      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
    438448      , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
    439       , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     449      , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    440450 
    441451  END SUBROUTINE xios(get_domaingroup_attr_hdl) 
     
    445455    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_ref_  & 
    446456    , group_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_, long_name_, lonvalue_1d_  & 
    447     , lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, standard_name_  & 
     457    , lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, prec_, standard_name_  & 
    448458    , type_ ) 
    449459 
     
    483493      INTEGER  , OPTIONAL, INTENT(OUT) :: nj_glo_ 
    484494      INTEGER  , OPTIONAL, INTENT(OUT) :: nvertex_ 
     495      INTEGER  , OPTIONAL, INTENT(OUT) :: prec_ 
    485496      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name_ 
    486497      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type_ 
     
    645656      ENDIF 
    646657 
     658      IF (PRESENT(prec_)) THEN 
     659        CALL cxios_get_domaingroup_prec & 
     660      (domaingroup_hdl%daddr, prec_) 
     661      ENDIF 
     662 
    647663      IF (PRESENT(standard_name_)) THEN 
    648664        CALL cxios_get_domaingroup_standard_name & 
     
    661677    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
    662678    , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
    663     , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     679    , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    664680 
    665681    IMPLICIT NONE 
     
    728744      LOGICAL, OPTIONAL, INTENT(OUT) :: nvertex 
    729745      LOGICAL(KIND=C_BOOL) :: nvertex_tmp 
     746      LOGICAL, OPTIONAL, INTENT(OUT) :: prec 
     747      LOGICAL(KIND=C_BOOL) :: prec_tmp 
    730748      LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name 
    731749      LOGICAL(KIND=C_BOOL) :: standard_name_tmp 
     
    739757      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
    740758      , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
    741       , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     759      , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    742760 
    743761  END SUBROUTINE xios(is_defined_domaingroup_attr) 
     
    747765    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
    748766    , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
    749     , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     767    , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    750768 
    751769    IMPLICIT NONE 
     
    813831      LOGICAL, OPTIONAL, INTENT(OUT) :: nvertex 
    814832      LOGICAL(KIND=C_BOOL) :: nvertex_tmp 
     833      LOGICAL, OPTIONAL, INTENT(OUT) :: prec 
     834      LOGICAL(KIND=C_BOOL) :: prec_tmp 
    815835      LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name 
    816836      LOGICAL(KIND=C_BOOL) :: standard_name_tmp 
     
    822842      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
    823843      , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
    824       , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     844      , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type ) 
    825845 
    826846  END SUBROUTINE xios(is_defined_domaingroup_attr_hdl) 
     
    830850    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_ref_  & 
    831851    , group_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_, long_name_, lonvalue_1d_  & 
    832     , lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, standard_name_  & 
     852    , lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, prec_, standard_name_  & 
    833853    , type_ ) 
    834854 
     
    897917      LOGICAL, OPTIONAL, INTENT(OUT) :: nvertex_ 
    898918      LOGICAL(KIND=C_BOOL) :: nvertex__tmp 
     919      LOGICAL, OPTIONAL, INTENT(OUT) :: prec_ 
     920      LOGICAL(KIND=C_BOOL) :: prec__tmp 
    899921      LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name_ 
    900922      LOGICAL(KIND=C_BOOL) :: standard_name__tmp 
     
    10881110      ENDIF 
    10891111 
     1112      IF (PRESENT(prec_)) THEN 
     1113        prec__tmp = cxios_is_defined_domaingroup_prec & 
     1114      (domaingroup_hdl%daddr) 
     1115        prec_ = prec__tmp 
     1116      ENDIF 
     1117 
    10901118      IF (PRESENT(standard_name_)) THEN 
    10911119        standard_name__tmp = cxios_is_defined_domaingroup_standard_name & 
  • XIOS/trunk/src/interface/fortran_attr/ifile_attr.F90

    r966 r1052  
    1414    ( file_id, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    1515    , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    16     , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
    17     ) 
     16    , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
     17    , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    1818 
    1919    IMPLICIT NONE 
     
    4343      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter 
    4444      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter_name 
     45      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_stamp_format 
     46      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_stamp_name 
     47      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_units 
    4548      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: timeseries 
    4649      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: ts_prefix 
    4750      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type 
     51      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: uuid_format 
     52      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: uuid_name 
    4853 
    4954      CALL xios(get_file_handle) & 
     
    5257      ( file_hdl, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    5358      , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    54       , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
    55       ) 
     59      , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
     60      , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    5661 
    5762  END SUBROUTINE xios(set_file_attr) 
     
    6065    ( file_hdl, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    6166    , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    62     , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
    63     ) 
     67    , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
     68    , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    6469 
    6570    IMPLICIT NONE 
     
    8893      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter 
    8994      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter_name 
     95      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_stamp_format 
     96      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_stamp_name 
     97      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_units 
    9098      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: timeseries 
    9199      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: ts_prefix 
    92100      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type 
     101      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: uuid_format 
     102      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: uuid_name 
    93103 
    94104      CALL xios(set_file_attr_hdl_)  & 
    95105      ( file_hdl, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    96106      , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    97       , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
    98       ) 
     107      , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
     108      , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    99109 
    100110  END SUBROUTINE xios(set_file_attr_hdl) 
     
    103113    ( file_hdl, append_, compression_level_, convention_, cyclic_, description_, enabled_, format_  & 
    104114    , min_digits_, mode_, name_, name_suffix_, output_freq_, output_level_, par_access_, record_offset_  & 
    105     , split_freq_, split_freq_format_, sync_freq_, time_counter_, time_counter_name_, timeseries_  & 
    106     , ts_prefix_, type_ ) 
     115    , split_freq_, split_freq_format_, sync_freq_, time_counter_, time_counter_name_, time_stamp_format_  & 
     116    , time_stamp_name_, time_units_, timeseries_, ts_prefix_, type_, uuid_format_, uuid_name_ ) 
    107117 
    108118    IMPLICIT NONE 
     
    131141      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter_ 
    132142      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter_name_ 
     143      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_stamp_format_ 
     144      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_stamp_name_ 
     145      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_units_ 
    133146      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: timeseries_ 
    134147      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: ts_prefix_ 
    135148      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type_ 
     149      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: uuid_format_ 
     150      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: uuid_name_ 
    136151 
    137152      IF (PRESENT(append_)) THEN 
     
    238253      ENDIF 
    239254 
     255      IF (PRESENT(time_stamp_format_)) THEN 
     256        CALL cxios_set_file_time_stamp_format & 
     257      (file_hdl%daddr, time_stamp_format_, len(time_stamp_format_)) 
     258      ENDIF 
     259 
     260      IF (PRESENT(time_stamp_name_)) THEN 
     261        CALL cxios_set_file_time_stamp_name & 
     262      (file_hdl%daddr, time_stamp_name_, len(time_stamp_name_)) 
     263      ENDIF 
     264 
     265      IF (PRESENT(time_units_)) THEN 
     266        CALL cxios_set_file_time_units & 
     267      (file_hdl%daddr, time_units_, len(time_units_)) 
     268      ENDIF 
     269 
    240270      IF (PRESENT(timeseries_)) THEN 
    241271        CALL cxios_set_file_timeseries & 
     
    253283      ENDIF 
    254284 
     285      IF (PRESENT(uuid_format_)) THEN 
     286        CALL cxios_set_file_uuid_format & 
     287      (file_hdl%daddr, uuid_format_, len(uuid_format_)) 
     288      ENDIF 
     289 
     290      IF (PRESENT(uuid_name_)) THEN 
     291        CALL cxios_set_file_uuid_name & 
     292      (file_hdl%daddr, uuid_name_, len(uuid_name_)) 
     293      ENDIF 
     294 
    255295  END SUBROUTINE xios(set_file_attr_hdl_) 
    256296 
     
    258298    ( file_id, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    259299    , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    260     , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
    261     ) 
     300    , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
     301    , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    262302 
    263303    IMPLICIT NONE 
     
    287327      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter 
    288328      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter_name 
     329      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_stamp_format 
     330      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_stamp_name 
     331      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_units 
    289332      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: timeseries 
    290333      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: ts_prefix 
    291334      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type 
     335      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: uuid_format 
     336      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: uuid_name 
    292337 
    293338      CALL xios(get_file_handle) & 
     
    296341      ( file_hdl, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    297342      , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    298       , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
    299       ) 
     343      , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
     344      , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    300345 
    301346  END SUBROUTINE xios(get_file_attr) 
     
    304349    ( file_hdl, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    305350    , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    306     , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
    307     ) 
     351    , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
     352    , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    308353 
    309354    IMPLICIT NONE 
     
    332377      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter 
    333378      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter_name 
     379      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_stamp_format 
     380      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_stamp_name 
     381      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_units 
    334382      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: timeseries 
    335383      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: ts_prefix 
    336384      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type 
     385      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: uuid_format 
     386      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: uuid_name 
    337387 
    338388      CALL xios(get_file_attr_hdl_)  & 
    339389      ( file_hdl, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    340390      , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    341       , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
    342       ) 
     391      , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
     392      , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    343393 
    344394  END SUBROUTINE xios(get_file_attr_hdl) 
     
    347397    ( file_hdl, append_, compression_level_, convention_, cyclic_, description_, enabled_, format_  & 
    348398    , min_digits_, mode_, name_, name_suffix_, output_freq_, output_level_, par_access_, record_offset_  & 
    349     , split_freq_, split_freq_format_, sync_freq_, time_counter_, time_counter_name_, timeseries_  & 
    350     , ts_prefix_, type_ ) 
     399    , split_freq_, split_freq_format_, sync_freq_, time_counter_, time_counter_name_, time_stamp_format_  & 
     400    , time_stamp_name_, time_units_, timeseries_, ts_prefix_, type_, uuid_format_, uuid_name_ ) 
    351401 
    352402    IMPLICIT NONE 
     
    375425      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter_ 
    376426      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter_name_ 
     427      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_stamp_format_ 
     428      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_stamp_name_ 
     429      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_units_ 
    377430      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: timeseries_ 
    378431      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: ts_prefix_ 
    379432      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type_ 
     433      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: uuid_format_ 
     434      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: uuid_name_ 
    380435 
    381436      IF (PRESENT(append_)) THEN 
     
    482537      ENDIF 
    483538 
     539      IF (PRESENT(time_stamp_format_)) THEN 
     540        CALL cxios_get_file_time_stamp_format & 
     541      (file_hdl%daddr, time_stamp_format_, len(time_stamp_format_)) 
     542      ENDIF 
     543 
     544      IF (PRESENT(time_stamp_name_)) THEN 
     545        CALL cxios_get_file_time_stamp_name & 
     546      (file_hdl%daddr, time_stamp_name_, len(time_stamp_name_)) 
     547      ENDIF 
     548 
     549      IF (PRESENT(time_units_)) THEN 
     550        CALL cxios_get_file_time_units & 
     551      (file_hdl%daddr, time_units_, len(time_units_)) 
     552      ENDIF 
     553 
    484554      IF (PRESENT(timeseries_)) THEN 
    485555        CALL cxios_get_file_timeseries & 
     
    497567      ENDIF 
    498568 
     569      IF (PRESENT(uuid_format_)) THEN 
     570        CALL cxios_get_file_uuid_format & 
     571      (file_hdl%daddr, uuid_format_, len(uuid_format_)) 
     572      ENDIF 
     573 
     574      IF (PRESENT(uuid_name_)) THEN 
     575        CALL cxios_get_file_uuid_name & 
     576      (file_hdl%daddr, uuid_name_, len(uuid_name_)) 
     577      ENDIF 
     578 
    499579  END SUBROUTINE xios(get_file_attr_hdl_) 
    500580 
     
    502582    ( file_id, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    503583    , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    504     , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
    505     ) 
     584    , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
     585    , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    506586 
    507587    IMPLICIT NONE 
     
    548628      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter_name 
    549629      LOGICAL(KIND=C_BOOL) :: time_counter_name_tmp 
     630      LOGICAL, OPTIONAL, INTENT(OUT) :: time_stamp_format 
     631      LOGICAL(KIND=C_BOOL) :: time_stamp_format_tmp 
     632      LOGICAL, OPTIONAL, INTENT(OUT) :: time_stamp_name 
     633      LOGICAL(KIND=C_BOOL) :: time_stamp_name_tmp 
     634      LOGICAL, OPTIONAL, INTENT(OUT) :: time_units 
     635      LOGICAL(KIND=C_BOOL) :: time_units_tmp 
    550636      LOGICAL, OPTIONAL, INTENT(OUT) :: timeseries 
    551637      LOGICAL(KIND=C_BOOL) :: timeseries_tmp 
     
    554640      LOGICAL, OPTIONAL, INTENT(OUT) :: type 
    555641      LOGICAL(KIND=C_BOOL) :: type_tmp 
     642      LOGICAL, OPTIONAL, INTENT(OUT) :: uuid_format 
     643      LOGICAL(KIND=C_BOOL) :: uuid_format_tmp 
     644      LOGICAL, OPTIONAL, INTENT(OUT) :: uuid_name 
     645      LOGICAL(KIND=C_BOOL) :: uuid_name_tmp 
    556646 
    557647      CALL xios(get_file_handle) & 
     
    560650      ( file_hdl, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    561651      , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    562       , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
    563       ) 
     652      , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
     653      , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    564654 
    565655  END SUBROUTINE xios(is_defined_file_attr) 
     
    568658    ( file_hdl, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    569659    , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    570     , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
    571     ) 
     660    , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
     661    , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    572662 
    573663    IMPLICIT NONE 
     
    613703      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter_name 
    614704      LOGICAL(KIND=C_BOOL) :: time_counter_name_tmp 
     705      LOGICAL, OPTIONAL, INTENT(OUT) :: time_stamp_format 
     706      LOGICAL(KIND=C_BOOL) :: time_stamp_format_tmp 
     707      LOGICAL, OPTIONAL, INTENT(OUT) :: time_stamp_name 
     708      LOGICAL(KIND=C_BOOL) :: time_stamp_name_tmp 
     709      LOGICAL, OPTIONAL, INTENT(OUT) :: time_units 
     710      LOGICAL(KIND=C_BOOL) :: time_units_tmp 
    615711      LOGICAL, OPTIONAL, INTENT(OUT) :: timeseries 
    616712      LOGICAL(KIND=C_BOOL) :: timeseries_tmp 
     
    619715      LOGICAL, OPTIONAL, INTENT(OUT) :: type 
    620716      LOGICAL(KIND=C_BOOL) :: type_tmp 
     717      LOGICAL, OPTIONAL, INTENT(OUT) :: uuid_format 
     718      LOGICAL(KIND=C_BOOL) :: uuid_format_tmp 
     719      LOGICAL, OPTIONAL, INTENT(OUT) :: uuid_name 
     720      LOGICAL(KIND=C_BOOL) :: uuid_name_tmp 
    621721 
    622722      CALL xios(is_defined_file_attr_hdl_)  & 
    623723      ( file_hdl, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    624724      , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    625       , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
    626       ) 
     725      , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
     726      , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    627727 
    628728  END SUBROUTINE xios(is_defined_file_attr_hdl) 
     
    631731    ( file_hdl, append_, compression_level_, convention_, cyclic_, description_, enabled_, format_  & 
    632732    , min_digits_, mode_, name_, name_suffix_, output_freq_, output_level_, par_access_, record_offset_  & 
    633     , split_freq_, split_freq_format_, sync_freq_, time_counter_, time_counter_name_, timeseries_  & 
    634     , ts_prefix_, type_ ) 
     733    , split_freq_, split_freq_format_, sync_freq_, time_counter_, time_counter_name_, time_stamp_format_  & 
     734    , time_stamp_name_, time_units_, timeseries_, ts_prefix_, type_, uuid_format_, uuid_name_ ) 
    635735 
    636736    IMPLICIT NONE 
     
    676776      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter_name_ 
    677777      LOGICAL(KIND=C_BOOL) :: time_counter_name__tmp 
     778      LOGICAL, OPTIONAL, INTENT(OUT) :: time_stamp_format_ 
     779      LOGICAL(KIND=C_BOOL) :: time_stamp_format__tmp 
     780      LOGICAL, OPTIONAL, INTENT(OUT) :: time_stamp_name_ 
     781      LOGICAL(KIND=C_BOOL) :: time_stamp_name__tmp 
     782      LOGICAL, OPTIONAL, INTENT(OUT) :: time_units_ 
     783      LOGICAL(KIND=C_BOOL) :: time_units__tmp 
    678784      LOGICAL, OPTIONAL, INTENT(OUT) :: timeseries_ 
    679785      LOGICAL(KIND=C_BOOL) :: timeseries__tmp 
     
    682788      LOGICAL, OPTIONAL, INTENT(OUT) :: type_ 
    683789      LOGICAL(KIND=C_BOOL) :: type__tmp 
     790      LOGICAL, OPTIONAL, INTENT(OUT) :: uuid_format_ 
     791      LOGICAL(KIND=C_BOOL) :: uuid_format__tmp 
     792      LOGICAL, OPTIONAL, INTENT(OUT) :: uuid_name_ 
     793      LOGICAL(KIND=C_BOOL) :: uuid_name__tmp 
    684794 
    685795      IF (PRESENT(append_)) THEN 
     
    803913      ENDIF 
    804914 
     915      IF (PRESENT(time_stamp_format_)) THEN 
     916        time_stamp_format__tmp = cxios_is_defined_file_time_stamp_format & 
     917      (file_hdl%daddr) 
     918        time_stamp_format_ = time_stamp_format__tmp 
     919      ENDIF 
     920 
     921      IF (PRESENT(time_stamp_name_)) THEN 
     922        time_stamp_name__tmp = cxios_is_defined_file_time_stamp_name & 
     923      (file_hdl%daddr) 
     924        time_stamp_name_ = time_stamp_name__tmp 
     925      ENDIF 
     926 
     927      IF (PRESENT(time_units_)) THEN 
     928        time_units__tmp = cxios_is_defined_file_time_units & 
     929      (file_hdl%daddr) 
     930        time_units_ = time_units__tmp 
     931      ENDIF 
     932 
    805933      IF (PRESENT(timeseries_)) THEN 
    806934        timeseries__tmp = cxios_is_defined_file_timeseries & 
     
    821949      ENDIF 
    822950 
     951      IF (PRESENT(uuid_format_)) THEN 
     952        uuid_format__tmp = cxios_is_defined_file_uuid_format & 
     953      (file_hdl%daddr) 
     954        uuid_format_ = uuid_format__tmp 
     955      ENDIF 
     956 
     957      IF (PRESENT(uuid_name_)) THEN 
     958        uuid_name__tmp = cxios_is_defined_file_uuid_name & 
     959      (file_hdl%daddr) 
     960        uuid_name_ = uuid_name__tmp 
     961      ENDIF 
     962 
    823963  END SUBROUTINE xios(is_defined_file_attr_hdl_) 
    824964 
  • XIOS/trunk/src/interface/fortran_attr/ifilegroup_attr.F90

    r966 r1052  
    1414    ( filegroup_id, append, compression_level, convention, cyclic, description, enabled, format  & 
    1515    , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    16     , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix  & 
    17     , type ) 
     16    , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     17    , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    1818 
    1919    IMPLICIT NONE 
     
    4444      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter 
    4545      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter_name 
     46      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_stamp_format 
     47      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_stamp_name 
     48      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_units 
    4649      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: timeseries 
    4750      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: ts_prefix 
    4851      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type 
     52      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: uuid_format 
     53      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: uuid_name 
    4954 
    5055      CALL xios(get_filegroup_handle) & 
     
    5358      ( filegroup_hdl, append, compression_level, convention, cyclic, description, enabled, format  & 
    5459      , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    55       , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix  & 
    56       , type ) 
     60      , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     61      , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    5762 
    5863  END SUBROUTINE xios(set_filegroup_attr) 
     
    6166    ( filegroup_hdl, append, compression_level, convention, cyclic, description, enabled, format  & 
    6267    , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    63     , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix  & 
    64     , type ) 
     68    , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     69    , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    6570 
    6671    IMPLICIT NONE 
     
    9095      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter 
    9196      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter_name 
     97      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_stamp_format 
     98      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_stamp_name 
     99      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_units 
    92100      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: timeseries 
    93101      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: ts_prefix 
    94102      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type 
     103      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: uuid_format 
     104      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: uuid_name 
    95105 
    96106      CALL xios(set_filegroup_attr_hdl_)  & 
    97107      ( filegroup_hdl, append, compression_level, convention, cyclic, description, enabled, format  & 
    98108      , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    99       , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix  & 
    100       , type ) 
     109      , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     110      , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    101111 
    102112  END SUBROUTINE xios(set_filegroup_attr_hdl) 
     
    106116    , group_ref_, min_digits_, mode_, name_, name_suffix_, output_freq_, output_level_, par_access_  & 
    107117    , record_offset_, split_freq_, split_freq_format_, sync_freq_, time_counter_, time_counter_name_  & 
    108     , timeseries_, ts_prefix_, type_ ) 
     118    , time_stamp_format_, time_stamp_name_, time_units_, timeseries_, ts_prefix_, type_, uuid_format_  & 
     119    , uuid_name_ ) 
    109120 
    110121    IMPLICIT NONE 
     
    134145      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter_ 
    135146      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter_name_ 
     147      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_stamp_format_ 
     148      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_stamp_name_ 
     149      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_units_ 
    136150      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: timeseries_ 
    137151      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: ts_prefix_ 
    138152      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type_ 
     153      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: uuid_format_ 
     154      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: uuid_name_ 
    139155 
    140156      IF (PRESENT(append_)) THEN 
     
    246262      ENDIF 
    247263 
     264      IF (PRESENT(time_stamp_format_)) THEN 
     265        CALL cxios_set_filegroup_time_stamp_format & 
     266      (filegroup_hdl%daddr, time_stamp_format_, len(time_stamp_format_)) 
     267      ENDIF 
     268 
     269      IF (PRESENT(time_stamp_name_)) THEN 
     270        CALL cxios_set_filegroup_time_stamp_name & 
     271      (filegroup_hdl%daddr, time_stamp_name_, len(time_stamp_name_)) 
     272      ENDIF 
     273 
     274      IF (PRESENT(time_units_)) THEN 
     275        CALL cxios_set_filegroup_time_units & 
     276      (filegroup_hdl%daddr, time_units_, len(time_units_)) 
     277      ENDIF 
     278 
    248279      IF (PRESENT(timeseries_)) THEN 
    249280        CALL cxios_set_filegroup_timeseries & 
     
    261292      ENDIF 
    262293 
     294      IF (PRESENT(uuid_format_)) THEN 
     295        CALL cxios_set_filegroup_uuid_format & 
     296      (filegroup_hdl%daddr, uuid_format_, len(uuid_format_)) 
     297      ENDIF 
     298 
     299      IF (PRESENT(uuid_name_)) THEN 
     300        CALL cxios_set_filegroup_uuid_name & 
     301      (filegroup_hdl%daddr, uuid_name_, len(uuid_name_)) 
     302      ENDIF 
     303 
    263304  END SUBROUTINE xios(set_filegroup_attr_hdl_) 
    264305 
     
    266307    ( filegroup_id, append, compression_level, convention, cyclic, description, enabled, format  & 
    267308    , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    268     , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix  & 
    269     , type ) 
     309    , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     310    , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    270311 
    271312    IMPLICIT NONE 
     
    296337      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter 
    297338      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter_name 
     339      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_stamp_format 
     340      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_stamp_name 
     341      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_units 
    298342      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: timeseries 
    299343      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: ts_prefix 
    300344      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type 
     345      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: uuid_format 
     346      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: uuid_name 
    301347 
    302348      CALL xios(get_filegroup_handle) & 
     
    305351      ( filegroup_hdl, append, compression_level, convention, cyclic, description, enabled, format  & 
    306352      , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    307       , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix  & 
    308       , type ) 
     353      , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     354      , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    309355 
    310356  END SUBROUTINE xios(get_filegroup_attr) 
     
    313359    ( filegroup_hdl, append, compression_level, convention, cyclic, description, enabled, format  & 
    314360    , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    315     , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix  & 
    316     , type ) 
     361    , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     362    , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    317363 
    318364    IMPLICIT NONE 
     
    342388      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter 
    343389      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter_name 
     390      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_stamp_format 
     391      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_stamp_name 
     392      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_units 
    344393      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: timeseries 
    345394      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: ts_prefix 
    346395      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type 
     396      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: uuid_format 
     397      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: uuid_name 
    347398 
    348399      CALL xios(get_filegroup_attr_hdl_)  & 
    349400      ( filegroup_hdl, append, compression_level, convention, cyclic, description, enabled, format  & 
    350401      , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    351       , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix  & 
    352       , type ) 
     402      , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     403      , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    353404 
    354405  END SUBROUTINE xios(get_filegroup_attr_hdl) 
     
    358409    , group_ref_, min_digits_, mode_, name_, name_suffix_, output_freq_, output_level_, par_access_  & 
    359410    , record_offset_, split_freq_, split_freq_format_, sync_freq_, time_counter_, time_counter_name_  & 
    360     , timeseries_, ts_prefix_, type_ ) 
     411    , time_stamp_format_, time_stamp_name_, time_units_, timeseries_, ts_prefix_, type_, uuid_format_  & 
     412    , uuid_name_ ) 
    361413 
    362414    IMPLICIT NONE 
     
    386438      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter_ 
    387439      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter_name_ 
     440      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_stamp_format_ 
     441      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_stamp_name_ 
     442      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_units_ 
    388443      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: timeseries_ 
    389444      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: ts_prefix_ 
    390445      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type_ 
     446      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: uuid_format_ 
     447      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: uuid_name_ 
    391448 
    392449      IF (PRESENT(append_)) THEN 
     
    498555      ENDIF 
    499556 
     557      IF (PRESENT(time_stamp_format_)) THEN 
     558        CALL cxios_get_filegroup_time_stamp_format & 
     559      (filegroup_hdl%daddr, time_stamp_format_, len(time_stamp_format_)) 
     560      ENDIF 
     561 
     562      IF (PRESENT(time_stamp_name_)) THEN 
     563        CALL cxios_get_filegroup_time_stamp_name & 
     564      (filegroup_hdl%daddr, time_stamp_name_, len(time_stamp_name_)) 
     565      ENDIF 
     566 
     567      IF (PRESENT(time_units_)) THEN 
     568        CALL cxios_get_filegroup_time_units & 
     569      (filegroup_hdl%daddr, time_units_, len(time_units_)) 
     570      ENDIF 
     571 
    500572      IF (PRESENT(timeseries_)) THEN 
    501573        CALL cxios_get_filegroup_timeseries & 
     
    513585      ENDIF 
    514586 
     587      IF (PRESENT(uuid_format_)) THEN 
     588        CALL cxios_get_filegroup_uuid_format & 
     589      (filegroup_hdl%daddr, uuid_format_, len(uuid_format_)) 
     590      ENDIF 
     591 
     592      IF (PRESENT(uuid_name_)) THEN 
     593        CALL cxios_get_filegroup_uuid_name & 
     594      (filegroup_hdl%daddr, uuid_name_, len(uuid_name_)) 
     595      ENDIF 
     596 
    515597  END SUBROUTINE xios(get_filegroup_attr_hdl_) 
    516598 
     
    518600    ( filegroup_id, append, compression_level, convention, cyclic, description, enabled, format  & 
    519601    , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    520     , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix  & 
    521     , type ) 
     602    , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     603    , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    522604 
    523605    IMPLICIT NONE 
     
    566648      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter_name 
    567649      LOGICAL(KIND=C_BOOL) :: time_counter_name_tmp 
     650      LOGICAL, OPTIONAL, INTENT(OUT) :: time_stamp_format 
     651      LOGICAL(KIND=C_BOOL) :: time_stamp_format_tmp 
     652      LOGICAL, OPTIONAL, INTENT(OUT) :: time_stamp_name 
     653      LOGICAL(KIND=C_BOOL) :: time_stamp_name_tmp 
     654      LOGICAL, OPTIONAL, INTENT(OUT) :: time_units 
     655      LOGICAL(KIND=C_BOOL) :: time_units_tmp 
    568656      LOGICAL, OPTIONAL, INTENT(OUT) :: timeseries 
    569657      LOGICAL(KIND=C_BOOL) :: timeseries_tmp 
     
    572660      LOGICAL, OPTIONAL, INTENT(OUT) :: type 
    573661      LOGICAL(KIND=C_BOOL) :: type_tmp 
     662      LOGICAL, OPTIONAL, INTENT(OUT) :: uuid_format 
     663      LOGICAL(KIND=C_BOOL) :: uuid_format_tmp 
     664      LOGICAL, OPTIONAL, INTENT(OUT) :: uuid_name 
     665      LOGICAL(KIND=C_BOOL) :: uuid_name_tmp 
    574666 
    575667      CALL xios(get_filegroup_handle) & 
     
    578670      ( filegroup_hdl, append, compression_level, convention, cyclic, description, enabled, format  & 
    579671      , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    580       , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix  & 
    581       , type ) 
     672      , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     673      , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    582674 
    583675  END SUBROUTINE xios(is_defined_filegroup_attr) 
     
    586678    ( filegroup_hdl, append, compression_level, convention, cyclic, description, enabled, format  & 
    587679    , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    588     , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix  & 
    589     , type ) 
     680    , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     681    , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    590682 
    591683    IMPLICIT NONE 
     
    633725      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter_name 
    634726      LOGICAL(KIND=C_BOOL) :: time_counter_name_tmp 
     727      LOGICAL, OPTIONAL, INTENT(OUT) :: time_stamp_format 
     728      LOGICAL(KIND=C_BOOL) :: time_stamp_format_tmp 
     729      LOGICAL, OPTIONAL, INTENT(OUT) :: time_stamp_name 
     730      LOGICAL(KIND=C_BOOL) :: time_stamp_name_tmp 
     731      LOGICAL, OPTIONAL, INTENT(OUT) :: time_units 
     732      LOGICAL(KIND=C_BOOL) :: time_units_tmp 
    635733      LOGICAL, OPTIONAL, INTENT(OUT) :: timeseries 
    636734      LOGICAL(KIND=C_BOOL) :: timeseries_tmp 
     
    639737      LOGICAL, OPTIONAL, INTENT(OUT) :: type 
    640738      LOGICAL(KIND=C_BOOL) :: type_tmp 
     739      LOGICAL, OPTIONAL, INTENT(OUT) :: uuid_format 
     740      LOGICAL(KIND=C_BOOL) :: uuid_format_tmp 
     741      LOGICAL, OPTIONAL, INTENT(OUT) :: uuid_name 
     742      LOGICAL(KIND=C_BOOL) :: uuid_name_tmp 
    641743 
    642744      CALL xios(is_defined_filegroup_attr_hdl_)  & 
    643745      ( filegroup_hdl, append, compression_level, convention, cyclic, description, enabled, format  & 
    644746      , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    645       , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix  & 
    646       , type ) 
     747      , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     748      , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    647749 
    648750  END SUBROUTINE xios(is_defined_filegroup_attr_hdl) 
     
    652754    , group_ref_, min_digits_, mode_, name_, name_suffix_, output_freq_, output_level_, par_access_  & 
    653755    , record_offset_, split_freq_, split_freq_format_, sync_freq_, time_counter_, time_counter_name_  & 
    654     , timeseries_, ts_prefix_, type_ ) 
     756    , time_stamp_format_, time_stamp_name_, time_units_, timeseries_, ts_prefix_, type_, uuid_format_  & 
     757    , uuid_name_ ) 
    655758 
    656759    IMPLICIT NONE 
     
    698801      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter_name_ 
    699802      LOGICAL(KIND=C_BOOL) :: time_counter_name__tmp 
     803      LOGICAL, OPTIONAL, INTENT(OUT) :: time_stamp_format_ 
     804      LOGICAL(KIND=C_BOOL) :: time_stamp_format__tmp 
     805      LOGICAL, OPTIONAL, INTENT(OUT) :: time_stamp_name_ 
     806      LOGICAL(KIND=C_BOOL) :: time_stamp_name__tmp 
     807      LOGICAL, OPTIONAL, INTENT(OUT) :: time_units_ 
     808      LOGICAL(KIND=C_BOOL) :: time_units__tmp 
    700809      LOGICAL, OPTIONAL, INTENT(OUT) :: timeseries_ 
    701810      LOGICAL(KIND=C_BOOL) :: timeseries__tmp 
     
    704813      LOGICAL, OPTIONAL, INTENT(OUT) :: type_ 
    705814      LOGICAL(KIND=C_BOOL) :: type__tmp 
     815      LOGICAL, OPTIONAL, INTENT(OUT) :: uuid_format_ 
     816      LOGICAL(KIND=C_BOOL) :: uuid_format__tmp 
     817      LOGICAL, OPTIONAL, INTENT(OUT) :: uuid_name_ 
     818      LOGICAL(KIND=C_BOOL) :: uuid_name__tmp 
    706819 
    707820      IF (PRESENT(append_)) THEN 
     
    831944      ENDIF 
    832945 
     946      IF (PRESENT(time_stamp_format_)) THEN 
     947        time_stamp_format__tmp = cxios_is_defined_filegroup_time_stamp_format & 
     948      (filegroup_hdl%daddr) 
     949        time_stamp_format_ = time_stamp_format__tmp 
     950      ENDIF 
     951 
     952      IF (PRESENT(time_stamp_name_)) THEN 
     953        time_stamp_name__tmp = cxios_is_defined_filegroup_time_stamp_name & 
     954      (filegroup_hdl%daddr) 
     955        time_stamp_name_ = time_stamp_name__tmp 
     956      ENDIF 
     957 
     958      IF (PRESENT(time_units_)) THEN 
     959        time_units__tmp = cxios_is_defined_filegroup_time_units & 
     960      (filegroup_hdl%daddr) 
     961        time_units_ = time_units__tmp 
     962      ENDIF 
     963 
    833964      IF (PRESENT(timeseries_)) THEN 
    834965        timeseries__tmp = cxios_is_defined_filegroup_timeseries & 
     
    849980      ENDIF 
    850981 
     982      IF (PRESENT(uuid_format_)) THEN 
     983        uuid_format__tmp = cxios_is_defined_filegroup_uuid_format & 
     984      (filegroup_hdl%daddr) 
     985        uuid_format_ = uuid_format__tmp 
     986      ENDIF 
     987 
     988      IF (PRESENT(uuid_name_)) THEN 
     989        uuid_name__tmp = cxios_is_defined_filegroup_uuid_name & 
     990      (filegroup_hdl%daddr) 
     991        uuid_name_ = uuid_name__tmp 
     992      ENDIF 
     993 
    851994  END SUBROUTINE xios(is_defined_filegroup_attr_hdl_) 
    852995 
  • XIOS/trunk/src/interface/fortran_attr/iscalar_attr.F90

    r966 r1052  
    1212 
    1313  SUBROUTINE xios(set_scalar_attr)  & 
    14     ( scalar_id, long_name, name, scalar_ref, standard_name, unit, value ) 
     14    ( scalar_id, long_name, name, prec, scalar_ref, standard_name, unit, value ) 
    1515 
    1616    IMPLICIT NONE 
     
    1919      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name 
    2020      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name 
     21      INTEGER  , OPTIONAL, INTENT(IN) :: prec 
    2122      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: scalar_ref 
    2223      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name 
     
    2728      (scalar_id,scalar_hdl) 
    2829      CALL xios(set_scalar_attr_hdl_)   & 
    29       ( scalar_hdl, long_name, name, scalar_ref, standard_name, unit, value ) 
     30      ( scalar_hdl, long_name, name, prec, scalar_ref, standard_name, unit, value ) 
    3031 
    3132  END SUBROUTINE xios(set_scalar_attr) 
    3233 
    3334  SUBROUTINE xios(set_scalar_attr_hdl)  & 
    34     ( scalar_hdl, long_name, name, scalar_ref, standard_name, unit, value ) 
     35    ( scalar_hdl, long_name, name, prec, scalar_ref, standard_name, unit, value ) 
    3536 
    3637    IMPLICIT NONE 
     
    3839      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name 
    3940      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name 
     41      INTEGER  , OPTIONAL, INTENT(IN) :: prec 
    4042      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: scalar_ref 
    4143      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name 
     
    4446 
    4547      CALL xios(set_scalar_attr_hdl_)  & 
    46       ( scalar_hdl, long_name, name, scalar_ref, standard_name, unit, value ) 
     48      ( scalar_hdl, long_name, name, prec, scalar_ref, standard_name, unit, value ) 
    4749 
    4850  END SUBROUTINE xios(set_scalar_attr_hdl) 
    4951 
    5052  SUBROUTINE xios(set_scalar_attr_hdl_)   & 
    51     ( scalar_hdl, long_name_, name_, scalar_ref_, standard_name_, unit_, value_ ) 
     53    ( scalar_hdl, long_name_, name_, prec_, scalar_ref_, standard_name_, unit_, value_ ) 
    5254 
    5355    IMPLICIT NONE 
     
    5557      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name_ 
    5658      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_ 
     59      INTEGER  , OPTIONAL, INTENT(IN) :: prec_ 
    5760      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: scalar_ref_ 
    5861      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name_ 
     
    7073      ENDIF 
    7174 
     75      IF (PRESENT(prec_)) THEN 
     76        CALL cxios_set_scalar_prec & 
     77      (scalar_hdl%daddr, prec_) 
     78      ENDIF 
     79 
    7280      IF (PRESENT(scalar_ref_)) THEN 
    7381        CALL cxios_set_scalar_scalar_ref & 
     
    93101 
    94102  SUBROUTINE xios(get_scalar_attr)  & 
    95     ( scalar_id, long_name, name, scalar_ref, standard_name, unit, value ) 
     103    ( scalar_id, long_name, name, prec, scalar_ref, standard_name, unit, value ) 
    96104 
    97105    IMPLICIT NONE 
     
    100108      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name 
    101109      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name 
     110      INTEGER  , OPTIONAL, INTENT(OUT) :: prec 
    102111      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: scalar_ref 
    103112      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name 
     
    108117      (scalar_id,scalar_hdl) 
    109118      CALL xios(get_scalar_attr_hdl_)   & 
    110       ( scalar_hdl, long_name, name, scalar_ref, standard_name, unit, value ) 
     119      ( scalar_hdl, long_name, name, prec, scalar_ref, standard_name, unit, value ) 
    111120 
    112121  END SUBROUTINE xios(get_scalar_attr) 
    113122 
    114123  SUBROUTINE xios(get_scalar_attr_hdl)  & 
    115     ( scalar_hdl, long_name, name, scalar_ref, standard_name, unit, value ) 
     124    ( scalar_hdl, long_name, name, prec, scalar_ref, standard_name, unit, value ) 
    116125 
    117126    IMPLICIT NONE 
     
    119128      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name 
    120129      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name 
     130      INTEGER  , OPTIONAL, INTENT(OUT) :: prec 
    121131      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: scalar_ref 
    122132      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name 
     
    125135 
    126136      CALL xios(get_scalar_attr_hdl_)  & 
    127       ( scalar_hdl, long_name, name, scalar_ref, standard_name, unit, value ) 
     137      ( scalar_hdl, long_name, name, prec, scalar_ref, standard_name, unit, value ) 
    128138 
    129139  END SUBROUTINE xios(get_scalar_attr_hdl) 
    130140 
    131141  SUBROUTINE xios(get_scalar_attr_hdl_)   & 
    132     ( scalar_hdl, long_name_, name_, scalar_ref_, standard_name_, unit_, value_ ) 
     142    ( scalar_hdl, long_name_, name_, prec_, scalar_ref_, standard_name_, unit_, value_ ) 
    133143 
    134144    IMPLICIT NONE 
     
    136146      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name_ 
    137147      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_ 
     148      INTEGER  , OPTIONAL, INTENT(OUT) :: prec_ 
    138149      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: scalar_ref_ 
    139150      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name_ 
     
    151162      ENDIF 
    152163 
     164      IF (PRESENT(prec_)) THEN 
     165        CALL cxios_get_scalar_prec & 
     166      (scalar_hdl%daddr, prec_) 
     167      ENDIF 
     168 
    153169      IF (PRESENT(scalar_ref_)) THEN 
    154170        CALL cxios_get_scalar_scalar_ref & 
     
    174190 
    175191  SUBROUTINE xios(is_defined_scalar_attr)  & 
    176     ( scalar_id, long_name, name, scalar_ref, standard_name, unit, value ) 
     192    ( scalar_id, long_name, name, prec, scalar_ref, standard_name, unit, value ) 
    177193 
    178194    IMPLICIT NONE 
     
    183199      LOGICAL, OPTIONAL, INTENT(OUT) :: name 
    184200      LOGICAL(KIND=C_BOOL) :: name_tmp 
     201      LOGICAL, OPTIONAL, INTENT(OUT) :: prec 
     202      LOGICAL(KIND=C_BOOL) :: prec_tmp 
    185203      LOGICAL, OPTIONAL, INTENT(OUT) :: scalar_ref 
    186204      LOGICAL(KIND=C_BOOL) :: scalar_ref_tmp 
     
    195213      (scalar_id,scalar_hdl) 
    196214      CALL xios(is_defined_scalar_attr_hdl_)   & 
    197       ( scalar_hdl, long_name, name, scalar_ref, standard_name, unit, value ) 
     215      ( scalar_hdl, long_name, name, prec, scalar_ref, standard_name, unit, value ) 
    198216 
    199217  END SUBROUTINE xios(is_defined_scalar_attr) 
    200218 
    201219  SUBROUTINE xios(is_defined_scalar_attr_hdl)  & 
    202     ( scalar_hdl, long_name, name, scalar_ref, standard_name, unit, value ) 
     220    ( scalar_hdl, long_name, name, prec, scalar_ref, standard_name, unit, value ) 
    203221 
    204222    IMPLICIT NONE 
     
    208226      LOGICAL, OPTIONAL, INTENT(OUT) :: name 
    209227      LOGICAL(KIND=C_BOOL) :: name_tmp 
     228      LOGICAL, OPTIONAL, INTENT(OUT) :: prec 
     229      LOGICAL(KIND=C_BOOL) :: prec_tmp 
    210230      LOGICAL, OPTIONAL, INTENT(OUT) :: scalar_ref 
    211231      LOGICAL(KIND=C_BOOL) :: scalar_ref_tmp 
     
    218238 
    219239      CALL xios(is_defined_scalar_attr_hdl_)  & 
    220       ( scalar_hdl, long_name, name, scalar_ref, standard_name, unit, value ) 
     240      ( scalar_hdl, long_name, name, prec, scalar_ref, standard_name, unit, value ) 
    221241 
    222242  END SUBROUTINE xios(is_defined_scalar_attr_hdl) 
    223243 
    224244  SUBROUTINE xios(is_defined_scalar_attr_hdl_)   & 
    225     ( scalar_hdl, long_name_, name_, scalar_ref_, standard_name_, unit_, value_ ) 
     245    ( scalar_hdl, long_name_, name_, prec_, scalar_ref_, standard_name_, unit_, value_ ) 
    226246 
    227247    IMPLICIT NONE 
     
    231251      LOGICAL, OPTIONAL, INTENT(OUT) :: name_ 
    232252      LOGICAL(KIND=C_BOOL) :: name__tmp 
     253      LOGICAL, OPTIONAL, INTENT(OUT) :: prec_ 
     254      LOGICAL(KIND=C_BOOL) :: prec__tmp 
    233255      LOGICAL, OPTIONAL, INTENT(OUT) :: scalar_ref_ 
    234256      LOGICAL(KIND=C_BOOL) :: scalar_ref__tmp 
     
    252274      ENDIF 
    253275 
     276      IF (PRESENT(prec_)) THEN 
     277        prec__tmp = cxios_is_defined_scalar_prec & 
     278      (scalar_hdl%daddr) 
     279        prec_ = prec__tmp 
     280      ENDIF 
     281 
    254282      IF (PRESENT(scalar_ref_)) THEN 
    255283        scalar_ref__tmp = cxios_is_defined_scalar_scalar_ref & 
  • XIOS/trunk/src/interface/fortran_attr/iscalargroup_attr.F90

    r966 r1052  
    1212 
    1313  SUBROUTINE xios(set_scalargroup_attr)  & 
    14     ( scalargroup_id, group_ref, long_name, name, scalar_ref, standard_name, unit, value ) 
     14    ( scalargroup_id, group_ref, long_name, name, prec, scalar_ref, standard_name, unit, value ) 
    1515 
    1616    IMPLICIT NONE 
     
    2020      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name 
    2121      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name 
     22      INTEGER  , OPTIONAL, INTENT(IN) :: prec 
    2223      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: scalar_ref 
    2324      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name 
     
    2829      (scalargroup_id,scalargroup_hdl) 
    2930      CALL xios(set_scalargroup_attr_hdl_)   & 
    30       ( scalargroup_hdl, group_ref, long_name, name, scalar_ref, standard_name, unit, value ) 
     31      ( scalargroup_hdl, group_ref, long_name, name, prec, scalar_ref, standard_name, unit, value  & 
     32       ) 
    3133 
    3234  END SUBROUTINE xios(set_scalargroup_attr) 
    3335 
    3436  SUBROUTINE xios(set_scalargroup_attr_hdl)  & 
    35     ( scalargroup_hdl, group_ref, long_name, name, scalar_ref, standard_name, unit, value ) 
     37    ( scalargroup_hdl, group_ref, long_name, name, prec, scalar_ref, standard_name, unit, value  & 
     38     ) 
    3639 
    3740    IMPLICIT NONE 
     
    4043      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name 
    4144      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name 
     45      INTEGER  , OPTIONAL, INTENT(IN) :: prec 
    4246      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: scalar_ref 
    4347      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name 
     
    4650 
    4751      CALL xios(set_scalargroup_attr_hdl_)  & 
    48       ( scalargroup_hdl, group_ref, long_name, name, scalar_ref, standard_name, unit, value ) 
     52      ( scalargroup_hdl, group_ref, long_name, name, prec, scalar_ref, standard_name, unit, value  & 
     53       ) 
    4954 
    5055  END SUBROUTINE xios(set_scalargroup_attr_hdl) 
    5156 
    5257  SUBROUTINE xios(set_scalargroup_attr_hdl_)   & 
    53     ( scalargroup_hdl, group_ref_, long_name_, name_, scalar_ref_, standard_name_, unit_, value_  & 
    54     ) 
     58    ( scalargroup_hdl, group_ref_, long_name_, name_, prec_, scalar_ref_, standard_name_, unit_  & 
     59    , value_ ) 
    5560 
    5661    IMPLICIT NONE 
     
    5964      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name_ 
    6065      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_ 
     66      INTEGER  , OPTIONAL, INTENT(IN) :: prec_ 
    6167      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: scalar_ref_ 
    6268      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name_ 
     
    7985      ENDIF 
    8086 
     87      IF (PRESENT(prec_)) THEN 
     88        CALL cxios_set_scalargroup_prec & 
     89      (scalargroup_hdl%daddr, prec_) 
     90      ENDIF 
     91 
    8192      IF (PRESENT(scalar_ref_)) THEN 
    8293        CALL cxios_set_scalargroup_scalar_ref & 
     
    102113 
    103114  SUBROUTINE xios(get_scalargroup_attr)  & 
    104     ( scalargroup_id, group_ref, long_name, name, scalar_ref, standard_name, unit, value ) 
     115    ( scalargroup_id, group_ref, long_name, name, prec, scalar_ref, standard_name, unit, value ) 
    105116 
    106117    IMPLICIT NONE 
     
    110121      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name 
    111122      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name 
     123      INTEGER  , OPTIONAL, INTENT(OUT) :: prec 
    112124      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: scalar_ref 
    113125      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name 
     
    118130      (scalargroup_id,scalargroup_hdl) 
    119131      CALL xios(get_scalargroup_attr_hdl_)   & 
    120       ( scalargroup_hdl, group_ref, long_name, name, scalar_ref, standard_name, unit, value ) 
     132      ( scalargroup_hdl, group_ref, long_name, name, prec, scalar_ref, standard_name, unit, value  & 
     133       ) 
    121134 
    122135  END SUBROUTINE xios(get_scalargroup_attr) 
    123136 
    124137  SUBROUTINE xios(get_scalargroup_attr_hdl)  & 
    125     ( scalargroup_hdl, group_ref, long_name, name, scalar_ref, standard_name, unit, value ) 
     138    ( scalargroup_hdl, group_ref, long_name, name, prec, scalar_ref, standard_name, unit, value  & 
     139     ) 
    126140 
    127141    IMPLICIT NONE 
     
    130144      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name 
    131145      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name 
     146      INTEGER  , OPTIONAL, INTENT(OUT) :: prec 
    132147      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: scalar_ref 
    133148      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name 
     
    136151 
    137152      CALL xios(get_scalargroup_attr_hdl_)  & 
    138       ( scalargroup_hdl, group_ref, long_name, name, scalar_ref, standard_name, unit, value ) 
     153      ( scalargroup_hdl, group_ref, long_name, name, prec, scalar_ref, standard_name, unit, value  & 
     154       ) 
    139155 
    140156  END SUBROUTINE xios(get_scalargroup_attr_hdl) 
    141157 
    142158  SUBROUTINE xios(get_scalargroup_attr_hdl_)   & 
    143     ( scalargroup_hdl, group_ref_, long_name_, name_, scalar_ref_, standard_name_, unit_, value_  & 
    144     ) 
     159    ( scalargroup_hdl, group_ref_, long_name_, name_, prec_, scalar_ref_, standard_name_, unit_  & 
     160    , value_ ) 
    145161 
    146162    IMPLICIT NONE 
     
    149165      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name_ 
    150166      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_ 
     167      INTEGER  , OPTIONAL, INTENT(OUT) :: prec_ 
    151168      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: scalar_ref_ 
    152169      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name_ 
     
    169186      ENDIF 
    170187 
     188      IF (PRESENT(prec_)) THEN 
     189        CALL cxios_get_scalargroup_prec & 
     190      (scalargroup_hdl%daddr, prec_) 
     191      ENDIF 
     192 
    171193      IF (PRESENT(scalar_ref_)) THEN 
    172194        CALL cxios_get_scalargroup_scalar_ref & 
     
    192214 
    193215  SUBROUTINE xios(is_defined_scalargroup_attr)  & 
    194     ( scalargroup_id, group_ref, long_name, name, scalar_ref, standard_name, unit, value ) 
     216    ( scalargroup_id, group_ref, long_name, name, prec, scalar_ref, standard_name, unit, value ) 
    195217 
    196218    IMPLICIT NONE 
     
    203225      LOGICAL, OPTIONAL, INTENT(OUT) :: name 
    204226      LOGICAL(KIND=C_BOOL) :: name_tmp 
     227      LOGICAL, OPTIONAL, INTENT(OUT) :: prec 
     228      LOGICAL(KIND=C_BOOL) :: prec_tmp 
    205229      LOGICAL, OPTIONAL, INTENT(OUT) :: scalar_ref 
    206230      LOGICAL(KIND=C_BOOL) :: scalar_ref_tmp 
     
    215239      (scalargroup_id,scalargroup_hdl) 
    216240      CALL xios(is_defined_scalargroup_attr_hdl_)   & 
    217       ( scalargroup_hdl, group_ref, long_name, name, scalar_ref, standard_name, unit, value ) 
     241      ( scalargroup_hdl, group_ref, long_name, name, prec, scalar_ref, standard_name, unit, value  & 
     242       ) 
    218243 
    219244  END SUBROUTINE xios(is_defined_scalargroup_attr) 
    220245 
    221246  SUBROUTINE xios(is_defined_scalargroup_attr_hdl)  & 
    222     ( scalargroup_hdl, group_ref, long_name, name, scalar_ref, standard_name, unit, value ) 
     247    ( scalargroup_hdl, group_ref, long_name, name, prec, scalar_ref, standard_name, unit, value  & 
     248     ) 
    223249 
    224250    IMPLICIT NONE 
     
    230256      LOGICAL, OPTIONAL, INTENT(OUT) :: name 
    231257      LOGICAL(KIND=C_BOOL) :: name_tmp 
     258      LOGICAL, OPTIONAL, INTENT(OUT) :: prec 
     259      LOGICAL(KIND=C_BOOL) :: prec_tmp 
    232260      LOGICAL, OPTIONAL, INTENT(OUT) :: scalar_ref 
    233261      LOGICAL(KIND=C_BOOL) :: scalar_ref_tmp 
     
    240268 
    241269      CALL xios(is_defined_scalargroup_attr_hdl_)  & 
    242       ( scalargroup_hdl, group_ref, long_name, name, scalar_ref, standard_name, unit, value ) 
     270      ( scalargroup_hdl, group_ref, long_name, name, prec, scalar_ref, standard_name, unit, value  & 
     271       ) 
    243272 
    244273  END SUBROUTINE xios(is_defined_scalargroup_attr_hdl) 
    245274 
    246275  SUBROUTINE xios(is_defined_scalargroup_attr_hdl_)   & 
    247     ( scalargroup_hdl, group_ref_, long_name_, name_, scalar_ref_, standard_name_, unit_, value_  & 
    248     ) 
     276    ( scalargroup_hdl, group_ref_, long_name_, name_, prec_, scalar_ref_, standard_name_, unit_  & 
     277    , value_ ) 
    249278 
    250279    IMPLICIT NONE 
     
    256285      LOGICAL, OPTIONAL, INTENT(OUT) :: name_ 
    257286      LOGICAL(KIND=C_BOOL) :: name__tmp 
     287      LOGICAL, OPTIONAL, INTENT(OUT) :: prec_ 
     288      LOGICAL(KIND=C_BOOL) :: prec__tmp 
    258289      LOGICAL, OPTIONAL, INTENT(OUT) :: scalar_ref_ 
    259290      LOGICAL(KIND=C_BOOL) :: scalar_ref__tmp 
     
    283314      ENDIF 
    284315 
     316      IF (PRESENT(prec_)) THEN 
     317        prec__tmp = cxios_is_defined_scalargroup_prec & 
     318      (scalargroup_hdl%daddr) 
     319        prec_ = prec__tmp 
     320      ENDIF 
     321 
    285322      IF (PRESENT(scalar_ref_)) THEN 
    286323        scalar_ref__tmp = cxios_is_defined_scalargroup_scalar_ref & 
  • XIOS/trunk/src/interface/fortran_attr/scalar_interface_attr.F90

    r891 r1052  
    5050      INTEGER (kind = C_INTPTR_T), VALUE :: scalar_hdl 
    5151    END FUNCTION cxios_is_defined_scalar_name 
     52 
     53 
     54    SUBROUTINE cxios_set_scalar_prec(scalar_hdl, prec) BIND(C) 
     55      USE ISO_C_BINDING 
     56      INTEGER (kind = C_INTPTR_T), VALUE :: scalar_hdl 
     57      INTEGER (KIND=C_INT)      , VALUE :: prec 
     58    END SUBROUTINE cxios_set_scalar_prec 
     59 
     60    SUBROUTINE cxios_get_scalar_prec(scalar_hdl, prec) BIND(C) 
     61      USE ISO_C_BINDING 
     62      INTEGER (kind = C_INTPTR_T), VALUE :: scalar_hdl 
     63      INTEGER (KIND=C_INT)             :: prec 
     64    END SUBROUTINE cxios_get_scalar_prec 
     65 
     66    FUNCTION cxios_is_defined_scalar_prec(scalar_hdl) BIND(C) 
     67      USE ISO_C_BINDING 
     68      LOGICAL(kind=C_BOOL) :: cxios_is_defined_scalar_prec 
     69      INTEGER (kind = C_INTPTR_T), VALUE :: scalar_hdl 
     70    END FUNCTION cxios_is_defined_scalar_prec 
    5271 
    5372 
  • XIOS/trunk/src/interface/fortran_attr/scalargroup_interface_attr.F90

    r891 r1052  
    7171      INTEGER (kind = C_INTPTR_T), VALUE :: scalargroup_hdl 
    7272    END FUNCTION cxios_is_defined_scalargroup_name 
     73 
     74 
     75    SUBROUTINE cxios_set_scalargroup_prec(scalargroup_hdl, prec) BIND(C) 
     76      USE ISO_C_BINDING 
     77      INTEGER (kind = C_INTPTR_T), VALUE :: scalargroup_hdl 
     78      INTEGER (KIND=C_INT)      , VALUE :: prec 
     79    END SUBROUTINE cxios_set_scalargroup_prec 
     80 
     81    SUBROUTINE cxios_get_scalargroup_prec(scalargroup_hdl, prec) BIND(C) 
     82      USE ISO_C_BINDING 
     83      INTEGER (kind = C_INTPTR_T), VALUE :: scalargroup_hdl 
     84      INTEGER (KIND=C_INT)             :: prec 
     85    END SUBROUTINE cxios_get_scalargroup_prec 
     86 
     87    FUNCTION cxios_is_defined_scalargroup_prec(scalargroup_hdl) BIND(C) 
     88      USE ISO_C_BINDING 
     89      LOGICAL(kind=C_BOOL) :: cxios_is_defined_scalargroup_prec 
     90      INTEGER (kind = C_INTPTR_T), VALUE :: scalargroup_hdl 
     91    END FUNCTION cxios_is_defined_scalargroup_prec 
    7392 
    7493 
Note: See TracChangeset for help on using the changeset viewer.