Ignore:
Timestamp:
01/06/20 14:46:09 (21 months ago)
Author:
ymipsl
Message:

XIOS_COUPLING branch : more comments and cleaning

YM

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp

    r1794 r1847  
    622622        int writtenIndex = 0; 
    623623 
    624         localIndexToWriteOnClient.resize(nbWritten);   
    625         localIndexToWriteOnServer.resize(nbWritten); 
    626         localIndexToWriteOnServer(0) = writtenIndex; 
    627         localIndexToWriteOnClient(0) = writtenIndex; 
     624        localIndexToWriteOnClient_.resize(nbWritten);   
     625        localIndexToWriteOnServer_.resize(nbWritten); 
     626        localIndexToWriteOnServer_(0) = writtenIndex; 
     627        localIndexToWriteOnClient_(0) = writtenIndex; 
    628628         
    629629        return; 
     
    643643      } 
    644644 
    645       localIndexToWriteOnClient.resize(nbWritten);   
    646       localIndexToWriteOnServer.resize(nbWritten); 
     645      localIndexToWriteOnClient_.resize(nbWritten);   
     646      localIndexToWriteOnServer_.resize(nbWritten); 
    647647       
    648648      { 
     
    650650        if (isDataDistributed_) 
    651651        { 
    652           CContextServer* server = CContext::getCurrent()->server;       
    653           MPI_Allreduce(&numberWrittenIndexes_, &totalNumberWrittenIndexes_, 1, MPI_INT, MPI_SUM, server->intraComm); 
    654           MPI_Scan(&numberWrittenIndexes_, &offsetWrittenIndexes_, 1, MPI_INT, MPI_SUM, server->intraComm); 
     652          CContext* context = CContext::getCurrent();       
     653          MPI_Allreduce(&numberWrittenIndexes_, &totalNumberWrittenIndexes_, 1, MPI_INT, MPI_SUM, context->intraComm_); 
     654          MPI_Scan(&numberWrittenIndexes_, &offsetWrittenIndexes_, 1, MPI_INT, MPI_SUM, context->intraComm_); 
    655655          offsetWrittenIndexes_ -= numberWrittenIndexes_; 
    656656        } 
     
    666666        if (itSrve != itSrv) 
    667667        { 
    668           localIndexToWriteOnServer(nbWritten) = itSrv->second; 
    669           localIndexToWriteOnClient(nbWritten) = it->second; 
     668          localIndexToWriteOnServer_(nbWritten) = itSrv->second; 
     669          localIndexToWriteOnClient_(nbWritten) = it->second; 
    670670          ++nbWritten;                 
    671671        }  
     
    17431743        for (int i = 0; i < nSize.size(); ++i) 
    17441744        dataSize *= nSize[i]; 
    1745         serverDistribution_ = new CDistributionServer(server->intraCommRank,  
     1745        serverDistribution_ = new CDistributionServer(context->intraCommRank_,  
    17461746                                                      globalIndex, axis_domain_order, 
    17471747                                                      nBegin, nSize, nBeginGlobal, nGlob); 
Note: See TracChangeset for help on using the changeset viewer.