Changeset 2312 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.cpp

Timestamp:

03/21/22 15:25:14 (2 years ago)

Author:

ymipsl

Message:

temporary fix when reading grid from file. Some part of code must rewrite in future.
YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.cpp (modified) (5 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.cpp

@@ -42 +42 @@
       , isRedistributed_(false), hasPole(false)
       , lonvalue(), latvalue(), bounds_lonvalue(), bounds_latvalue()
-      , clients(), hasLatInReadFile_(false), hasBoundsLatInReadFile_(false)
-      , hasLonInReadFile_(false), hasBoundsLonInReadFile_(false)
+      , clients()
    {
    }
@@ -54 +53 @@
       , isRedistributed_(false), hasPole(false)
       , lonvalue(), latvalue(), bounds_lonvalue(), bounds_latvalue()
-      , clients(), hasLatInReadFile_(false), hasBoundsLatInReadFile_(false)
-      , hasLonInReadFile_(false), hasBoundsLonInReadFile_(false)
-   {
+      , clients()
+    {
     }
 
@@ -494 +492 @@
    TRY
    {
-     if (!lonvalue_rectilinear_read_from_file.isEmpty() && lonvalue_2d.isEmpty() && lonvalue_1d.isEmpty())
+     if (!lonvalue_rectilinear_read_from_file.isEmpty() && lonvalue_2d.isEmpty() && lonvalue_1d.isEmpty() )
      {
        lonvalue_1d.resize(ni);
@@ -502 +500 @@
        lon_end.setValue(lonvalue_rectilinear_read_from_file(ni_glo-1));
      }
-     else if (!hasLonInReadFile_)
+     else if (hasLonInReadFile.isEmpty() || !hasLonInReadFile)
      {
        if (!lonvalue_2d.isEmpty()) lonvalue_2d.free();
@@ -536 +534 @@
        lat_end.setValue(latvalue_rectilinear_read_from_file(nj_glo-1));
      }
-     else if (!hasLatInReadFile_)
+     else if (hasLatInReadFile.isEmpty() || !hasLatInReadFile)
      {
        if (!latvalue_2d.isEmpty()) latvalue_1d.free();