Changes in XMLIO_SERVER/trunk/src/XMLIO/mod_dependency.f90 [17:29]

File:

• XMLIO_SERVER/trunk/src/XMLIO/mod_dependency.f90 (modified) (14 diffs)

XMLIO_SERVER/trunk/src/XMLIO/mod_dependency.f90

@@ -5 +5 @@
 USE mod_axis
 USE mod_sorted_list
+USE mod_zoom
 
 TYPE file_dep
@@ -11 +12 @@
   TYPE(vector_field),POINTER   :: fields
   TYPE(vector_grid),POINTER    :: grids
+  TYPE(vector_zoom),POINTER    :: zooms
   TYPE(vector_axis),POINTER    :: axis
 END TYPE file_dep
@@ -26 +28 @@
   TYPE(axis),  POINTER  :: axis
   TYPE(grid),  POINTER  :: grid
+  TYPE(zoom),  POINTER  :: zoom
 END TYPE field_out
 
@@ -32 +35 @@
 INCLUDE 'vector_field_out_def.inc'
 
-TYPE(vector_file_dep),POINTER      :: file_enabled
-TYPE(vector_field_out),POINTER     :: field_enabled 
-TYPE(vector_field_dep),POINTER     :: field_id
+TYPE(vector_file_dep),POINTER,SAVE      :: file_enabled
+TYPE(vector_field_out),POINTER,SAVE     :: field_enabled 
+TYPE(vector_field_dep),POINTER,SAVE     :: field_id
 
  
-TYPE(sorted_list),POINTER :: sorted_id
+TYPE(sorted_list),POINTER,SAVE :: sorted_id
 
 CONTAINS
@@ -45 +48 @@
 INCLUDE 'vector_field_out_contains.inc'
 
+  
+  SUBROUTINE dependency__swap_context(saved_file_enabled,saved_field_enabled,save_field_id,saved_sorted_id)  
+  IMPLICIT NONE
+    TYPE(vector_file_dep),POINTER      :: saved_file_enabled
+    TYPE(vector_field_out),POINTER     :: saved_field_enabled 
+    TYPE(vector_field_dep),POINTER     :: save_field_id
+    TYPE(sorted_list),POINTER          :: saved_sorted_id  
+    
+    file_enabled=>saved_file_enabled   
+    field_enabled=>saved_field_enabled
+    field_id=>save_field_id
+    sorted_id=>saved_sorted_id
+      
+  END SUBROUTINE dependency__swap_context
+  
   SUBROUTINE set_dependency
   IMPLICIT NONE
@@ -67 +85 @@
     TYPE (sorted_list),POINTER         :: sorted_axis
     TYPE (sorted_list),POINTER         :: sorted_grid
+    TYPE (sorted_list),POINTER         :: sorted_zoom
     INTEGER                            :: i
     INTEGER                            :: j
@@ -72 +91 @@
     ALLOCATE(sorted_axis)
     ALLOCATE(sorted_grid)
+    ALLOCATE(sorted_zoom)
     
     IF (PRESENT(Pt_file_group)) THEN
       Pt_fg=>Pt_file_group
     ELSE
-      ALLOCATE(file_enabled)
       CALL vector_file_dep__new(file_enabled)
       Pt_fg=>file_definition
@@ -92 +111 @@
         ALLOCATE(Pt_file_dep%fields)
         ALLOCATE(Pt_file_dep%grids)
+        ALLOCATE(Pt_file_dep%zooms)
         ALLOCATE(Pt_file_dep%axis)
         pt_file_dep%file=>pt_file
@@ -97 +117 @@
         CALL vector_field__new(Pt_file_dep%fields)
         CALL vector_grid__new(Pt_file_dep%grids)
+        CALL vector_zoom__new(Pt_file_dep%zooms)
         CALL vector_axis__new(Pt_file_dep%axis)
         CALL sorted_list__new(sorted_axis)
         CALL sorted_list__new(sorted_grid)
+        CALL sorted_list__new(sorted_zoom)
         
         CALL Treat_field_group(pt_file%field_list)
@@ -105 +127 @@
         CALL sorted_list__delete(sorted_axis)
         CALL sorted_list__delete(sorted_grid)
+        CALL sorted_list__delete(sorted_zoom)
       ENDIF
     ENDDO
@@ -138 +161 @@
               CALL vector_grid__set_new(pt_file_dep%grids,Pt_field%grid,pos)
               CALL sorted_list__add(sorted_grid,hash(Pt_field%grid%id),pos)
+            ENDIF
+          ENDIF
+
+          IF (Pt_field%has_zoom) THEN
+            CALL sorted_list__find(sorted_zoom,hash(Pt_field%zoom%id),pos,found)
+            IF (.NOT. found) THEN 
+              CALL vector_zoom__set_new(pt_file_dep%zooms,Pt_field%zoom,pos)
+              CALL sorted_list__add(sorted_zoom,hash(Pt_field%zoom%id),pos)
             ENDIF
           ENDIF
@@ -161 +192 @@
   INTEGER                  :: j
   
-    ALLOCATE(field_enabled)
     CALL vector_field_out__new(field_enabled)
     
@@ -172 +202 @@
         pt_field_out%axis=>pt_field_out%field%axis
         pt_field_out%grid=>pt_field_out%field%grid
+        pt_field_out%zoom=>pt_field_out%field%zoom
       ENDDO
     ENDDO
@@ -189 +220 @@
   INTEGER :: i
   
-    ALLOCATE(field_id)
     CALL vector_field_dep__new(field_id)
-
-    ALLOCATE(sorted_id)
     CALL sorted_list__new(sorted_id)