Changeset 35


Ignore:
Timestamp:
04/23/09 16:57:31 (16 years ago)
Author:
ymipsl
Message:
 
Location:
XMLIO_SERVER/trunk/src/XMLIO
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • XMLIO_SERVER/trunk/src/XMLIO/mod_context.f90

    r29 r35  
    3131    TYPE(vector_field_group),POINTER  :: field_group__field_group_ids 
    3232    TYPE(sorted_list),POINTER         :: field_group__Ids 
    33     TYPE(field_group),POINTER         :: field_definition__field_definition 
     33    TYPE(field_group),POINTER         :: field_definition__field_def 
    3434    TYPE(vector_file),POINTER         :: file__file_Ids 
    3535    TYPE(sorted_list),POINTER         :: file__Ids 
    3636    TYPE(vector_file_group),POINTER   :: file_group__file_group_Ids 
    3737    TYPE(sorted_list),POINTER         :: file_group__Ids  
    38     TYPE(file_group),POINTER          :: file_definition__file_definition  
     38    TYPE(file_group),POINTER          :: file_definition__file_def  
    3939    TYPE(vector_grid),POINTER         :: grid__grid_Ids 
    4040    TYPE(sorted_list),POINTER         :: grid__Ids  
    … …  
    4343    TYPE(vector_grid_group),POINTER   :: grid_group__grid_group_Ids 
    4444    TYPE(sorted_list),POINTER         :: grid_group__Ids  
    45     TYPE(grid_group),POINTER          :: grid_definition__grid_definition 
     45    TYPE(grid_group),POINTER          :: grid_definition__grid_def 
    4646    TYPE(vector_axis),POINTER         :: axis__axis_Ids 
    4747    TYPE(sorted_list),POINTER         :: axis__Ids  
    4848    TYPE(vector_axis_group),POINTER   :: axis_group__axis_group_Ids 
    4949    TYPE(sorted_list),POINTER         :: axis_group__Ids  
    50     TYPE(axis_group),POINTER          :: axis_definition__axis_definition 
     50    TYPE(axis_group),POINTER          :: axis_definition__axis_def 
    5151    TYPE(vector_file_dep),POINTER     :: dependency__file_enabled 
    5252    TYPE(vector_field_out),POINTER    :: dependency__field_enabled  
    … …  
    120120        ALLOCATE(pt_context%field_group__field_group_ids ) 
    121121        ALLOCATE(pt_context%field_group__Ids ) 
    122         ALLOCATE(pt_context%field_definition__field_definition ) 
     122        ALLOCATE(pt_context%field_definition__field_def ) 
    123123        ALLOCATE(pt_context%file__file_Ids) 
    124124        ALLOCATE(pt_context%file__Ids) 
    125125        ALLOCATE(pt_context%file_group__file_group_Ids) 
    126126        ALLOCATE(pt_context%file_group__Ids)  
    127         ALLOCATE(pt_context%file_definition__file_definition)  
     127        ALLOCATE(pt_context%file_definition__file_def)  
    128128        ALLOCATE(pt_context%grid__grid_Ids) 
    129129        ALLOCATE(pt_context%grid__Ids)  
    … …  
    132132        ALLOCATE(pt_context%grid_group__grid_group_Ids) 
    133133        ALLOCATE(pt_context%grid_group__Ids)  
    134         ALLOCATE(pt_context%grid_definition__grid_definition) 
     134        ALLOCATE(pt_context%grid_definition__grid_def) 
    135135        ALLOCATE(pt_context%axis__axis_Ids) 
    136136        ALLOCATE(pt_context%axis__Ids)  
    137137        ALLOCATE(pt_context%axis_group__axis_group_Ids) 
    138138        ALLOCATE(pt_context%axis_group__Ids)  
    139         ALLOCATE(pt_context%axis_definition__axis_definition) 
     139        ALLOCATE(pt_context%axis_definition__axis_def) 
    140140        ALLOCATE(pt_context%dependency__file_enabled) 
    141141        ALLOCATE(pt_context%dependency__field_enabled)  
    … …  
    212212      CALL field__swap_context(Pt_context%field__field_Ids ,Pt_context%field__Ids) 
    213213      CALL field_group__swap_context(Pt_context%field_group__field_group_ids ,Pt_context%field_group__Ids) 
    214       CALL field_definition__swap_context(Pt_context%field_definition__field_definition) 
     214      CALL field_definition__swap_context(Pt_context%field_definition__field_def) 
    215215      CALL file__swap_context(Pt_context%file__file_Ids,Pt_context%file__Ids) 
    216216      CALL file_group__swap_context(Pt_context%file_group__file_group_Ids,Pt_context%file_group__Ids) 
    217       CALL file_definition__swap_context(Pt_context%file_definition__file_definition)  
     217      CALL file_definition__swap_context(Pt_context%file_definition__file_def)  
    218218      CALL grid__swap_context(pt_context%grid__grid_Ids,pt_context%grid__Ids)  
    219219      CALL zoom__swap_context(pt_context%zoom__zoom_Ids,pt_context%zoom__Ids)  
    220220      CALL grid_group__swap_context(pt_context%grid_group__grid_group_Ids,pt_context%grid_group__Ids)  
    221       CALL grid_definition__swap_context(pt_context%grid_definition__grid_definition) 
     221      CALL grid_definition__swap_context(pt_context%grid_definition__grid_def) 
    222222      CALL axis__swap_context(pt_context%axis__axis_Ids,pt_context%axis__Ids)  
    223223      CALL axis_group__swap_context(pt_context%axis_group__axis_group_Ids,pt_context%axis_group__Ids)  
    224       CALL axis_definition__swap_context(pt_context%axis_definition__axis_definition) 
     224      CALL axis_definition__swap_context(pt_context%axis_definition__axis_def) 
    225225      CALL dependency__swap_context(pt_context%dependency__file_enabled,pt_context%dependency__field_enabled,  & 
    226226                                    pt_context%dependency__field_id,pt_context%dependency__sorted_id) 

  • XMLIO_SERVER/trunk/src/XMLIO/mod_field.f90

    r29 r35  
    133133 
    134134 
    135  SUBROUTINE field__set(p_field, name, ref, description, unit, operation, freq_op, axis_ref, grid_ref, zoom_ref, prec, level, enabled) 
     135 SUBROUTINE field__set(p_field, name, ref, description, unit, operation, freq_op, axis_ref, grid_ref, zoom_ref, prec, level, & 
     136                       enabled) 
    136137 
    137138    TYPE(field), pointer :: p_field 
Note: See TracChangeset for help on using the changeset viewer.