Changeset 856


Ignore:
Timestamp:
05/26/16 17:58:38 (5 years ago)
Author:
mhnguyen
Message:

Fixing other compilation errors with PGI

+) Change some variable for passing PGI (strict) check

Test
+) On Curie with PGI
+) Library compiled.

Location:
XIOS/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/extern/remap/src/clipper.cpp

    r688 r856  
    25882588 
    25892589  MaximaList::const_iterator maxIt; 
    2590   MaximaList::const_reverse_iterator maxRit; 
     2590  MaximaList::reverse_iterator maxRit; 
    25912591  if (m_Maxima.size() > 0) 
    25922592  { 
  • XIOS/trunk/src/transformation/domain_algorithm_interpolate.cpp

    r846 r856  
    233233  mapper.setVerbosity(PROGRESS) ; 
    234234 
    235    
     235 
    236236  // supress masked data for the source 
    237237  int nSrcLocalUnmasked = 0 ; 
     
    278278    } 
    279279  } 
    280    
     280 
    281281//  mapper.setSourceMesh(boundsLonSrc.dataFirst(), boundsLatSrc.dataFirst(), nVertexSrc, nSrcLocal, &srcPole[0], globalSrc); 
    282282  mapper.setSourceMesh(boundsLonSrcUnmasked.dataFirst(), boundsLatSrcUnmasked.dataFirst(), nVertexSrc, nSrcLocalUnmasked, &srcPole[0], globalSrcUnmasked); 
     
    432432  Read remap information from file then distribute it among clients 
    433433*/ 
    434 void CDomainAlgorithmInterpolate::exchangeRemapInfo(const std::map<int,std::vector<std::pair<int,double> > >& interpMapValue) 
     434void CDomainAlgorithmInterpolate::exchangeRemapInfo(std::map<int,std::vector<std::pair<int,double> > >& interpMapValue) 
    435435{ 
    436436  CContext* context = CContext::getCurrent(); 
     
    493493    for (int idx = 0; idx < mapSize; ++idx) 
    494494    { 
    495       sizeIndex += interpMapValue.at((itMap->second)[idx]).size(); 
     495//      sizeIndex += interpMapValue.at((itMap->second)[idx]).size(); 
     496      sizeIndex += (interpMapValue[(int)(itMap->second)[idx]]).size(); 
    496497    } 
    497498    sendBuff[itMap->first] = sizeIndex; 
     
    516517    for (int idx = 0; idx < mapSize; ++idx) 
    517518    { 
    518       const std::vector<std::pair<int,double> >& interpMap = interpMapValue.at(indexToSend[idx]); 
     519      std::vector<std::pair<int,double> >& interpMap = interpMapValue[(int)indexToSend[idx]]; //interpMapValue.at(indexToSend[idx]); 
    519520      for (int i = 0; i < interpMap.size(); ++i) 
    520521      { 
  • XIOS/trunk/src/transformation/domain_algorithm_interpolate.hpp

    r827 r856  
    3535  void computeRemap(); 
    3636  void readRemapInfo(); 
    37   void exchangeRemapInfo(const std::map<int,std::vector<std::pair<int,double> > >& interpMapValue); 
     37  void exchangeRemapInfo(std::map<int,std::vector<std::pair<int,double> > >& interpMapValue); 
    3838private: 
    3939  CInterpolateDomain* interpDomain_; 
Note: See TracChangeset for help on using the changeset viewer.