Changeset 743 for XIOS/trunk/src/node/domain.cpp

Timestamp:

10/19/15 17:41:35 (9 years ago)

Author:

mhnguyen

Message:

Processing pole of rectangular grid with latitude = 90

+) Use average value of all points with latitude 90 (-90)

Test
+) On Curie
+) test_remap pass

File:

• XIOS/trunk/src/node/domain.cpp (modified) (2 diffs)

XIOS/trunk/src/node/domain.cpp

@@ -375 +375 @@
    }
 
-   void CDomain::fillInRectilinearBoundLonLat(CArray<double,2>& boundsLon, CArray<double,2>& boundsLat)
+   void CDomain::fillInRectilinearBoundLonLat(CArray<double,2>& boundsLon, CArray<double,2>& boundsLat,
+                                              bool isNorthPole, bool isSouthPole)
    {
      int i,j,k;
@@ -397 +398 @@
          boundsLon(2,k) = boundsLon(3,k) = ((ibegin + i + 1) != ni_glo) ? (ibegin + i +1) * lonStep + bounds_lon_start
                                                                         : bounds_lon_end;
-
+       }
+
+     double bounds_lat_start_pole = bounds_lat_start;
+     double bounds_lat_end_pole   = bounds_lat_end;
+     if (isNorthPole) bounds_lat_start_pole = lat_start;
+     if (isSouthPole) bounds_lat_end_pole   = lat_end;
+
+     for(j=0;j<nj;++j)
+       for(i=0;i<ni;++i)
+       {
+         k=j*ni+i;
          boundsLat(1,k) = boundsLat(2,k) = (0 != (jbegin + j)) ? (jbegin + j) * latStep + bounds_lat_start
-                                                               : bounds_lat_start;
+                                                               : bounds_lat_start_pole;
          boundsLat(0,k) = boundsLat(3,k) = ((jbegin + j +1) != nj_glo) ? (jbegin + j +1) * latStep + bounds_lat_start
-                                                               : bounds_lat_end;
+                                                               : bounds_lat_end_pole;
        }
    }