Changeset 785

Timestamp:

11/12/15 16:33:18 (7 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

Location:

XIOS/trunk

Files:

• inputs/REMAP/iodef.xml (modified) (2 diffs)
• src/io/nc4_data_input.cpp (modified) (2 diffs)
• src/node/domain.cpp (modified) (1 diff)
• src/test/test_remap.f90 (modified) (1 diff)

XIOS/trunk/inputs/REMAP/iodef.xml

@@ -25 +25 @@
      </file>
      <file id="out_dst_regular_pole" name="out_dst_regular_pole" type="one_file">
-<!--        <field field_ref="dst_field_regular_pole" name="field" />-->
+        <field field_ref="dst_field_regular_pole" name="field" />
      </file>
      <file id="output_dst_regular" name="output_dst_regular" type="one_file">
@@ -68 +68 @@
        <generate_rectilinear_domain lat_start="-90" lat_end="90" lon_start="2" lon_end="360"/>
        <interpolate_domain/>
+<!--       <zoom_domain id="dst_domain_regular_pole"/>-->
      </domain>
      <domain id="dst_domain_regular" domain_src="src_domain_regular_tmp" ni_glo="90" nj_glo="45" type="rectilinear">

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));
     }
   }

XIOS/trunk/src/node/domain.cpp

@@ -332 +332 @@
      else  // unstructured domain
      {
-        int globalDomainSize = ni_glo * nj_glo;
-        if (globalDomainSize <= nbLocalDomain)
-        {
-          for (int idx = 0; idx < nbLocalDomain; ++idx)
+       if (this->i_index.isEmpty())
+       {
+          int globalDomainSize = ni_glo * nj_glo;
+          if (globalDomainSize <= nbLocalDomain)
           {
-            if (rankOnDomain < globalDomainSize)
+            for (int idx = 0; idx < nbLocalDomain; ++idx)
             {
-              int iIdx = rankOnDomain % ni_glo;
-              int jIdx = rankOnDomain / ni_glo;
-              ibegin.setValue(iIdx); jbegin.setValue(jIdx);
-              ni.setValue(1); nj.setValue(1);
+              if (rankOnDomain < globalDomainSize)
+              {
+                int iIdx = rankOnDomain % ni_glo;
+                int jIdx = rankOnDomain / ni_glo;
+                ibegin.setValue(iIdx); jbegin.setValue(jIdx);
+                ni.setValue(1); nj.setValue(1);
+              }
+              else
+              {
+                ibegin.setValue(0); jbegin.setValue(0);
+                ni.setValue(0); nj.setValue(0);
+              }
             }
-            else
+          }
+          else
+          {
+            float njGlo = nj_glo.getValue();
+            float niGlo = ni_glo.getValue();
+            std::vector<int> ibeginVec(nbLocalDomain,0);
+            std::vector<int> niVec(nbLocalDomain);
+            for (int i = 1; i < nbLocalDomain; ++i)
             {
-              ibegin.setValue(0); jbegin.setValue(0);
-              ni.setValue(0); nj.setValue(0);
+              int range = ni_glo / nbLocalDomain;
+              if (i < (ni_glo%nbLocalDomain)) ++range;
+              niVec[i-1] = range;
+              ibeginVec[i] = ibeginVec[i-1] + niVec[i-1];
             }
+            niVec[nbLocalDomain-1] = ni_glo - ibeginVec[nbLocalDomain-1];
+
+            int iIdx = rankOnDomain % nbLocalDomain;
+            ibegin.setValue(ibeginVec[iIdx]);
+            jbegin.setValue(0);
+            ni.setValue(niVec[iIdx]);
+            nj.setValue(1);
           }
         }
         else
         {
-          float njGlo = nj_glo.getValue();
-          float niGlo = ni_glo.getValue();
-          std::vector<int> ibeginVec(nbLocalDomain,0);
-          std::vector<int> niVec(nbLocalDomain);
-          for (int i = 1; i < nbLocalDomain; ++i)
-          {
-            int range = ni_glo / nbLocalDomain;
-            if (i < (ni_glo%nbLocalDomain)) ++range;
-            niVec[i-1] = range;
-            ibeginVec[i] = ibeginVec[i-1] + niVec[i-1];
-          }
-          niVec[nbLocalDomain-1] = ni_glo - ibeginVec[nbLocalDomain-1];
-
-          int iIdx = rankOnDomain % nbLocalDomain;
-          ibegin.setValue(ibeginVec[iIdx]);
+          ibegin.setValue(this->i_index(0));
           jbegin.setValue(0);
-          ni.setValue(niVec[iIdx]);
+          ni.setValue(this->i_index.numElements());
           nj.setValue(1);
         }
      }
+
+     checkDomain();
    }
 

XIOS/trunk/src/test/test_remap.f90

@@ -120 +120 @@
                             bounds_lon_1D=dst_boundslon, bounds_lat_1D=dst_boundslat, nvertex=dst_nvertex)
 
+!  CALL xios_set_zoom_domain_attr("dst_domain_regular_pole", zoom_ibegin=10, zoom_ni=10, &
+!                                 zoom_jbegin=10, zoom_nj=10)
 
   dtime%second = 3600