Changeset 529 for XIOS/branchs

Timestamp:

12/04/14 15:36:07 (9 years ago)

Author:

aclsce

Message:

• Added xios_variable as public type (in order to be used by the xios client)
• Added example of getting/setting variable as global/local attribute of field/file in test_complete.
• Some cleaning in test_complete program and xml files.

Location:

XIOS/branchs/xios-1.0

Files:

• inputs/COMPLETE/context_atmosphere.xml (modified) (2 diffs)
• inputs/COMPLETE/context_surface.xml (modified) (3 diffs)
• src/interface/fortran/ixios.F90 (modified) (1 diff)
• src/test/test_complete.f90 (modified) (13 diffs)

XIOS/branchs/xios-1.0/inputs/COMPLETE/context_atmosphere.xml

@@ -1 +1 @@
 <!-- Context atm -->
   
-<context id="atmopshere" calendar_type="Gregorian" start_date="2012-03-01 15:00:00" time_origin="2012-02-29 15:00:00">
+<context id="atmosphere" calendar_type="Gregorian" start_date="2012-03-01 15:00:00" time_origin="2012-02-29 15:00:00">
 
   <field_definition level="1" enabled=".FALSE." default_value="9.96921e+36">
@@ -26 +26 @@
    </domain_definition>    
   
-   <grid_definition />    
-  
 </context>

XIOS/branchs/xios-1.0/inputs/COMPLETE/context_surface.xml

@@ -24 +24 @@
       <field field_ref="field_A_srf" name="field_A_srf_prec4" prec="8"/>
       <field field_ref="field_A_srf_max" name="field_A_srf_mean_max" long_name="Average of hourly maximum over 6h" operation="average" freq_op="1h" > @field_A_srf_max </field>
-      <variable id="my_global_attribute" type="string" >file_6h</variable>
+      <variable id="my_global_attribute_xml" type="string" >file_6h</variable>
     </file>
 
@@ -39 +39 @@
       <field field_ref="field_A_srf" name="field_A_srf_prec4" prec="8"/>
       <field field_ref="field_A_srf_max" name="field_A_srf_mean_max" long_name="Average of hourly maximum over 1d" operation="average" freq_op="1h" > @field_A_srf_max </field>
-      <variable id="my_global_attribute" type="string" >file_1d</variable>
     </file>
   </file_definition>
@@ -51 +50 @@
    </domain_definition>    
   
-   <grid_definition />    
-  
 </context>

XIOS/branchs/xios-1.0/src/interface/fortran/ixios.F90

@@ -157 +157 @@
 
  PUBLIC :: txios(domain), txios(domaingroup),txios(field), txios(fieldgroup),txios(file), txios(filegroup), &
-          txios(grid), txios(gridgroup), txios(axis), txios(axisgroup),txios(context), txios(date),txios(time)
+          txios(grid), txios(gridgroup), txios(axis), txios(axisgroup),txios(context), txios(date),         &
+          txios(time), txios(variable)
 
  PUBLIC :: xios(set_attr), xios(set_domain_attr), xios(set_domaingroup_attr), xios(set_fieldgroup_attr), &

XIOS/branchs/xios-1.0/src/test/test_complete.f90

@@ -20 +20 @@
   TYPE(xios_fieldgroup) :: fieldgroup_hdl
   TYPE(xios_file) :: file_hdl
+  TYPE(xios_variable) :: var_hdl
   LOGICAL :: ok
-  CHARACTER(len=256) :: crname
-
+  CHARACTER(len=256) :: crname, str_temp
   DOUBLE PRECISION,DIMENSION(ni_glo,nj_glo) :: lon_glo,lat_glo
   DOUBLE PRECISION :: field_A_glo(ni_glo,nj_glo,llm)
@@ -29 +29 @@
   INTEGER :: ni,ibegin,iend,nj,jbegin,jend
   INTEGER :: i,j,l,ts,n, nb_pt
+  INTEGER :: iret
 
 !!! MPI Initialization
@@ -45 +46 @@
 
 !###########################################################################
-! Contexte ATM
-!###########################################################################
-
-!!! Initialisation des coordonnées globales et locales pour la grille réguliÚre
+! ATM Context
+!###########################################################################
+
+!!! Initialization of global and local coordinates for regular grid
 
   DO j=1,nj_glo
@@ -77 +78 @@
  
 
-!!! Context ATMOSPHERE
+!!! ATMOSPHERE context
 
   CALL xios_context_initialize("atmosphere",comm)
@@ -97 +98 @@
   CALL xios_set_domain_attr("domain_atm_zoom",lonvalue=RESHAPE(lon,(/ni*nj/)),latvalue=RESHAPE(lat,(/ni*nj/)))
 
-!!! Activation du groupe field_definition
+!!! field_definition group activation
 
   CALL xios_set_fieldgroup_attr("field_definition",enabled=.TRUE.)
 
-!!! Création d un nouveau champ 
+!!! Creation of new field
 
   CALL xios_get_handle("field_definition",fieldgroup_hdl)
   CALL xios_add_child(fieldgroup_hdl,field_hdl,"field_B_atm")
 
-!!! Heritage des attributs d un autre champ
+!!! Attribute inheritance from another field 
 
   CALL xios_set_attr(field_hdl,field_ref="field_A_atm",name="field_B_atm")
   
-!!! Affectation de ce nouveau champ au fichier avec un nouveau nom
+!!! Assign new field into a file (with a new name)
 
   CALL xios_get_handle("output_atmosphere",file_hdl)
@@ -116 +117 @@
   CALL xios_set_attr(field_hdl,field_ref="field_B_atm",name="field_C_atm")
     
-!!! Definition du timestep
+!!! Timestep definition 
 
   dtime%second=3600
   CALL xios_set_timestep(dtime) 
     
-!!! Recupration des valeurs des longitudes et de taille des domaines locaux (pour test de fonctionnalité)
+!!! Get longitude values and local domain sizes (to check functionality)
 
   ni=0 ; lonvalue(:)=0
@@ -129 +130 @@
   PRINT *,"lonvalue",lonvalue ;
 
-!!! Fin de la definition du contexte
+!!! End of context definition
 
   CALL xios_close_context_definition()
 
-!!! Test des valeurs des champs/fichiers
-  
-  !!! Attribut defini ? 
+!!! Test on fields/files values
+  
+  !!! Is an attribute defined ?
 
   CALL xios_is_defined_field_attr("field_A_atm",enabled=ok)
   PRINT *,"field_A_atm : attribute enabled is defined ? ",ok
 
-  !!! Recuperer la valeur d un attribut
+  !!! Get an attibute value
   
   CALL xios_get_field_attr("field_A_atm",name=crname)
   PRINT *,"field_A_atm : attribute name is : ",TRIM(crname)
 
-  !!! Champ actif (besoin de fournir la valeur) ? 
+  !!! Is a field active (i.e need to give the value ) ?
 
     PRINT*,"field field_A_atm is active ? ",xios_field_is_active("field_A_atm")
 
-  !!! Champ defini ?
+  !!! Is a field defined ?
 
     PRINT*,"field field_A_atm is valid ?",xios_is_valid_field("field_A_atm")
@@ -155 +156 @@
 
 !###########################################################################
-! Contexte SRF
-!###########################################################################
-
-!!! Initialisation des coordonnées globales et locales pour la grille indexee (1 point sur 2)
+! SRF Context
+!###########################################################################
+
+!!! Initialization of global and local coordinates for indexed grid (1 point every 2 points)
 
     nb_pt=ni*nj/2
@@ -181 +182 @@
   CALL xios_set_domain_attr("domain_srf",lonvalue=RESHAPE(lon,(/ni*nj/)),latvalue=RESHAPE(lat,(/ni*nj/)))
 
-!!! Création d un nouveau champ 
+!!! Creation of new field 
 
   CALL xios_get_handle("field_definition",fieldgroup_hdl)
   CALL xios_add_child(fieldgroup_hdl,field_hdl,"field_B_srf")
 
-!!! Heritage des attributs d un autre champ
+!!! Attribute inheritance from another field 
 
   CALL xios_set_attr(field_hdl,field_ref="field_A_srf",name="field_B_srf")
-  
-!!! Affectation de ce nouveau champ au fichier avec un nouveau nom
+
+!!! Assign new field into a file (with a new name)
 
   CALL xios_get_handle("output_surface",file_hdl)
   CALL xios_add_child(file_hdl,field_hdl)
   CALL xios_set_attr(field_hdl,field_ref="field_B_srf",name="field_C_srf")
-    
-!!! Definition du timestep
+
+!!! Add a variable as field local attribute
+
+  CALL xios_add_child(field_hdl,var_hdl,"my_local_attribute")
+  CALL xios_set_attr(var_hdl,type="string")
+  iret=xios_setVar("my_local_attribute","attribute_local")
+
+!!! Add a variable as file global attribute
+
+  CALL xios_add_child(file_hdl,var_hdl,"my_global_attribute")
+  CALL xios_set_attr(var_hdl,type="string")
+  iret=xios_setVar("my_global_attribute","attribute_global")
+
+!!! Modify a variable used as attribute (defined in xml file)
+
+  iret=xios_setVar("my_global_attribute_xml","6h_file")
+
+!!! Get the value of a variable (defined in xml file)
+  
+  iret=xios_getVar("my_attribute1",str_temp)
+  PRINT *, "my_attribute1 is :",TRIM(str_temp)
+      
+!!! Timestep definition
 
   dtime%second=1800
   CALL xios_set_timestep(dtime) 
     
-!!! Recupration des valeurs des longitudes et de taille des domaines locaux (pour test de fonctionnalité)
+!!! Get longitude values and local domain sizes (to check functionality)
 
   ni=0 ; lonvalue(:)=0
@@ -209 +231 @@
   PRINT *,"lonvalue",lonvalue ;
 
-!!! Fin de la definition du contexte SRF
+!!! End of SRF context definition
 
   CALL xios_close_context_definition()
 
-
-!####################################################################################
-!!! Boucle temporelle
+!####################################################################################
+!!! Loop on timesteps
 !####################################################################################
 
@@ -223 +244 @@
       CALL xios_set_current_context(ctx_hdl)    
 
-!!! Mise a jour du pas de temps
+!!! Update of calendar 
 
       CALL xios_update_calendar(ts)
 
-!!! On donne la valeur du champ atm
+!!! Put the value of atm field
 
       CALL xios_send_field("field_A_atm",field_A_atm)
 
-!!! On change de contexte
+!!! Change of context 
 
       CALL xios_get_handle("surface",ctx_hdl)
       CALL xios_set_current_context(ctx_hdl)    
 
-!!! Mise a jour du pas de temps
+!!! Update of calendar 
 
       CALL xios_update_calendar(ts)
 
-!!! On donne la valeur du champ srf
+!!! Put the value of srf field
 
       CALL xios_send_field("field_A_srf",field_A_srf)
@@ -248 +269 @@
 
 !####################################################################################
-!!! Finalisation
-!####################################################################################
-
-!!! Fin des contextes
-    
+!!! Finalization
+!####################################################################################
+
+!!! End of contextes
+
     CALL xios_context_finalize()
     CALL xios_get_handle("atmosphere",ctx_hdl)
@@ -258 +279 @@
     CALL xios_context_finalize()
     
-!!! Fin de XIOS
+!!! End of XIOS
 
     CALL xios_finalize()