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

Timestamp:

04/27/16 17:37:34 (9 years ago)

Author:

ymipsl

Message:

bugfix : automatic generation of 2D regular domain.

YM

File:

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

XIOS/trunk/src/node/domain.cpp

@@ -545 +545 @@
       if (bounds_lat_start >= 90 ) bounds_lat_start=90 ;
       else if (bounds_lat_start <= -90 ) bounds_lat_start=-90 ;
-      else if (bounds_lat_start <= 90 && bounds_lat_start >= lon(0))
-      {
-        if ( 90-bounds_lat_start <= 0.1*std::abs(latStepStart)) bounds_lat_start=90 ;
-      }
-      else if (bounds_lat_start >= -90 && bounds_lat_start <= lon(0))
-      {
-        if ( -90 + bounds_lat_start <= 0.1*std::abs(latStepStart)) bounds_lat_start=-90 ;
+      else if (bounds_lat_start <= 90 && bounds_lat_start >= lat(0))
+      {
+        if ( std::abs(90-bounds_lat_start) <= 0.1*std::abs(latStepStart)) bounds_lat_start=90 ;
+      }
+      else if (bounds_lat_start >= -90 && bounds_lat_start <= lat(0))
+      {
+        if ( std::abs(-90 - bounds_lat_start) <= 0.1*std::abs(latStepStart)) bounds_lat_start=-90 ;
       }
     }
@@ -563 +563 @@
       if (bounds_lat_end >= 90 ) bounds_lat_end=90 ;
       else if (bounds_lat_end <= -90 ) bounds_lat_end=-90 ;
-      else if (bounds_lat_end <= 90 && bounds_lat_end >= lon(nj_glo-1))
-      {
-        if ( 90-bounds_lat_end <= 0.1*std::abs(latStepEnd)) bounds_lat_end=90 ;
-      }
-      else if (bounds_lat_end >= -90 && bounds_lat_end <= lon(nj_glo-1))
-      {
-        if ( -90 + bounds_lat_end <= 0.1*std::abs(latStepEnd)) bounds_lat_end=-90 ;
+      else if (bounds_lat_end <= 90 && bounds_lat_end >= lat(nj_glo-1))
+      {
+        if ( std::abs(90-bounds_lat_end) <= 0.1*std::abs(latStepEnd)) bounds_lat_end=90 ;
+      }
+      else if (bounds_lat_end >= -90 && bounds_lat_end <= lat(nj_glo-1))
+      {
+        if ( std::abs(-90 - bounds_lat_end) <= 0.1*std::abs(latStepEnd)) bounds_lat_end=-90 ;
       }
     }