Changeset 1855 for XIOS/branchs/xios-2.5/src/node

Timestamp:

01/30/20 16:22:52 (4 years ago)

Author:

ymipsl

Message:

Import bug fix correction from trunk at rev 1578 :

Bug fix when reading rectilinear and attemp to call generate_rectilinear_domain filter. Coordinates in file was not taking into account.

and 1582 : Missing file for rev. 1578

YM

Location:

XIOS/branchs/xios-2.5/src/node

Files:

• domain.cpp (modified) (4 diffs)
• domain.hpp (modified) (1 diff)

XIOS/branchs/xios-2.5/src/node/domain.cpp

@@ -33 +33 @@
       , lonvalue(), latvalue(), bounds_lonvalue(), bounds_latvalue()
       , globalLocalIndexMap_(), computedWrittenIndex_(false)
-      , clients()
+      , clients(),hasLatInReadFile_(false), hasBoundsLatInReadFile_(false)
+      , hasLonInReadFile_(false), hasBoundsLonInReadFile_(false)
    {
    }
@@ -45 +46 @@
       , lonvalue(), latvalue(), bounds_lonvalue(), bounds_latvalue()
       , globalLocalIndexMap_(), computedWrittenIndex_(false)
-      , clients()
+      , clients(), hasBoundsLatInReadFile_(false)
+      , hasLonInReadFile_(false), hasBoundsLonInReadFile_(false)
    {
     }
@@ -460 +462 @@
        lon_end.setValue(lonvalue_rectilinear_read_from_file(ni_glo-1));
      }
-     else
+     else if (!hasLonInReadFile_)
      {
        if (!lonvalue_2d.isEmpty()) lonvalue_2d.free();
@@ -494 +496 @@
        lat_end.setValue(latvalue_rectilinear_read_from_file(nj_glo-1));
      }
-     else
+     else if (!hasLatInReadFile_)
      {
        if (!latvalue_2d.isEmpty()) latvalue_1d.free();

XIOS/branchs/xios-2.5/src/node/domain.hpp

@@ -151 +151 @@
          bool hasLonLat;
          bool hasPole ;
+         bool hasLatInReadFile_ ; // specify if latitude is defined on read file, so it can be read later when grid distribution will be defined 
+         bool hasBoundsLatInReadFile_ ; // specify if latitude boundarues are defined on read file, so it can be read later when grid distribution will be defined 
+         bool hasLonInReadFile_ ; // specify if longitude is defined on read file, so it can be read later when grid distribution will be defined 
+         bool hasBoundsLonInReadFile_ ; // specify if longitude boundaries are defined on read file, so it can be read later when grid distribution will be defined 
 
          void computeLocalMask(void) ;