Changeset 29 for XMLIO_SERVER/trunk/src/XMLIO/mod_field.f90

Timestamp:

04/15/09 17:34:38 (15 years ago)

Author:

ymipsl

Message:

New Features :

• Les zoom sont maintenant utilisables.
• Lorsqu'un serveur ne sort pas de données dans un fichier, le fichier n'est pas crée.
• Lorsqu'un serveur est le seul a sortir un fichier, l'indexation par numero de process est supprimé.
• Les axes verticaux ont maintenant un attribut << positive [TRUE/FALSE]>>

File:

• XMLIO_SERVER/trunk/src/XMLIO/mod_field.f90 (modified) (11 diffs)

XMLIO_SERVER/trunk/src/XMLIO/mod_field.f90

@@ -5 +5 @@
   USE mod_axis
   USE mod_grid
-    
+  USE mod_zoom
+   
   IMPLICIT NONE
 
@@ -25 +26 @@
     CHARACTER(len=str_len)         :: grid_ref
     LOGICAL                        :: has_grid_ref
+    CHARACTER(len=str_len)         :: zoom_ref
+    LOGICAL                        :: has_zoom_ref
     INTEGER                        :: level
     LOGICAL                        :: has_level
@@ -40 +43 @@
     TYPE(grid),POINTER             :: grid
     LOGICAL                        :: has_grid
+    TYPE(zoom),POINTER             :: zoom
+    LOGICAL                        :: has_zoom
     INTEGER                        :: internal(internal_field)
     
@@ -107 +112 @@
    pt_field%has_axis_ref = .FALSE.
    pt_field%has_grid_ref = .FALSE.
+   pt_field%has_zoom_ref = .FALSE.
    pt_field%has_prec = .FALSE.
    pt_field%has_level = .FALSE. 
@@ -115 +121 @@
    Pt_field%has_axis=.FALSE.
    Pt_field%has_grid=.FALSE.
+   Pt_field%has_zoom=.FALSE.
       
    IF (PRESENT(Id)) THEN
@@ -126 +133 @@
 
 
- SUBROUTINE field__set(p_field, name, ref, description, unit, operation, freq_op, axis_ref, grid_ref, prec, level, enabled)
+ SUBROUTINE field__set(p_field, name, ref, description, unit, operation, freq_op, axis_ref, grid_ref, zoom_ref, prec, level, enabled)
 
     TYPE(field), pointer :: p_field
@@ -137 +144 @@
     CHARACTER(len=*),OPTIONAL :: axis_ref
     CHARACTER(len=*),OPTIONAL :: grid_ref
+    CHARACTER(len=*),OPTIONAL :: zoom_ref
     INTEGER, OPTIONAL :: prec
     INTEGER, OPTIONAL :: level
@@ -174 +182 @@
         p_field%has_grid_ref = .TRUE.
     ENDIF
+
+    IF (PRESENT(zoom_ref)) THEN
+        p_field%zoom_ref=TRIM(ADJUSTL(zoom_ref))
+        p_field%has_zoom_ref = .TRUE.
+    ENDIF
+
     IF (PRESENT(prec)) then
         p_field%prec=prec
@@ -240 +254 @@
     ELSE
         PRINT *, 'grid_ref undefined '
+    ENDIF
+
+    IF (pt_field%has_zoom_ref) THEN
+        PRINT *, 'zoom_ref : ',TRIM(pt_field%zoom_ref)
+    ELSE
+        PRINT *, 'zoom_ref undefined '
     ENDIF
     
@@ -378 +398 @@
     ELSE
         pt_field_out%has_grid_ref=.FALSE.
+    ENDIF
+
+    IF (pt_field_in%has_zoom_ref) THEN
+        pt_field_out%zoom_ref=pt_field_in%zoom_ref
+        pt_field_out%has_zoom_ref=.TRUE.
+    ELSE IF ( pt_field_default%has_zoom_ref ) THEN
+        pt_field_out%zoom_ref=pt_field_default%zoom_ref
+        pt_field_out%has_zoom_ref=.TRUE.
+    ELSE
+        pt_field_out%has_zoom_ref=.FALSE.
     ENDIF
 
@@ -526 +556 @@
  END SUBROUTINE field__solve_grid_ref
    
+ SUBROUTINE field__solve_zoom_ref(pt_field)
+ USE error_msg
+ IMPLICIT NONE
+   TYPE(field), POINTER :: pt_field
+   
+   IF (.NOT. pt_field%has_zoom_ref) THEN
+     IF (pt_field%has_grid_ref) THEN
+       pt_field%has_zoom_ref=.TRUE.
+       pt_field%zoom_ref=pt_field%grid_ref
+     ENDIF
+   ENDIF
+    
+   IF (pt_field%has_zoom_ref) THEN
+     CALL zoom__get(pt_field%zoom_ref,pt_field%zoom)
+     IF (ASSOCIATED(pt_field%zoom)) THEN
+       pt_field%has_zoom=.TRUE.
+     ELSE
+       WRITE (message,*) "The field : id = ",pt_field%id,"  name = ",Pt_field%name,   &
+                        " has a unknown reference to zoom : id =",pt_field%zoom_ref
+       CALL error("mod_field::field__solve_zoom_ref")
+     ENDIF
+   ENDIF
+   
+ END SUBROUTINE field__solve_zoom_ref