Changeset 286 for XMLIO_V2/dev/common/src/xmlio/fortran/icfield.cpp

Timestamp:

10/21/11 19:01:35 (13 years ago)

Author:

ymipsl

Message:

reprise en main de la version de H. Ozdoba. Correction de différentes erreurs de conception et bug.
Version NEMO operationnel en client/server, interoperabilita avec OASIS, reconstition de fichiers via netcdf4/HDF5

YM

File:

• XMLIO_V2/dev/common/src/xmlio/fortran/icfield.cpp (modified) (26 diffs)

XMLIO_V2/dev/common/src/xmlio/fortran/icfield.cpp

@@ -25 +25 @@
    // ------------------------- Attributs des champs ---------------------------
    
-   void xios_set_field_name(XFieldPtr field_hdl, const char * name, int name_size)
+   void cxios_set_field_name(XFieldPtr field_hdl, const char * name, int name_size)
    {
       std::string name_str; 
@@ -33 +33 @@
    }
    
-   void xios_set_field_standard_name(XFieldPtr field_hdl, const char * standard_name, int standard_name_size)
+   void cxios_set_field_standard_name(XFieldPtr field_hdl, const char * standard_name, int standard_name_size)
    {
       std::string standard_name_str; 
@@ -41 +41 @@
    }
    
-   void xios_set_field_long_name(XFieldPtr field_hdl, const char * long_name, int long_name_size)
+   void cxios_set_field_long_name(XFieldPtr field_hdl, const char * long_name, int long_name_size)
    {
       std::string long_name_str; 
@@ -49 +49 @@
    }
    
-   void xios_set_field_unit(XFieldPtr field_hdl, const char * unit, int unit_size)
+   void cxios_set_field_unit(XFieldPtr field_hdl, const char * unit, int unit_size)
    {
       std::string unit_str; 
@@ -57 +57 @@
    }
    
-   void xios_set_field_operation(XFieldPtr field_hdl, const char * operation, int operation_size) 
+   void cxios_set_field_operation(XFieldPtr field_hdl, const char * operation, int operation_size) 
    {
       std::string operation_str; 
@@ -65 +65 @@
    }
    
-   void xios_set_field_freq_op(XFieldPtr field_hdl, const char * freq_op, int freq_op_size)
+   void cxios_set_field_freq_op(XFieldPtr field_hdl, const char * freq_op, int freq_op_size)
    {
       std::string freq_op_str; 
@@ -73 +73 @@
    }
    
-   void xios_set_field_level(XFieldPtr field_hdl, int level)
+   void cxios_set_field_level(XFieldPtr field_hdl, int level)
    {
       field_hdl->level.setValue(level);
    }
    
-   void xios_set_field_prec(XFieldPtr field_hdl, int prec)
+   void cxios_set_field_prec(XFieldPtr field_hdl, int prec)
    {
       field_hdl->prec.setValue(prec);
    }
    
-   void xios_set_field_enabled(XFieldPtr field_hdl, bool enabled)
+   void cxios_set_field_enabled(XFieldPtr field_hdl, bool enabled)
    {
       field_hdl->enabled.setValue(enabled);
    }
    
-   void xios_set_field_domain_ref(XFieldPtr field_hdl,  const char * domain_ref, int domain_ref_size)
+   void cxios_set_field_domain_ref(XFieldPtr field_hdl,  const char * domain_ref, int domain_ref_size)
    {
       std::string domain_ref_str; 
@@ -96 +96 @@
    }
    
-   void xios_set_field_axis_ref(XFieldPtr field_hdl,  const char * axis_ref,  int axis_ref_size)
+   void cxios_set_field_axis_ref(XFieldPtr field_hdl,  const char * axis_ref,  int axis_ref_size)
    {
       std::string axis_ref_str; 
@@ -104 +104 @@
    }
    
-   void xios_set_field_grid_ref(XFieldPtr field_hdl,  const char * grid_ref, int grid_ref_size)
+   void cxios_set_field_grid_ref(XFieldPtr field_hdl,  const char * grid_ref, int grid_ref_size)
    {
       std::string grid_ref_str; 
@@ -112 +112 @@
    }
    
-   void xios_set_field_field_ref(XFieldPtr field_hdl,  const char * field_ref,  int field_ref_size)
+   void cxios_set_field_field_ref(XFieldPtr field_hdl,  const char * field_ref,  int field_ref_size)
    {
       std::string field_ref_str; 
@@ -120 +120 @@
    }
    
-   void xios_set_field_default_value(XFieldPtr field_hdl, double default_value)
+   void cxios_set_field_default_value(XFieldPtr field_hdl, double default_value)
    {
       field_hdl->default_value.setValue(default_value);
@@ -127 +127 @@
    // -------------------- Attributs des groupes de champs ---------------------
   
-   void xios_set_fieldgroup_name(XFieldGroupPtr fieldgroup_hdl, const char * name, int name_size)
+   void cxios_set_fieldgroup_name(XFieldGroupPtr fieldgroup_hdl, const char * name, int name_size)
    {
       std::string name_str; 
@@ -135 +135 @@
    }
    
-   void xios_set_fieldgroup_standard_name(XFieldGroupPtr fieldgroup_hdl, const char * standard_name, int standard_name_size)
+   void cxios_set_fieldgroup_standard_name(XFieldGroupPtr fieldgroup_hdl, const char * standard_name, int standard_name_size)
    {
       std::string standard_name_str; 
@@ -143 +143 @@
    }
    
-   void xios_set_fieldgroup_long_name(XFieldGroupPtr fieldgroup_hdl, const char * long_name, int long_name_size)
+   void cxios_set_fieldgroup_long_name(XFieldGroupPtr fieldgroup_hdl, const char * long_name, int long_name_size)
    {
       std::string long_name_str; 
@@ -151 +151 @@
    }
    
-   void xios_set_fieldgroup_unit(XFieldGroupPtr fieldgroup_hdl, const char * unit, int unit_size)
+   void cxios_set_fieldgroup_unit(XFieldGroupPtr fieldgroup_hdl, const char * unit, int unit_size)
    {
       std::string unit_str; 
@@ -159 +159 @@
    }
    
-   void xios_set_fieldgroup_operation(XFieldGroupPtr fieldgroup_hdl, const char * operation, int operation_size) 
+   void cxios_set_fieldgroup_operation(XFieldGroupPtr fieldgroup_hdl, const char * operation, int operation_size) 
    {
       std::string operation_str; 
@@ -167 +167 @@
    }
    
-   void xios_set_fieldgroup_freq_op(XFieldGroupPtr fieldgroup_hdl, const char * freq_op, int freq_op_size)
+   void cxios_set_fieldgroup_freq_op(XFieldGroupPtr fieldgroup_hdl, const char * freq_op, int freq_op_size)
    {
       std::string freq_op_str; 
@@ -175 +175 @@
    }
    
-   void xios_set_fieldgroup_level(XFieldGroupPtr fieldgroup_hdl, int level)
+   void cxios_set_fieldgroup_level(XFieldGroupPtr fieldgroup_hdl, int level)
    {
       fieldgroup_hdl->level.setValue(level);
    }
    
-   void xios_set_fieldgroup_prec(XFieldGroupPtr fieldgroup_hdl, int prec)
+   void cxios_set_fieldgroup_prec(XFieldGroupPtr fieldgroup_hdl, int prec)
    {
       fieldgroup_hdl->prec.setValue(prec);
    }
    
-   void xios_set_fieldgroup_enabled(XFieldGroupPtr fieldgroup_hdl, bool enabled)
+   void cxios_set_fieldgroup_enabled(XFieldGroupPtr fieldgroup_hdl, bool enabled)
    {
       fieldgroup_hdl->enabled.setValue(enabled);
    }
    
-   void xios_set_fieldgroup_domain_ref(XFieldGroupPtr fieldgroup_hdl,  const char * domain_ref, int domain_ref_size)
+   void cxios_set_fieldgroup_domain_ref(XFieldGroupPtr fieldgroup_hdl,  const char * domain_ref, int domain_ref_size)
    {
       std::string domain_ref_str; 
@@ -198 +198 @@
    }
    
-   void xios_set_fieldgroup_axis_ref(XFieldGroupPtr fieldgroup_hdl,  const char * axis_ref,  int axis_ref_size)
+   void cxios_set_fieldgroup_axis_ref(XFieldGroupPtr fieldgroup_hdl,  const char * axis_ref,  int axis_ref_size)
    {
       std::string axis_ref_str; 
@@ -206 +206 @@
    }
    
-   void xios_set_fieldgroup_grid_ref(XFieldGroupPtr fieldgroup_hdl,  const char * grid_ref, int grid_ref_size)
+   void cxios_set_fieldgroup_grid_ref(XFieldGroupPtr fieldgroup_hdl,  const char * grid_ref, int grid_ref_size)
    {
       std::string grid_ref_str; 
@@ -214 +214 @@
    }
    
-   void xios_set_fieldgroup_field_ref(XFieldGroupPtr fieldgroup_hdl,  const char * field_ref,  int field_ref_size)
+   void cxios_set_fieldgroup_field_ref(XFieldGroupPtr fieldgroup_hdl,  const char * field_ref,  int field_ref_size)
    {
       std::string field_ref_str; 
@@ -222 +222 @@
    }
    
-   void xios_set_fieldgroup_default_value(XFieldGroupPtr fieldgroup_hdl, double default_value)
+   void cxios_set_fieldgroup_default_value(XFieldGroupPtr fieldgroup_hdl, double default_value)
    {
       fieldgroup_hdl->default_value.setValue(default_value);
@@ -229 +229 @@
    // ------------------------ Création des handle -----------------------------
    
-   void xios_field_handle_create (XFieldPtr * _ret, const char * _id, int _id_len)
+   void cxios_field_handle_create (XFieldPtr * _ret, const char * _id, int _id_len)
    {
       std::string id; 
@@ -237 +237 @@
    }
    
-   void xios_fieldgroup_handle_create (XFieldGroupPtr * _ret, const char * _id, int _id_len)
+   void cxios_fieldgroup_handle_create (XFieldGroupPtr * _ret, const char * _id, int _id_len)
    {
       std::string id; 
@@ -248 +248 @@
    // -------------------- Vérification des identifiants -----------------------
 
-   void xios_field_valid_id (bool * _ret, const char * _id, int _id_len)
+   void cxios_field_valid_id (bool * _ret, const char * _id, int _id_len)
    {
       std::string id;
@@ -256 +256 @@
    }
 
-   void xios_fieldgroup_valid_id (bool * _ret, const char * _id, int _id_len)
+   void cxios_fieldgroup_valid_id (bool * _ret, const char * _id, int _id_len)
    {
       std::string id;