Changeset 1950

Timestamp:

10/06/20 10:19:12 (4 years ago)

Author:

ymipsl

Message:

Xios coupling :

"label" axis attribute is now working again.

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src

Files:

• io/nc4_data_output.cpp (modified) (4 diffs)
• node/axis.cpp (modified) (2 diffs)

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

@@ -1261 +1261 @@
 
           SuperClassWriter::definition_end();
-
-          CArray<int, 1>& indexToWrite = axis->localIndexToWriteOnServer;
-          int nbWritten = indexToWrite.numElements();
-          CArray<double,1> axis_value(indexToWrite.numElements());
-          if (!axis->value.isEmpty())
-          {
-            for (int i = 0; i < nbWritten; i++)
-            {
-              if (indexToWrite(i) < 0)
-                axis_value(i) = -1;   // Some value in case of a hole
-              else
-                axis_value(i) = axis->value(indexToWrite(i));
-            }
-          }
-          CArray<double,2> axis_bounds;
-          CArray<string,1> axis_label;
-          if (!axis->label.isEmpty())
-          {
-            axis_label.resize(indexToWrite.numElements());
-            for (int i = 0; i < nbWritten; i++)
-            {
-              if (indexToWrite(i) < 0)
-                axis_label(i) = boost::lexical_cast<string>(-1);  // Some value in case of a hole
-              else
-                axis_label(i) = axis->label(indexToWrite(i));
-            }
-          }
-
+          
           switch (SuperClass::type)
           {
@@ -1299 +1272 @@
 
                 if (!axis->bounds.isEmpty())
-                {
-                  axis_bounds.resize(2, indexToWrite.numElements());
-                  for (int i = 0; i < nbWritten; ++i)
-                  {
-                    if (indexToWrite(i) < 0)
-                    {
-                      axis_bounds(0, i) = -1.; // Some value in case of a hole
-                      axis_bounds(1, i) = -1.;
-                    }
-                    else
-                    {
-                      axis_bounds(0, i) = axis->bounds(0, int(indexToWrite(i)));
-                      axis_bounds(1, i) = axis->bounds(1, int(indexToWrite(i)));
-                    }
-                  }
                   SuperClassWriter::writeData(axis->bounds, axisBoundsId, isCollective, 0);
-                }
               }
               else
-                SuperClassWriter::writeData(axis_label, axisid, isCollective, 0);
+                SuperClassWriter::writeData(axis->label, axisid, isCollective, 0);
 
               SuperClassWriter::definition_start();
@@ -1338 +1295 @@
 
                 if (!axis->bounds.isEmpty())
-                {
-                  axis_bounds.resize(2, indexToWrite.numElements());
-                  for (int i = 0; i < nbWritten; ++i)
-                  {
-                    if (indexToWrite(i) < 0)
-                    {
-                      axis_bounds(0, i) = -1.;
-                      axis_bounds(1, i) = -1.;
-                    }
-                    else
-                    {
-                      axis_bounds(0, i) = axis->bounds(0, int(indexToWrite(i)));
-                      axis_bounds(1, i) = axis->bounds(1, int(indexToWrite(i)));
-                    }
-                  }
                   SuperClassWriter::writeData(axis->bounds, axisBoundsId, isCollective, 0, &startBounds, &countBounds);
-                }
               }
               else
@@ -1361 +1302 @@
                 startLabel[0] = start[0]; startLabel[1] = 0;
                 countLabel[0] = count[0]; countLabel[1] = stringArrayLen;
-                SuperClassWriter::writeData(axis_label, axisid, isCollective, 0, &startLabel, &countLabel);
+                SuperClassWriter::writeData(axis->label, axisid, isCollective, 0, &startLabel, &countLabel);
               }
 

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

@@ -1806 +1806 @@
     {
       { // send label
+        // need to transform array of string (no fixed size for string) into array of array of char
+        // to use connector to transfer
+        // the strings must have fixed size which the maximum lenght over the string label.  
+        int maxSize=0 ;
+        for(int i=0; i<label.numElements();i++) 
+          if (maxSize < label(i).size()) maxSize=label(i).size() ;
+        MPI_Allreduce(MPI_IN_PLACE, &maxSize,1,MPI_INT,MPI_MAX, context->getIntraComm()) ;
+        maxSize=maxSize+1 ;
+        CArray<char,2> charArray(maxSize,label.numElements()) ;
+        for(int j=0; j<label.numElements();j++) 
+        {
+          const char* str = label(j).c_str() ;
+          int strSize=label(j).size()+1 ;
+          for(int i=0; i<strSize; i++) charArray(i,j) = str[i] ;
+        }
         CEventClient event(getType(), EVENT_ID_SEND_DISTRIBUTED_ATTRIBUTE);
         CMessage message ;
-        message<<serverAxisId<<string("label") ;
-        // something to do ? => convert string label into char ?
-        //clientToServerConnector_[client]->transfer(2, bounds, client, event,message) ;
+        message<<serverAxisId<<string("label")<<maxSize ;
+        scattererConnector.transfer(maxSize, charArray, client, event,message) ;
       }
     }
@@ -1837 +1851 @@
       gathererConnector_->transfer(event, 2, value, 0.); 
       bounds.resize(2,n) ;
-      if (bounds.numElements() > 0 ) bounds=CArray<double,2>(bounds.dataFirst(),shape(2,n),neverDeleteData) ; 
+      if (bounds.numElements() > 0 ) bounds=CArray<double,2>(value.dataFirst(),shape(2,n),neverDeleteData) ; 
     }
     else if (type=="label")
     {
-       
+      int maxSize ;
+      for (auto& subEvent : event.subEvents) (*subEvent.buffer) >> maxSize ;
+      CArray<char,1> value ;
+      gathererConnector_->transfer(event, maxSize, value, '\0'); 
+      CArray<char,2> charArray(maxSize,n) ;
+      label.resize(n) ;
+      if (n>0)
+      {
+        charArray=CArray<char,2>(value.dataFirst(),shape(maxSize,n),neverDeleteData) ;
+        for(int j=0;j<n;j++)
+        {
+          int strSize ;
+          for(int i=0;i<maxSize;i++) 
+            if (charArray(i,j)=='\0') { strSize=i ; break; }
+          string str(strSize,'\0') ;
+          for(int i=0;i<strSize;i++) str[i]=charArray(i,j) ; 
+          label(j)=str ;
+        }
+      } 
     }
   }