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

Timestamp:

09/15/15 17:31:06 (9 years ago)

Author:

mhnguyen

Message:

Integrating remap library into XIOS

+) Change name of some files of remap library to be compatible with XIOS
+) Implement function to fill in automatically boundary longitude and latitude

Test
+) On Curie
+) test_remap correct

File:

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

XIOS/trunk/src/node/domain.cpp

@@ -215 +215 @@
         else
         {
+          float njGlo = nj_glo.getValue();
+          float niGlo = ni_glo.getValue();
+          int nbProcOnX, nbProcOnY, range;
+
           // Compute (approximately) number of segment on x and y axis
-          float yOverXRatio = (nj_glo.getValue())/(ni_glo.getValue());
-          int nbProcOnX, nbProcOnY, range;
+          float yOverXRatio = njGlo/niGlo;
+
           nbProcOnX = std::ceil(std::sqrt(nbLocalDomain/yOverXRatio));
           nbProcOnY = std::ceil(((float)nbLocalDomain)/nbProcOnX);
@@ -266 +270 @@
         // Now fill other attributes
         fillInRectilinearLonLat();
+//        fillInRectilinearBoundLonLat();
      }
    }
@@ -280 +285 @@
      lonvalue_1d.resize(ni);
      latvalue_1d.resize(nj);
+
      double lonStep = double(360/ni_glo.getValue());
      double latStep = double(180/nj_glo.getValue());
@@ -286 +292 @@
      for (int i = 0; i < ni; ++i)
      {
-       lonvalue_1d(i) = static_cast<double>(ibegin + i) * lonStep;
+       lonvalue_1d(i) = static_cast<double>(ibegin + i) * lonStep -180 + lonStep/2;
      }
 
      for (int j = 0; j < nj; ++j)
      {
-       latvalue_1d(j) = static_cast<double>(jbegin + j) * latStep - 90;
-     }
+       latvalue_1d(j) = static_cast<double>(jbegin + j) * latStep - 90 + latStep/2;
+     }
+   }
+
+   void CDomain::fillInRectilinearBoundLonLat(CArray<double,2>& boundsLon, CArray<double,2>& boundsLat)
+   {
+     int i,j,k;
+     const int nvertexValue = 4;
+
+     boundsLon.resize(nvertexValue,ni*nj);
+     boundsLat.resize(nvertexValue,nj*ni);
+
+     double lonStep = double(360/ni_glo.getValue());
+     double latStep = double(180/nj_glo.getValue());
+
+     for(j=0;j<nj;++j)
+       for(i=0;i<ni;++i)
+       {
+         k=j*ni+i;
+         boundsLon(0,k) = boundsLon(1,k) = (0 != (ibegin + i)) ? (ibegin + i) * lonStep -180
+                                                               : -180;
+         boundsLon(2,k) = boundsLon(3,k) = ((ibegin + i + 1) != ni_glo) ? (ibegin + i +1) * lonStep -180
+                                                                        : 180;
+
+         boundsLat(1,k) = boundsLat(2,k) = (0 != (jbegin + j)) ? (jbegin + j) * latStep - 90
+                                                               : -90;
+         boundsLat(0,k) = boundsLat(3,k) = ((jbegin + j +1) != nj_glo) ? (jbegin + j +1) * latStep - 90
+                                                               : +90;
+       }
    }
 
@@ -625 +658 @@
             }
           }
+        lonvalue_1d.free();
      }
 
@@ -666 +700 @@
          }
        }
+       lonvalue_2d.free();
      }