Changeset 993 for XIOS/trunk/src/test

Timestamp:

11/18/16 11:41:40 (7 years ago)

Author:

oabramkina

Message:

Minor corrections for UGRID.

File:

• XIOS/trunk/src/test/test_regular.f90 (modified) (3 diffs)

XIOS/trunk/src/test/test_regular.f90

@@ -18 +18 @@
   INTEGER :: comm  
   INTEGER :: ierr
-  INTEGER :: size, rank
+  INTEGER :: sizeComm, rank    ! SIZE is a fortran function
 
-  INTEGER :: nlon = 100 
-  INTEGER :: nlat = 100
+  INTEGER :: nlon = 5 !100 
+  INTEGER :: nlat = 5 !100
   INTEGER :: ncell 
   INTEGER :: ilat, ilon, ind
@@ -94 +94 @@
 
   CALL MPI_COMM_RANK(comm,rank,ierr)
-  CALL MPI_COMM_SIZE(comm,size,ierr)
+  CALL MPI_COMM_SIZE(comm,sizeComm,ierr)
 
-  IF (MOD(ncell, size) == 0) THEN
-    ni = ncell/size
+  IF (MOD(ncell, sizeComm) == 0) THEN
+    ni = ncell/sizeComm
     ibegin = rank*ni
   ELSE
-    IF (rank < MOD(ncell, size)) THEN
-      ni = ncell/size + 1
-      ibegin = rank*(ncell/size + 1)
+    IF (rank < MOD(ncell, sizeComm)) THEN
+      ni = ncell/sizeComm + 1
+      ibegin = rank*(ncell/sizeComm + 1)
     ELSE
-      ni = ncell/size
-      IF (rank == MOD(ncell, size)) THEN
-        ibegin = rank*(ncell/size + 1)
+      ni = ncell/sizeComm
+      IF (rank == MOD(ncell, sizeComm)) THEN
+        ibegin = rank*(ncell/sizeComm + 1)
       ELSE
-        ibegin = MOD(ncell,size)*(ncell/size + 1) + (rank-MOD(ncell,size))*ncell/size
+        ibegin = MOD(ncell,sizeComm)*(ncell/sizeComm + 1) + (rank-MOD(ncell,sizeComm))*ncell/sizeComm
       END IF
     END IF
@@ -118 +118 @@
   ALLOCATE(bounds_lat(4,ni))
   ALLOCATE(field_temp(ni,ntime)) 
-  lon = lon_glo(1+ibegin:1+ibegin+ni)
-  lat = lat_glo(1+ibegin:1+ibegin+ni)
-  bounds_lon(:,:) = bounds_lon_glo(:,1+ibegin:1+ibegin+ni)
-  bounds_lat(:,:) = bounds_lat_glo(:,1+ibegin:1+ibegin+ni)
+  lon = lon_glo(1+ibegin:ibegin+ni)
+  lat = lat_glo(1+ibegin:ibegin+ni)
+  bounds_lon(:,:) = bounds_lon_glo(:,1+ibegin:ibegin+ni)
+  bounds_lat(:,:) = bounds_lat_glo(:,1+ibegin:ibegin+ni)
   field_temp(:,:) = rank