Changeset 554 for XIOS/trunk/src/test

Timestamp:

02/11/15 16:23:16 (9 years ago)

Author:

mhnguyen

Message:

Changing interface of tests to make sure global index begins at zero (0)

+) In all tests, ibegin, jbegin starts at zero (0), so there are some minor changes in field_glo
+) Improve a littel bit class design

Test
+) On Curie,
+) All test passed and results are the same as before

Location:

XIOS/trunk/src/test

Files:

• test_client.f90 (modified) (2 diffs)
• test_complete.f90 (modified) (3 diffs)

XIOS/trunk/src/test/test_client.f90

@@ -52 +52 @@
     ENDDO
   ENDDO
-  ni=ni_glo ; ibegin=1
+  ni=ni_glo ; ibegin=0
 
-  jbegin=1
+  jbegin=0
   DO n=0,size-1
     nj=nj_glo/size
@@ -65 +65 @@
 
   ALLOCATE(lon(ni,nj),lat(ni,nj),field_A(0:ni+1,-1:nj+2,llm),lonvalue(ni*nj))
-  lon(:,:)=lon_glo(ibegin:iend,jbegin:jend)
-  lat(:,:)=lat_glo(ibegin:iend,jbegin:jend)
-  field_A(1:ni,1:nj,:)=field_A_glo(ibegin:iend,jbegin:jend,:)
+  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,:)
 
   CALL xios_context_initialize("test",comm)

XIOS/trunk/src/test/test_complete.f90

@@ -59 +59 @@
     ENDDO
   ENDDO
-  ni=ni_glo ; ibegin=1
-
-  jbegin=1
+  ni=ni_glo ; ibegin=0
+
+  jbegin=0
   DO n=0,size_loc-1
     nj=nj_glo/size_loc
@@ -72 +72 @@
 
   ALLOCATE(lon(ni,nj),lat(ni,nj),field_A_atm(0:ni+1,-1:nj+2,llm),lonvalue(ni*nj))
-  lon(:,:)=lon_glo(ibegin:iend,jbegin:jend)
-  lat(:,:)=lat_glo(ibegin:iend,jbegin:jend)
-  field_A_atm(1:ni,1:nj,:)=field_A_glo(ibegin:iend,jbegin:jend,:)
+  lon(:,:)=lon_glo(ibegin+1:iend+1,jbegin+1:jend+1)
+  lat(:,:)=lat_glo(ibegin+1:iend+1,jbegin+1:jend+1)
+  field_A_atm(1:ni,1:nj,:)=field_A_glo(ibegin+1:iend+1,jbegin+1:jend+1,:)
 
 
@@ -165 +165 @@
       kindex(i)=2*i-1
     ENDDO
-    field_A_srf(1:nb_pt,:)=RESHAPE(field_A_glo(ibegin:iend:2,jbegin:jend,:),(/ nb_pt,llm /))
+    field_A_srf(1:nb_pt,:)=RESHAPE(field_A_glo(ibegin+1:iend+1:2,jbegin+1:jend+1,:),(/ nb_pt,llm /))
 
   CALL xios_context_initialize("surface",comm)