Changeset 567 for XIOS/trunk/src/test

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/test/test_new_features.f90 (modified) (6 diffs)

XIOS/trunk/src/test/test_new_features.f90

@@ -25 +25 @@
 
   DOUBLE PRECISION,DIMENSION(ni_glo,nj_glo) :: lon_glo,lat_glo
-  DOUBLE PRECISION :: field_A_glo(ni_glo,nj_glo,llm)
-  DOUBLE PRECISION,ALLOCATABLE :: lon(:,:),lat(:,:),field_A(:,:,:), lonvalue(:) ;
-  INTEGER :: ni,ibegin,iend,nj,jbegin,jend
+  DOUBLE PRECISION :: field_A_glo(ni_glo,nj_glo,llm), lval_ni(ni_glo), lval_nj(nj_glo)
+  DOUBLE PRECISION,ALLOCATABLE :: lon(:,:),lat(:,:),field_A(:,:,:), field_All_Axis(:,:,:), lonvalue(:) , field_Axis(:)
+  INTEGER :: ni,ibegin,iend,nj,jbegin,jend, nAxis, axisBegin, axisEnd
   INTEGER :: i,j,l,ts,n
 
@@ -47 +47 @@
       lon_glo(i,j)=(i-1)+(j-1)*ni_glo
       lat_glo(i,j)=1000+(i-1)+(j-1)*ni_glo
+      lval_ni(i) = i-1
       DO l=1,llm
         field_A_glo(i,j,l)=(i-1)+(j-1)*ni_glo+10000*l
       ENDDO
     ENDDO
+    lval_nj(j) = j-1
   ENDDO
   ni=ni_glo ; ibegin=0
@@ -61 +63 @@
     jbegin=jbegin+nj
   ENDDO
-
   iend=ibegin+ni-1 ; jend=jbegin+nj-1
 
-  ALLOCATE(lon(ni,nj),lat(ni,nj),field_A(0:ni+1,-1:nj+2,llm),lonvalue(ni*nj))
+  axisBegin = 0
+  nAxis = llm
+!  DO n=0, size -1
+!    nAxis = llm/size
+!    IF (n<MOD(llm,size)) nAxis=nAxis+1
+!    IF (n==rank) exit
+!    axisBegin=axisBegin+nAxis
+!  ENDDO
+  axisEnd=axisBegin+nAxis-1
+
+  ALLOCATE(lon(ni,nj),lat(ni,nj),field_A(0:ni+1,-1:nj+2,llm),lonvalue(ni*nj), field_Axis(nAxis), field_All_Axis(1:ni,1:nj,llm))
   lon(:,:)=lon_glo(ibegin+1:iend+1,jbegin+1:jend+1)
   lat(:,:)=lat_glo(ibegin+1:iend+1,jbegin+1:jend+1)
-  field_A(1:ni,1:nj,:)=field_A_glo(ibegin+1:iend+1,jbegin+1:jend+1,:)
+  field_A(1:ni,1:nj,:) = field_A_glo(ibegin+1:iend+1,jbegin+1:jend+1,:)
+  field_Axis(1:nAxis)  = field_A_glo(1,1,axisBegin+1:axisEnd+1)
+  field_All_Axis(1:ni,1:nj,:) = field_A_glo(ibegin+1:iend+1,jbegin+1:jend+1,:)
 
   CALL xios_context_initialize("test",comm)
@@ -73 +86 @@
   CALL xios_set_current_context(ctx_hdl)
 
-  CALL xios_get_calendar_type(calendar_type)
-  PRINT *, "calendar_type = ", calendar_type
+!  CALL xios_get_calendar_type(calendar_type)
+!  PRINT *, "calendar_type = ", calendar_type
 
-  CALL xios_set_axis_attr("axis_A",size=llm ,value=lval) ;
+  CALL xios_set_axis_attr("axis_A", size=ni_glo, ibegin=ibegin, ni=ni, value=lval_ni)
+  CALL xios_set_axis_attr("axis_B", size=nj_glo, ibegin=jbegin, ni=nj, value=lval_nj)
+  CALL xios_set_axis_attr("axis_C", size=llm, value=lval)
+  CALL xios_set_axis_attr("axis_D", size=llm, value=lval)
   CALL xios_set_domain_attr("domain_A",ni_glo=ni_glo, nj_glo=nj_glo, ibegin=ibegin, ni=ni,jbegin=jbegin,nj=nj)
   CALL xios_set_domain_attr("domain_A",data_dim=2, data_ibegin=-1, data_ni=ni+2, data_jbegin=-2, data_nj=nj+4)
@@ -89 +105 @@
   CALL xios_add_child(file_hdl,field_hdl)
   CALL xios_set_attr(field_hdl,field_ref="field_A",name="field_C")
+
+  CALL xios_get_handle("output_Axis",file_hdl)
+  CALL xios_add_child(file_hdl,field_hdl)
+  CALL xios_set_attr(field_hdl,field_ref="field_All_Axis",name="field_C")
 
   dtime%second = 3600
@@ -126 +146 @@
     CALL xios_update_calendar(ts)
     CALL xios_send_field("field_A",field_A)
+    CALL xios_send_field("field_Axis",field_Axis)
+    CALL xios_send_field("field_All_Axis",field_All_Axis)
     CALL wait_us(5000) ;
   ENDDO