Changeset 2264 for XIOS/dev/dev_ym/XIOS_COUPLING/src/io

Timestamp:

11/23/21 13:12:46 (3 years ago)

Author:

ymipsl

Message:

Scalar can be now distributed on server side, avoiding incorrect result coming from redondant nature of scalar grid.
YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/io

Files:

• nc4_data_output.cpp (modified) (2 diffs)
• onetcdf4.cpp (modified) (3 diffs)
• onetcdf4_impl.hpp (modified) (2 diffs)

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

@@ -2282 +2282 @@
                   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;
@@ -2318 +2319 @@
                       if (1 == axisDomainOrder.numElements())
                       {
+                        CScalar* scalar = CScalar::get(scalarList[scalarList.size()-1]);
                         start.push_back(0);
-                        count.push_back(1);
+                        count.push_back(scalar->n);
                       }
                       --idx;

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

@@ -477 +477 @@
          if (sizes.size()==0) 
          {
-            array_size=1 ;
-            sstart.push_back(0);
-            scount.push_back(1);
+            
+            if ((start != NULL) && (count != NULL) && start->size()==1 && count->size()==1) // pur scalar case
+              array_size*=(*count)[0] ;
+            else array_size=1 ;
          }
          else
@@ -492 +493 @@
              sstart.push_back(record);
              scount.push_back(1);
-              if ((start == NULL) &&
-                  (count == NULL)) i++;
-              it++;
+             if ((start == NULL) && (count == NULL)) i++;
+             it++;
+             if (it==end)
+             {
+               if ((start != NULL) && (count != NULL) && start->size()==1 && count->size()==1) // pur scalar case
+               {
+                 scount[0]=(*count)[0] ;
+                 array_size *= (*count)[0];
+               }
+             }
            }
-
+           
            for (;it != end; it++)
            {
@@ -569 +577 @@
          int grpid = this->getCurrentGroup();
          int varid = this->getVariable(name);
+         
          StdSize array_size = 1;
          std::vector<StdSize> sstart, scount;

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

@@ -19 +19 @@
     std::vector<StdSize> sstart, scount;
 
-    if (this->wmpi && collective)
-    CNetCdfInterface::varParAccess(grpid, varid, NC_COLLECTIVE);
-    if (this->wmpi && !collective)
-    CNetCdfInterface::varParAccess(grpid, varid, NC_INDEPENDENT);
+    if (this->wmpi && collective) CNetCdfInterface::varParAccess(grpid, varid, NC_COLLECTIVE);
+    if (this->wmpi && !collective) CNetCdfInterface::varParAccess(grpid, varid, NC_INDEPENDENT);
 
     CTimer::get("Files : get data infos").resume();
-    this->getWriteDataInfos
-    (name, record, array_size,  sstart, scount, start, count);
+    this->getWriteDataInfos(name, record, array_size,  sstart, scount, start, count);
     CTimer::get("Files : get data infos").suspend();
-
+   
     if (data.numElements() != array_size)
     {
@@ -36 +33 @@
       << " ] Invalid input data !" );
     }
-
-    this->writeData_(grpid, varid, sstart, scount, data.dataFirst());
+    
+    if (this->wmpi && sstart.size()==0) CNetCdfInterface::varParAccess(grpid, varid, NC_INDEPENDENT); // pure scalar case
+    if (data.numElements()==0 && sstart.size()==0) {}// pure scalar case if nothing to write, write nothing (independent access) 
+    else this->writeData_(grpid, varid, sstart, scount, data.dataFirst());
   }