Changeset 808 for XIOS

Timestamp:

12/13/15 15:43:41 (8 years ago)

Author:

ymipsl

Message:

Fix problem using rectilinear grid from file, or self-generated

• Defining boundaries at poles was incorrect

YM

Location:

XIOS/trunk/src

Files:

• node/domain.cpp (modified) (1 diff)
• transformation/domain_algorithm_interpolate.cpp (modified) (1 diff)

XIOS/trunk/src/node/domain.cpp

@@ -501 +501 @@
      {
        double latStepStart = latvalue_rectilinear_read_from_file(1)-latvalue_rectilinear_read_from_file(0);
-       bounds_lat_start.setValue(latvalue_rectilinear_read_from_file(0) - latStepStart/2);
+       if (isNorthPole) bounds_lat_start.setValue(latvalue_rectilinear_read_from_file(0) );
+       else bounds_lat_start.setValue(latvalue_rectilinear_read_from_file(0)-latStepStart/2 );
+
+
        double latStepEnd = (latvalue_rectilinear_read_from_file(nj_glo-1)-latvalue_rectilinear_read_from_file(nj_glo-2));
-       bounds_lat_end.setValue(latvalue_rectilinear_read_from_file(nj_glo-1) + latStepEnd/2);
-       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;
-
+       if (isSouthPole) bounds_lat_end.setValue(latvalue_rectilinear_read_from_file(nj_glo-1));
+       else bounds_lat_end.setValue(latvalue_rectilinear_read_from_file(nj_glo-1)+latStepEnd/2);
+       
+       if (bounds_lat_start > 90.-1e-3) bounds_lat_start=90 ;
+       if (bounds_lat_start < -90.+1e-3) bounds_lat_start=-90 ;
+       if (bounds_lat_end > 90.-1e-3) bounds_lat_end=90 ;
+       if (bounds_lat_end < -90.+1e-3) bounds_lat_end=-90 ;
+      
        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)) ? bounds_lat_start_pole
+           boundsLat(1,k) = boundsLat(2,k) = (0 == (jbegin + j)) ? bounds_lat_start
                                                                  : (latvalue_rectilinear_read_from_file(jbegin + j)+latvalue_rectilinear_read_from_file(jbegin + j-1))/2;
-           boundsLat(0,k) = boundsLat(3,k) = ((jbegin + j +1) == nj_glo) ? bounds_lat_end_pole
+           boundsLat(0,k) = boundsLat(3,k) = ((jbegin + j +1) == nj_glo) ? bounds_lat_end
                                                                  : (latvalue_rectilinear_read_from_file(jbegin + j + 1)+latvalue_rectilinear_read_from_file(jbegin + j))/2;
          }

XIOS/trunk/src/transformation/domain_algorithm_interpolate.cpp

@@ -78 +78 @@
     bool isNorthPole = false;
     bool isSouthPole = false;
-    if (std::abs(poleValue - std::abs(domainSrc_->lat_start)) < NumTraits<double>::epsilon()) isNorthPole = true;
-    if (std::abs(poleValue - std::abs(domainSrc_->lat_end)) < NumTraits<double>::epsilon()) isSouthPole = true;
+
+    if (domainSrc_->latvalue_rectilinear_read_from_file.isEmpty())
+    {
+      if (std::abs(poleValue - std::abs(domainSrc_->lat_start)) < NumTraits<double>::epsilon()) isNorthPole = true;
+      if (std::abs(poleValue - std::abs(domainSrc_->lat_end)) < NumTraits<double>::epsilon()) isSouthPole = true;
+    }
+    else
+    {
+      if (std::abs(poleValue - std::abs(domainSrc_->latvalue_rectilinear_read_from_file(0))) < NumTraits<double>::epsilon()) isNorthPole = true;
+      if (std::abs(poleValue - std::abs(domainSrc_->latvalue_rectilinear_read_from_file(domainSrc_->nj_glo-1))) < NumTraits<double>::epsilon()) isSouthPole = true;
+    }
 
     nVertexSrc = constNVertex;