Changeset 2189 for XIOS

Timestamp:

07/20/21 11:02:43 (3 years ago)

Author:

jderouillat

Message:

Fixes for some more strict compilers (gcc 8.3 at TGCC)

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src

Files:

• context_client.cpp (modified) (1 diff)
• distribution/grid_transform_connector.cpp (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/src/context_client.cpp

@@ -137 +137 @@
       if (CXios::checkEventSync)
       {
-        int typeId, classId, typeId_in, classId_in, timeLine_out;
+        int typeId, classId, typeId_in, classId_in;
+        long long timeLine_out;
+        long long timeLine_in( timeLine );
         typeId_in=event.getTypeId() ;
         classId_in=event.getClassId() ;
 //        MPI_Allreduce(&timeLine,&timeLine_out, 1, MPI_UINT64_T, MPI_SUM, intraComm) ; // MPI_UINT64_T standardized by MPI 3
-        MPI_Allreduce(&timeLine,&timeLine_out, 1, MPI_LONG_LONG_INT, MPI_SUM, intraComm) ; 
+        MPI_Allreduce(&timeLine_in,&timeLine_out, 1, MPI_LONG_LONG_INT, MPI_SUM, intraComm) ; 
         MPI_Allreduce(&typeId_in,&typeId, 1, MPI_INT, MPI_SUM, intraComm) ;
         MPI_Allreduce(&classId_in,&classId, 1, MPI_INT, MPI_SUM, intraComm) ;

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_transform_connector.cpp

@@ -59 +59 @@
         vector<size_t> recvBuff(size) ;
         MPI_Recv(recvBuff.data(), size, MPI_SIZE_T, status.MPI_SOURCE,0, localComm_,&status) ;
-        CArray<size_t,1> arrayTmp(recvBuff.data(), shape(recvBuff.size()), duplicateData) ;
-        recvIndex[status.MPI_SOURCE].reference(arrayTmp) ;
+        if (size!=0) {
+            CArray<size_t,1> arrayTmp(recvBuff.data(), shape(recvBuff.size()), duplicateData) ;
+            recvIndex[status.MPI_SOURCE].reference(arrayTmp) ;
+        }
+        else {
+            CArray<size_t,1> arrayTmp(0) ;
+            recvIndex[status.MPI_SOURCE].reference(arrayTmp) ;
+        }
         if (recvRankSize_.count(status.MPI_SOURCE)==0) recvRankSize_[status.MPI_SOURCE] = size ; 
         else recvRankSize_[status.MPI_SOURCE] *= size ;