Changeset 567 for XIOS/trunk/src/interface/fortran_attr/grid_interface_attr.F90

Timestamp:

03/10/15 10:49:02 (9 years ago)

Author:

mhnguyen

Message:

Implementing a grid formed by only one axis or group of axis

+) Add several new attributes to axis. From now on, each axis can be distributed on client side
+) Modify mask of grid to make it more flexible to different dimension
+) Fix some bugs relating to calculation of local data index on client
+) Clean some redundant codes

Test
+) On Curie, only test_new_features.f90
+) Test cases:

• Grid composed of: 1 domain and 1 axis, 3 axis, 1 axis
• Mode: Attached and connected
• No of client-server: 6-2(Connected), 2 (Attached)

+) All tests passed and results are correct

File:

• XIOS/trunk/src/interface/fortran_attr/grid_interface_attr.F90 (modified) (1 diff)

XIOS/trunk/src/interface/fortran_attr/grid_interface_attr.F90

@@ -52 +52 @@
     
     
-    SUBROUTINE cxios_set_grid_mask(grid_hdl, mask, extent1, extent2, extent3) BIND(C)
+    SUBROUTINE cxios_set_grid_mask1(grid_hdl, mask1, extent1) BIND(C)
       USE ISO_C_BINDING
       INTEGER (kind = C_INTPTR_T), VALUE       :: grid_hdl
-      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask
+      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask1
+      INTEGER (kind = C_INT), VALUE  :: extent1
+    END SUBROUTINE cxios_set_grid_mask1
+    
+    SUBROUTINE cxios_get_grid_mask1(grid_hdl, mask1, extent1) BIND(C)
+      USE ISO_C_BINDING
+      INTEGER (kind = C_INTPTR_T), VALUE       :: grid_hdl
+      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask1
+      INTEGER (kind = C_INT), VALUE  :: extent1
+    END SUBROUTINE cxios_get_grid_mask1
+    
+    FUNCTION cxios_is_defined_grid_mask1(grid_hdl ) BIND(C)
+      USE ISO_C_BINDING
+      LOGICAL(kind=C_BOOL) :: cxios_is_defined_grid_mask1
+      INTEGER (kind = C_INTPTR_T), VALUE :: grid_hdl
+    END FUNCTION cxios_is_defined_grid_mask1
+    
+    
+    SUBROUTINE cxios_set_grid_mask2(grid_hdl, mask2, extent1, extent2) BIND(C)
+      USE ISO_C_BINDING
+      INTEGER (kind = C_INTPTR_T), VALUE       :: grid_hdl
+      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask2
+      INTEGER (kind = C_INT), VALUE  :: extent1
+      INTEGER (kind = C_INT), VALUE  :: extent2
+    END SUBROUTINE cxios_set_grid_mask2
+    
+    SUBROUTINE cxios_get_grid_mask2(grid_hdl, mask2, extent1, extent2) BIND(C)
+      USE ISO_C_BINDING
+      INTEGER (kind = C_INTPTR_T), VALUE       :: grid_hdl
+      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask2
+      INTEGER (kind = C_INT), VALUE  :: extent1
+      INTEGER (kind = C_INT), VALUE  :: extent2
+    END SUBROUTINE cxios_get_grid_mask2
+    
+    FUNCTION cxios_is_defined_grid_mask2(grid_hdl ) BIND(C)
+      USE ISO_C_BINDING
+      LOGICAL(kind=C_BOOL) :: cxios_is_defined_grid_mask2
+      INTEGER (kind = C_INTPTR_T), VALUE :: grid_hdl
+    END FUNCTION cxios_is_defined_grid_mask2
+    
+    
+    SUBROUTINE cxios_set_grid_mask3(grid_hdl, mask3, extent1, extent2, extent3) BIND(C)
+      USE ISO_C_BINDING
+      INTEGER (kind = C_INTPTR_T), VALUE       :: grid_hdl
+      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask3
       INTEGER (kind = C_INT), VALUE  :: extent1
       INTEGER (kind = C_INT), VALUE  :: extent2
       INTEGER (kind = C_INT), VALUE  :: extent3
-    END SUBROUTINE cxios_set_grid_mask
+    END SUBROUTINE cxios_set_grid_mask3
     
-    SUBROUTINE cxios_get_grid_mask(grid_hdl, mask, extent1, extent2, extent3) BIND(C)
+    SUBROUTINE cxios_get_grid_mask3(grid_hdl, mask3, extent1, extent2, extent3) BIND(C)
       USE ISO_C_BINDING
       INTEGER (kind = C_INTPTR_T), VALUE       :: grid_hdl
-      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask
+      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask3
       INTEGER (kind = C_INT), VALUE  :: extent1
       INTEGER (kind = C_INT), VALUE  :: extent2
       INTEGER (kind = C_INT), VALUE  :: extent3
-    END SUBROUTINE cxios_get_grid_mask
+    END SUBROUTINE cxios_get_grid_mask3
     
-    FUNCTION cxios_is_defined_grid_mask(grid_hdl ) BIND(C)
+    FUNCTION cxios_is_defined_grid_mask3(grid_hdl ) BIND(C)
       USE ISO_C_BINDING
-      LOGICAL(kind=C_BOOL) :: cxios_is_defined_grid_mask
+      LOGICAL(kind=C_BOOL) :: cxios_is_defined_grid_mask3
       INTEGER (kind = C_INTPTR_T), VALUE :: grid_hdl
-    END FUNCTION cxios_is_defined_grid_mask
+    END FUNCTION cxios_is_defined_grid_mask3