Changeset 782 for XIOS/trunk/src/io/nc4_data_input.cpp

Timestamp:

11/12/15 16:33:03 (8 years ago)

Author:

mhnguyen

Message:

Reading attributes of curvilinear grid from file

+) Correct some minor bugs detecting type of grid
+) Use constant string for attributes conforming to CF convention
+) Add part of code to read attributes of curvilinear grid

Test
+) On Curie
+) test_remap passes

File:

• XIOS/trunk/src/io/nc4_data_input.cpp (modified) (7 diffs)

XIOS/trunk/src/io/nc4_data_input.cpp

@@ -202 +202 @@
     \param [in] dimSizeMap Dimensions and and their corresponding names and size read from file
     \param [in] emelentPosition position of domain in grid
+    \param [in] fieldId id (or name) associated with the grid
   */
   void CNc4DataInput::readDomainAttributeValueFromFile(CDomain* domain, std::map<StdString, StdSize>& dimSizeMap,
@@ -227 +228 @@
     else if (this->isCurvilinear(fieldId))
     {
-
+      int ni = domain->ni;
+      int nj = domain->nj;
+      std::vector<StdSize> nBeginLatLon(2), nSizeLatLon(2);
+      nBeginLatLon[0] = domain->jbegin.getValue(); nBeginLatLon[1] = domain->ibegin.getValue();
+      nSizeLatLon[0]  = nj; nSizeLatLon[1] = ni;
+
+      StdString latName = this->getLatCoordName(fieldId);
+      domain->latvalue_2d.resize(ni,nj);
+      readFieldVariableValue(domain->latvalue_2d, latName, nBeginLatLon, nSizeLatLon);
+      StdString lonName = this->getLonCoordName(fieldId);
+      domain->lonvalue_2d.resize(ni,nj);
+      readFieldVariableValue(domain->lonvalue_2d, lonName, nBeginLatLon, nSizeLatLon);
+
+      StdString boundsLatName = this->getBoundsId(latName);
+      if (0 == boundsLatName.compare(""))
+         ERROR("CNc4DataInput::readDomainAttributeValueFromFile(...)",
+              << "Field '" << fieldId << std::endl
+              << "Trying to read attributes from curvilinear grid."
+              << "Latitude variable " << latName << " does not have bounds.");
+      StdString boundsLonName = this->getBoundsId(lonName);
+      if (0 == boundsLonName.compare(""))
+         ERROR("CNc4DataInput::readDomainAttributeValueFromFile(...)",
+              << "Field '" << fieldId << std::endl
+              << "Trying to read attributes from curvilinear grid."
+              << "Longitude variable " << lonName << " does not have bounds.");
+
+      domain->nvertex.setValue(4);
+      std::vector<StdSize> nBeginBndsLatLon(3), nSizeBndsLatLon(3);
+      nBeginBndsLatLon[0] = domain->jbegin.getValue(); nSizeBndsLatLon[0] = nj;
+      nBeginBndsLatLon[1] = domain->ibegin.getValue(); nSizeBndsLatLon[1] = ni;
+      nBeginBndsLatLon[2] = 0; nSizeBndsLatLon[2] = 4;
+
+      domain->bounds_lat_2d.resize(4,ni,nj);
+      readFieldVariableValue(domain->bounds_lat_2d, boundsLatName, nBeginBndsLatLon, nSizeBndsLatLon);
+      domain->bounds_lon_2d.resize(4,ni,nj);
+      readFieldVariableValue(domain->bounds_lon_2d, boundsLonName, nBeginBndsLatLon, nSizeBndsLatLon);
     }
     else if (this->isUnstructured(fieldId))
@@ -236 +272 @@
 
   /*!
-    Read attributes of a domain from a file
+    Read attribute value of a domain from a file
     \param [in] domain domain whose attributes are read from the file
     \param [in] dimSizeMap Dimensions and and their corresponding names and size read from file
     \param [in] emelentPosition position of domain in grid
+    \param [in] fieldId id (or name) associated with the grid
   */
   void CNc4DataInput::readDomainAttributesFromFile(CDomain* domain, std::map<StdString, StdSize>& dimSizeMap,
@@ -251 +288 @@
     itMapNi = itMapNj; ++itMapNi;
 
-    if (this->isRectilinear(fieldId))
+    if (this->isRectilinear(fieldId) || this->isCurvilinear(fieldId))
     {
       domain->nj_glo.setValue(itMapNj->second);
       domain->ni_glo.setValue((itMapNi)->second);
-    }
-    else if (this->isCurvilinear(fieldId))
-    {
-
     }
     else if (this->isUnstructured(fieldId))
@@ -271 +304 @@
     \param [in] dimSizeMap Dimensions and and their corresponding names and size read from file
     \param [in] emelentPosition position of axis in grid
+    \param [in] fieldId id (or name) associated with the grid
   */
   void CNc4DataInput::readAxisAttributesFromFile(CAxis* axis, std::map<StdString, StdSize>& dimSizeMap,
@@ -282 +316 @@
 
   /*!
-    Read attributes of an axis from a file
+    Read attribute value of an axis from a file
     \param [in] axis axis whose attributes are read from the file
     \param [in] dimSizeMap Dimensions and and their corresponding names and size read from file
     \param [in] emelentPosition position of axis in grid
+    \param [in] fieldId id (or name) associated with the grid
   */
   void CNc4DataInput::readAxisAttributeValueFromFile(CAxis* axis, std::map<StdString, StdSize>& dimSizeMap,
@@ -306 +341 @@
   }
 
-  void CNc4DataInput::readFieldVariableValue(CArray<double,1>& var, const StdString& varId,
-                                             const std::vector<StdSize>& nBegin,
-                                             const std::vector<StdSize>& nSize,
-                                             bool forceIndependent)
-  {
-    if (SuperClass::type==MULTI_FILE || !isCollective) return;
-
-    bool openCollective = isCollective;
-    if (forceIndependent) openCollective = !isCollective;
-    switch (SuperClass::type)
-    {
-      case MULTI_FILE:
-        SuperClassWriter::getData(var, varId, openCollective, 0);
-        break;
-      case ONE_FILE:
-      {
-        SuperClassWriter::getData(var, varId, openCollective, 0, &nBegin, &nSize);
-        break;
-      }
-    }
-  }
-
   void CNc4DataInput::closeFile_(void)
   {