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

Timestamp:

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

Author:

mhnguyen

Message:

Allowing each process to retrieve its own distribution with i_index

+) Read value and data from unstructured grid with provided i_index value

Test
+) On Curie
+) test_remap works

File:

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

XIOS/trunk/src/io/nc4_data_input.cpp

@@ -232 +232 @@
       domain->fillInRectilinearLonLat();
     }
+    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.");
+
+      int nbVertex = this->getNbVertex(fieldId);
+      domain->nvertex.setValue(nbVertex);
+      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] = nbVertex;
+
+      domain->bounds_lat_2d.resize(nbVertex,ni,nj);
+      readFieldVariableValue(domain->bounds_lat_2d, boundsLatName, nBeginBndsLatLon, nSizeBndsLatLon);
+      domain->bounds_lon_2d.resize(nbVertex,ni,nj);
+      readFieldVariableValue(domain->bounds_lon_2d, boundsLonName, nBeginBndsLatLon, nSizeBndsLatLon);
+    }
     else if (this->isUnstructured(fieldId))
     {
-      int ni = domain->ni;
+      if (domain->i_index.isEmpty())
+         ERROR("CNc4DataInput::readDomainAttributeValueFromFile(...)",
+              << "Field '" << fieldId << std::endl
+              << "Trying to read attributes from unstructured grid."
+              << "i_index of domain" << domain->getId() << " is mandatory");
+
+      int ni = domain->i_index.numElements();
       std::vector<StdSize> nBeginLatLon(1,0), nSizeLatLon(1,0);
-      nBeginLatLon[0] = domain->ibegin.getValue();
-      nSizeLatLon[0]  = ni;
+      nSizeLatLon[0]  = domain->ni_glo.getValue();
+      CArray<double,1> globalLonLat(domain->ni_glo.getValue());
 
       StdString latName = this->getLatCoordName(fieldId);
+      readFieldVariableValue(globalLonLat, latName, nBeginLatLon, nSizeLatLon);
       domain->latvalue_1d.resize(ni);
-      readFieldVariableValue(domain->latvalue_1d, latName, nBeginLatLon, nSizeLatLon);
+      for (int idx = 0; idx < ni; ++idx)
+        domain->latvalue_1d(idx) =  globalLonLat(domain->i_index(idx));
+
       StdString lonName = this->getLonCoordName(fieldId);
+      readFieldVariableValue(globalLonLat, lonName, nBeginLatLon, nSizeLatLon);
       domain->lonvalue_1d.resize(ni);
-      readFieldVariableValue(domain->lonvalue_1d, lonName, nBeginLatLon, nSizeLatLon);
+      for (int idx = 0; idx < ni; ++idx)
+        domain->lonvalue_1d(idx) = globalLonLat(domain->i_index(idx));
 
       StdString boundsLatName = this->getBoundsId(latName);
@@ -262 +313 @@
       domain->nvertex.setValue(nbVertex);
       std::vector<StdSize> nBeginBndsLatLon(2), nSizeBndsLatLon(2);
-      nBeginBndsLatLon[0] = domain->ibegin.getValue(); nSizeBndsLatLon[0] = ni;
+      nBeginBndsLatLon[0] = 0; nSizeBndsLatLon[0] = domain->ni_glo.getValue();
       nBeginBndsLatLon[1] = 0; nSizeBndsLatLon[1] = nbVertex;
 
+      CArray<double,2> globalBndsLonLat(nSizeBndsLatLon[1], nSizeBndsLatLon[0]);
+      readFieldVariableValue(globalBndsLonLat, boundsLatName, nBeginBndsLatLon, nSizeBndsLatLon);
       domain->bounds_lat_1d.resize(nbVertex,ni);
-      readFieldVariableValue(domain->bounds_lat_1d, boundsLatName, nBeginBndsLatLon, nSizeBndsLatLon);
+      for (int idx = 0; idx < ni; ++idx)
+        for (int jdx = 0; jdx < nbVertex; ++jdx)
+          domain->bounds_lat_1d(jdx,idx) = globalBndsLonLat(jdx, domain->i_index(idx));
+
+      readFieldVariableValue(globalBndsLonLat, boundsLonName, nBeginBndsLatLon, nSizeBndsLatLon);
       domain->bounds_lon_1d.resize(nbVertex,ni);
-      readFieldVariableValue(domain->bounds_lon_1d, boundsLonName, nBeginBndsLatLon, nSizeBndsLatLon);
-    }
-    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.");
-
-      int nbVertex = this->getNbVertex(fieldId);
-      domain->nvertex.setValue(nbVertex);
-      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] = nbVertex;
-
-      domain->bounds_lat_2d.resize(nbVertex,ni,nj);
-      readFieldVariableValue(domain->bounds_lat_2d, boundsLatName, nBeginBndsLatLon, nSizeBndsLatLon);
-      domain->bounds_lon_2d.resize(nbVertex,ni,nj);
-      readFieldVariableValue(domain->bounds_lon_2d, boundsLonName, nBeginBndsLatLon, nSizeBndsLatLon);
+      for (int idx = 0; idx < ni; ++idx)
+        for (int jdx = 0; jdx < nbVertex; ++jdx)
+          domain->bounds_lon_1d(jdx,idx) = globalBndsLonLat(jdx, domain->i_index(idx));
     }
   }