Changeset 856

Timestamp:

05/26/16 17:58:38 (9 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:

• extern/remap/src/clipper.cpp (modified) (1 diff)
• src/transformation/domain_algorithm_interpolate.cpp (modified) (5 diffs)
• src/transformation/domain_algorithm_interpolate.hpp (modified) (1 diff)

XIOS/trunk/extern/remap/src/clipper.cpp

@@ -2588 +2588 @@
 
   MaximaList::const_iterator maxIt;
-  MaximaList::const_reverse_iterator maxRit;
+  MaximaList::reverse_iterator maxRit;
   if (m_Maxima.size() > 0)
   {

XIOS/trunk/src/transformation/domain_algorithm_interpolate.cpp

@@ -233 +233 @@
   mapper.setVerbosity(PROGRESS) ;
 
-  
+
   // supress masked data for the source
   int nSrcLocalUnmasked = 0 ;
@@ -278 +278 @@
     }
   }
-  
+
 //  mapper.setSourceMesh(boundsLonSrc.dataFirst(), boundsLatSrc.dataFirst(), nVertexSrc, nSrcLocal, &srcPole[0], globalSrc);
   mapper.setSourceMesh(boundsLonSrcUnmasked.dataFirst(), boundsLatSrcUnmasked.dataFirst(), nVertexSrc, nSrcLocalUnmasked, &srcPole[0], globalSrcUnmasked);
@@ -432 +432 @@
   Read remap information from file then distribute it among clients
 */
-void CDomainAlgorithmInterpolate::exchangeRemapInfo(const std::map<int,std::vector<std::pair<int,double> > >& interpMapValue)
+void CDomainAlgorithmInterpolate::exchangeRemapInfo(std::map<int,std::vector<std::pair<int,double> > >& interpMapValue)
 {
   CContext* context = CContext::getCurrent();
@@ -493 +493 @@
     for (int idx = 0; idx < mapSize; ++idx)
     {
-      sizeIndex += interpMapValue.at((itMap->second)[idx]).size();
+//      sizeIndex += interpMapValue.at((itMap->second)[idx]).size();
+      sizeIndex += (interpMapValue[(int)(itMap->second)[idx]]).size();
     }
     sendBuff[itMap->first] = sizeIndex;
@@ -516 +517 @@
     for (int idx = 0; idx < mapSize; ++idx)
     {
-      const std::vector<std::pair<int,double> >& interpMap = interpMapValue.at(indexToSend[idx]);
+      std::vector<std::pair<int,double> >& interpMap = interpMapValue[(int)indexToSend[idx]]; //interpMapValue.at(indexToSend[idx]);
       for (int i = 0; i < interpMap.size(); ++i)
       {

XIOS/trunk/src/transformation/domain_algorithm_interpolate.hpp

@@ -35 +35 @@
   void computeRemap();
   void readRemapInfo();
-  void exchangeRemapInfo(const std::map<int,std::vector<std::pair<int,double> > >& interpMapValue);
+  void exchangeRemapInfo(std::map<int,std::vector<std::pair<int,double> > >& interpMapValue);
 private:
   CInterpolateDomain* interpDomain_;