Changeset 1642 for XIOS/dev/branch_openmp/src/io/nc4_data_input.cpp

Timestamp:

01/23/19 10:31:44 (5 years ago)

Author:

yushan

Message:

dev on ADA. add flag switch _usingEP/_usingMPI

File:

• XIOS/dev/branch_openmp/src/io/nc4_data_input.cpp (modified) (20 diffs)

XIOS/dev/branch_openmp/src/io/nc4_data_input.cpp

@@ -29 +29 @@
 
   StdSize CNc4DataInput::getFieldNbRecords_(CField* field)
+  TRY
   {
     StdString fieldId = field->getFieldOutputName();
@@ -40 +41 @@
     return 1;
   }
+  CATCH
 
   void CNc4DataInput::readFieldData_(CField* field)
+  TRY
   {
     CContext* context = CContext::getCurrent();
@@ -55 +58 @@
     CArray<double,1> fieldData(grid->getWrittenDataSize());
     if (!field->default_value.isEmpty()) fieldData = field->default_value;
-    #ifdef _usingEP
-      SuperClass::type = ONE_FILE;
-      printf("SuperClass::type = %d\n", SuperClass::type);
-    #endif
-        
+
     switch (SuperClass::type)
     {
@@ -67 +66 @@
       case ONE_FILE:
       {
-/*
-        std::vector<int> nZoomBeginGlobal = grid->getDistributionServer()->getZoomBeginGlobal();
-        std::vector<int> nZoomBeginServer = grid->getDistributionServer()->getZoomBeginServer();
-        std::vector<int> nZoomSizeServer  = grid->getDistributionServer()->getZoomSizeServer();
-
-        int ssize = nZoomBeginGlobal.size();
-
-        std::vector<StdSize> start(ssize);
-        std::vector<StdSize> count(ssize);
-
-        for (int i = 0; i < ssize; ++i)
-        {
-          start[i] = nZoomBeginServer[ssize - i - 1] - nZoomBeginGlobal[ssize - i - 1];
-          count[i] = nZoomSizeServer[ssize - i - 1];
-        }
-*/
-
-        std::vector<int> nZoomBeginGlobal = grid->getDistributionServer()->getZoomBeginGlobal();
-        std::vector<int> nZoomBeginServer = grid->getDistributionServer()->getZoomBeginServer();
-        std::vector<int> nZoomSizeServer  = grid->getDistributionServer()->getZoomSizeServer();
-
         std::vector<StdSize> start, count;
 
@@ -95 +73 @@
         int numElement = axisDomainOrder.numElements();
         int idxDomain = domainList.size() - 1, idxAxis = axisList.size() - 1;
-        int idx = nZoomBeginGlobal.size() - 1;
-
-        start.reserve(nZoomBeginGlobal.size());
-        count.reserve(nZoomBeginGlobal.size());
+        int idx = domainList.size() * 2 + axisList.size() - 1;
+
+        start.reserve(idx+1);
+        count.reserve(idx+1);
 
         for (int i = numElement - 1; i >= 0; --i)
@@ -107 +85 @@
             if ((domain->type) != CDomain::type_attr::unstructured)
             {
-              start.push_back(nZoomBeginServer[idx] - nZoomBeginGlobal[idx]);
-              count.push_back(nZoomSizeServer[idx]);
+              start.push_back(domain->jbegin);
+              count.push_back(domain->nj);
             }
-            --idx ;
-            start.push_back(nZoomBeginServer[idx] - nZoomBeginGlobal[idx]);
-            count.push_back(nZoomSizeServer[idx]);
-            --idx ;
+            start.push_back(domain->ibegin);
+            count.push_back(domain->ni);
             --idxDomain;
           }
           else if (1 == axisDomainOrder(i))
           {
-            start.push_back(nZoomBeginServer[idx] - nZoomBeginGlobal[idx]);
-            count.push_back(nZoomSizeServer[idx]);
-            --idx;
+            CAxis* axis = CAxis::get(axisList[idxAxis]);
+            start.push_back(axis->begin);
+            count.push_back(axis->n);
+            --idxAxis ;
           }
           else
@@ -129 +106 @@
               count.push_back(1);
             }
-            --idx;
           }
         }
@@ -148 +124 @@
     }
   }
+  CATCH
 
   void CNc4DataInput::readFieldAttributes_(CField* field, bool readAttributeValues)
+  TRY
   {
     StdString fieldId = field->getFieldOutputName();
@@ -166 +144 @@
     // Verify the compatibility of dimension of declared grid and real grid in file
     int realGridDim = 1;
-    bool isUnstructuredGrid = SuperClassWriter::isUnstructured(fieldId);
+    bool isUnstructuredGrid = ((gridDim < 2) ? false :  SuperClassWriter::isUnstructured(fieldId));
     std::map<StdString, StdSize> dimSizeMap = SuperClassWriter::getDimensions(&fieldId);
     std::list<StdString> dimList = SuperClassWriter::getDimensionsList(&fieldId);
@@ -191 +169 @@
 */
 
-    for (std::list<StdString>::const_iterator it = dimList.begin(); it != dimList.end(); ++it)
+//    if (!SuperClassWriter::isRectilinear(fieldId))
+    if (true)
+    {
+      for (std::list<StdString>::const_iterator it = dimList.begin(); it != dimList.end(); ++it)
         listDimSize.push_front(*dimSizeMap.find(*it));
+    }
+    else
+    {
+       std::list<StdString> coords = SuperClassWriter::getCoordinatesIdList(fieldId);
+       std::list<StdString>::const_iterator itCoord = coords.begin();
+       for (; itCoord != coords.end(); itCoord++)
+       {
+         const StdString& coord = *itCoord;
+         if (SuperClassWriter::hasVariable(coord) && !SuperClassWriter::isTemporal(coord))
+         {
+           std::map<StdString, StdSize> dimsTmp = SuperClassWriter::getDimensions(&coord);
+           StdString dimNameTmp = dimsTmp.begin()->first;
+           StdSize dimSizeTmp = dimsTmp.begin()->second;
+           listDimSize.push_front(make_pair(coord, dimSizeTmp));
+           dimSizeMap.erase(dimNameTmp);
+           dimList.remove(dimNameTmp);
+         }
+       }
+       for (std::list<StdString>::const_iterator it = dimList.begin(); it != dimList.end(); ++it)
+        listDimSize.push_front(*dimSizeMap.find(*it));
+    }
 
     // Now process domain and axis
@@ -251 +253 @@
     }
   }
+  CATCH
 
   /*!
@@ -261 +264 @@
   void CNc4DataInput::readDomainAttributeValueFromFile(CDomain* domain, std::list<std::pair<StdString, StdSize> >& dimSizeMap,
                                                        int elementPosition, const StdString& fieldId)
+  TRY
   {
     // There are some optional attributes of a domain to retrieve from file    // + lon lat?
@@ -439 +443 @@
     domain->fillInLonLat();
   }
+  CATCH
 
   /*!
@@ -449 +454 @@
   void CNc4DataInput::readDomainAttributesFromFile(CDomain* domain, std::list<std::pair<StdString, StdSize> >& dimSizeMap,
                                                    int elementPosition, const StdString& fieldId)
+  TRY
   {
     // There are some mandatory attributes of a domain to retrieve from file
@@ -497 +503 @@
       domain->ni_glo.setValue(itMapNi->second);
     }
-  }
+
+// determine if coordinates values are present in file
+    if ((CDomain::type_attr::rectilinear == domain->type))
+    {
+      // Ok, try to read some attributes such as longitude and latitude
+      domain->hasLatInReadFile_ = SuperClassWriter::hasVariable(itMapNj->first);
+      domain->hasLonInReadFile_  = SuperClassWriter::hasVariable(itMapNi->first);
+    }
+    else if ((CDomain::type_attr::curvilinear == domain->type) || (CDomain::type_attr::unstructured == domain->type) )
+    {
+      StdString latName = this->getLatCoordName(fieldId);
+      domain->hasLatInReadFile_ = SuperClassWriter::hasVariable(latName) ;
+      StdString lonName = this->getLonCoordName(fieldId);        
+      domain->hasLonInReadFile_ = SuperClassWriter::hasVariable(lonName) ; 
+      StdString boundsLatName = this->getBoundsId(latName);
+      domain->hasBoundsLatInReadFile_ = SuperClassWriter::hasVariable(boundsLatName) ; 
+      StdString boundsLonName = this->getBoundsId(lonName);
+      domain->hasBoundsLonInReadFile_ = SuperClassWriter::hasVariable(boundsLonName) ;
+    }
+  }
+  CATCH
 
   /*!
@@ -508 +534 @@
   void CNc4DataInput::readAxisAttributesFromFile(CAxis* axis, std::list<std::pair<StdString, StdSize> >& dimSizeMap,
                                                  int elementPosition, const StdString& fieldId)
+  TRY
   {
     std::list<std::pair<StdString, StdSize> >::const_iterator itMapN = dimSizeMap.begin(),
@@ -524 +551 @@
     axis->n_glo.setValue(itMapN->second);
   }
+  CATCH
 
   /*!
@@ -534 +562 @@
   void CNc4DataInput::readAxisAttributeValueFromFile(CAxis* axis, std::list<std::pair<StdString, StdSize> >& dimSizeMap,
                                                     int elementPosition, const StdString& fieldId)
+  TRY
   {
     std::list<std::pair<StdString, StdSize> >::const_iterator itMapN = dimSizeMap.begin(),
@@ -554 +583 @@
     }
   }
+  CATCH
 
   /*!
@@ -582 +612 @@
 
   void CNc4DataInput::closeFile_(void)
+  TRY
   {
     SuperClassWriter::close();
   }
+  CATCH
 } // namespace xios