Changeset 42 for XMLIO_SERVER/trunk/src/XMLIO/mod_axis.f90

Timestamp:

10/30/09 16:29:39 (15 years ago)

Author:

ymipsl

Message:

Correction bug sur les ids des file_group
+ possibilité de fixer les attributs des groupes à partir de l'ioserver

File:

• XMLIO_SERVER/trunk/src/XMLIO/mod_axis.f90 (modified) (3 diffs)

XMLIO_SERVER/trunk/src/XMLIO/mod_axis.f90

@@ -29 +29 @@
   TYPE(vector_axis),POINTER,SAVE             :: axis_Ids
   TYPE(sorted_list),POINTER,SAVE,PRIVATE     :: Ids 
+
+  INTERFACE axis__set_attribut
+    MODULE PROCEDURE axis__set_attribut_id,axis__set_attribut_pt
+  END INTERFACE
 
 CONTAINS
@@ -137 +141 @@
   END SUBROUTINE axis__set
 
-  SUBROUTINE axis__set_attribut(id,attrib)
+  SUBROUTINE axis__set_attribut_id(id,attrib,ok)
+  USE mod_attribut
+  USE error_msg
+  IMPLICIT NONE
+    CHARACTER(LEN=*),INTENT(IN)   :: id
+    TYPE(attribut),INTENT(IN)     :: attrib
+    LOGICAL,OPTIONAL,INTENT(OUT)  :: ok
+    
+    TYPE(axis),POINTER              :: Pt_axis
+    INTEGER                         :: Pos
+    LOGICAL                         :: success
+    
+    CALL sorted_list__find(Ids,hash(Id),Pos,success)
+    IF (success) THEN
+      Pt_axis=>axis_ids%at(Pos)%Pt
+      CALL axis__set_attribut_pt(Pt_axis,attrib)
+      IF (PRESENT(OK)) OK=.TRUE.
+    ELSE
+      IF (.NOT.PRESENT(OK)) THEN
+        WRITE(message,*) 'axis id :',id,'is undefined'
+        CALL error('mod_axis::axis__set_attribut')
+      ELSE
+        OK=.FALSE.
+      ENDIF
+    ENDIF  
+  
+  END SUBROUTINE axis__set_attribut_id
+      
+  SUBROUTINE axis__set_attribut_pt(Pt_axis,attrib)
   USE mod_attribut
   USE mod_axis_attribut
   USE error_msg
   IMPLICIT NONE
-    CHARACTER(LEN=*),INTENT(IN) :: id
+    TYPE(axis),POINTER        :: Pt_axis
     TYPE(attribut),INTENT(IN) :: attrib
-
-    TYPE(axis),POINTER              :: Pt_axis
-    INTEGER                         :: Pos
-    LOGICAL                         :: success
-    
-    CALL sorted_list__find(Ids,hash(Id),Pos,success)
-    IF (success) THEN
-      Pt_axis=>axis_ids%at(Pos)%Pt
-    ELSE
-      WRITE(message,*) 'axis id :',id,'is undefined'
-      CALL error('mod_axis::axis__set_attribut')
-    ENDIF  
     
     SELECT CASE(attrib%name)
@@ -172 +192 @@
        END SELECT
 
-     WRITE(message,*) 'axis id ',id,' : Attribute type is incompatible with the provided value'
+     WRITE(message,*) 'axis attribut ',attrib%name,' : type :',attrib%type,' : Attribute type is incompatible with the provided value'
      CALL error('mod_axis::axis__set_attribut')
     
-  END SUBROUTINE axis__set_attribut
+  END SUBROUTINE axis__set_attribut_pt
   
   SUBROUTINE axis__print(pt_axis)