Changeset 2308 for XIOS/dev

Timestamp:

03/10/22 13:47:59 (3 years ago)

Author:

ymipsl

Message:

Fix problem when reading scalar on multiple servers.
YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/io

Files:

• inetcdf4.cpp (modified) (1 diff)
• inetcdf4_impl.hpp (modified) (1 diff)
• nc4_data_input.cpp (modified) (2 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/io/inetcdf4.cpp

@@ -708 +708 @@
       scount.push_back(1);
       it++;
-    }
-    for (int i = 0; it != dimlist.end(); it++, i++)
+    
+      if ( it == dimlist.end()) // scalar case
+      {
+        if (start && count)
+        {
+          scount.pop_back();
+          scount.push_back((*count)[0]);
+          array_size *= (*count)[0];
+        }
+        return ;
+      }
+    }
+    
+    if ( it == dimlist.end()) // scalar case
     {
       if (start && count)
       {
-        sstart.push_back((*start)[i]);
-        scount.push_back((*count)[i]);
-        array_size *= (*count)[i];
+        sstart.push_back((*start)[0]);
+        scount.push_back((*count)[0]);
+        array_size *= (*count)[0];
       }
       else
       {
         sstart.push_back(0);
-        scount.push_back(dimmap[*it]);
-        array_size *= dimmap[*it];
+        scount.push_back(1);
+        array_size *= 1;
+      }
+
+    }
+    else
+    {  
+      for (int i = 0; it != dimlist.end(); it++, i++)
+      {
+        if (start && count)
+        {
+          sstart.push_back((*start)[i]);
+          scount.push_back((*count)[i]);
+          array_size *= (*count)[i];
+        }
+        else
+        {
+          sstart.push_back(0);
+          scount.push_back(dimmap[*it]);
+          array_size *= dimmap[*it];
+        }
       }
     }

XIOS/dev/dev_ym/XIOS_COUPLING/src/io/inetcdf4_impl.hpp

@@ -31 +31 @@
           << " ] Invalid array size");
   }
-
-  CNetCdfInterface::getVaraType(ncidp, varid, &sstart[0], &scount[0], data.dataFirst());
+  
+  if (data.numElements()==0)
+  {
+    T data ;
+    CNetCdfInterface::getVaraType(ncidp, varid, &sstart[0], &scount[0], &data); // netcdf is very bad
+  }
+  else  CNetCdfInterface::getVaraType(ncidp, varid, &sstart[0], &scount[0], data.dataFirst());
 }
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/io/nc4_data_input.cpp

@@ -66 +66 @@
         std::vector<StdString> domainList = grid->getDomainList();
         std::vector<StdString> axisList   = grid->getAxisList();
+        std::vector<StdString> scalarList = grid->getScalarList();
         int numElement = axisDomainOrder.numElements();
-        int idxDomain = domainList.size() - 1, idxAxis = axisList.size() - 1;
+        int idxDomain = domainList.size() - 1, idxAxis = axisList.size() - 1 ;
         int idx = domainList.size() * 2 + axisList.size() - 1;
 
@@ -98 +99 @@
             if (1 == axisDomainOrder.numElements())
             {
+              CScalar* scalar = CScalar::get(scalarList[0]);
               start.push_back(0);
-              count.push_back(1);
+              count.push_back(scalar->n);
             }
           }