Changeset 42 for XMLIO_SERVER/trunk/src/XMLIO/mod_grid.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_grid.f90 (modified) (3 diffs)

XMLIO_SERVER/trunk/src/XMLIO/mod_grid.f90

@@ -30 +30 @@
   TYPE(sorted_list),POINTER,SAVE,PRIVATE     :: Ids 
 
+  INTERFACE grid__set_attribut
+    MODULE PROCEDURE grid__set_attribut_id,grid__set_attribut_pt
+  END INTERFACE
+
 CONTAINS
   INCLUDE 'vector_grid_contains.inc'
@@ -121 +125 @@
 
 
-  SUBROUTINE grid__set_attribut(id,attrib)
+  SUBROUTINE grid__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(grid),POINTER              :: Pt_grid
+    INTEGER                         :: Pos
+    LOGICAL                         :: success
+    
+    CALL sorted_list__find(Ids,hash(Id),Pos,success)
+    IF (success) THEN
+      Pt_grid=>grid_ids%at(Pos)%Pt
+      CALL grid__set_attribut_pt(Pt_grid,attrib)
+      IF (PRESENT(OK)) OK=.TRUE.
+    ELSE
+      IF (.NOT.PRESENT(OK)) THEN
+        WRITE(message,*) 'grid id :',id,'is undefined'
+        CALL error('mod_grid::grid__set_attribut')
+      ELSE
+        OK=.FALSE.
+      ENDIF
+    ENDIF  
+  
+  END SUBROUTINE grid__set_attribut_id
+      
+  SUBROUTINE grid__set_attribut_pt(Pt_grid,attrib)
   USE mod_attribut
   USE mod_grid_attribut
   USE error_msg
   IMPLICIT NONE
-    CHARACTER(LEN=*),INTENT(IN) :: id
+    TYPE(grid),POINTER        :: Pt_grid
     TYPE(attribut),INTENT(IN) :: attrib
-
-    TYPE(grid),POINTER              :: Pt_grid
-    INTEGER                         :: Pos
-    LOGICAL                         :: success
-    
-    CALL sorted_list__find(Ids,hash(Id),Pos,success)
-    IF (success) THEN
-      Pt_grid=>grid_ids%at(Pos)%Pt
-    ELSE
-      WRITE(message,*) 'grid id :',id,'is undefined'
-      CALL error('mod_grid::grid__set_attribut')
-    ENDIF  
     
     SELECT CASE(attrib%name)
@@ -148 +168 @@
      END SELECT
 
-     WRITE(message,*) 'grid id ',id,' : Attribute type is incompatible with the provided value'
+     WRITE(message,*) 'grid attribut ',attrib%name,' : type :',attrib%type,' : Attribute type is incompatible with the provided value'
      CALL error('mod_grid::grid__set_attribut')
     
-  END SUBROUTINE grid__set_attribut
+  END SUBROUTINE grid__set_attribut_pt
   
   SUBROUTINE grid__set_dimension(pt_grid, ni, nj)