Changeset 1410 for XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_input.cpp

Timestamp:

01/24/18 18:45:14 (6 years ago)

Author:

oabramkina

Message:

Improving protocol for reading : grid attributes such longitude, latitude, etc are read by clients locally.
It concerns only curvilinear and unstructured domains. Local attributes such as ni/nj, ibegin/jbegin are mandatory as before.

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_input.cpp (modified) (8 diffs)

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

@@ -264 +264 @@
     if ((CDomain::type_attr::rectilinear == domain->type))
     {
-      // Ok, try to read some f.. attributes such as longitude and latitude
+      // Ok, try to read some attributes such as longitude and latitude
       bool hasLat = SuperClassWriter::hasVariable(itMapNj->first);
       if (hasLat)
@@ -283 +283 @@
     else if ((CDomain::type_attr::curvilinear == domain->type))
     {
-      int ni = domain->ni;
-      int nj = domain->nj;
+      int ni, nj;
       std::vector<StdSize> nBeginLatLon(2), nSizeLatLon(2);
-      nBeginLatLon[0] = 0; nBeginLatLon[1] = 0;
-      nSizeLatLon[0]  = domain->nj_glo.getValue(); nSizeLatLon[1] = domain->ni_glo.getValue();
+
+      if (domain->ni.isEmpty())
+      {
+        ERROR("void CNc4DataInput::readDomainAttributeValueFromFile(...)",
+          << " Value of attribute ni should be defined for domain " << domain->getDomainOutputName()
+          << " in file " << this->filename << "."
+          << " The value can be provided by a user or generated automatically by XIOS."
+          << " Functionality generate_rectilinear_domain can also be used for curvilinear domains."
+          << std::endl);
+      }
+
+      if (domain->nj.isEmpty())
+      {
+        ERROR("void CNc4DataInput::readDomainAttributeValueFromFile(...)",
+          << " Value of attribute nj should be defined for domain " << domain->getDomainOutputName()
+          << " in file " << this->filename << "."
+          << " The value can be provided by a user or generated automatically by XIOS."
+          << " Functionality generate_rectilinear_domain can also be used for curvilinear domains."
+          << std::endl);
+      }
+
+      if (domain->ibegin.isEmpty())
+      {
+        ERROR("void CNc4DataInput::readDomainAttributeValueFromFile(...)",
+          << " Value of attribute ibegin should be defined for domain " << domain->getDomainOutputName()
+          << " in file " << this->filename << "."
+          << " The value can be provided by a user or generated automatically by XIOS."
+          << " Functionality generate_rectilinear_domain can also be used for curvilinear domains."
+          << std::endl);
+      }
+
+      if (domain->jbegin.isEmpty())
+      {
+        ERROR("void CNc4DataInput::readDomainAttributeValueFromFile(...)",
+          << " Value of attribute jbegin should be defined for domain " << domain->getDomainOutputName()
+          << " in file " << this->filename << "."
+          << " The value can be provided by a user or generated automatically by XIOS."
+          << " Functionality generate_rectilinear_domain can also be used for curvilinear domains."
+          << std::endl);
+      }
+
+      ni = domain->ni;
+      nj = domain->nj;
+      nBeginLatLon[0] = domain->jbegin; nBeginLatLon[1] = domain->ibegin;
+      nSizeLatLon[0]  = nj; nSizeLatLon[1] = ni;
+//      ni = domain->ni_glo;
+//      nj = domain->nj_glo;
+//      nBeginLatLon[0] = 0; nBeginLatLon[1] = 0;
+//      nSizeLatLon[0]  = domain->nj_glo.getValue(); nSizeLatLon[1] = domain->ni_glo.getValue();
 
       StdString latName = this->getLatCoordName(fieldId);
       if (SuperClassWriter::hasVariable(latName))
       {
-        domain->latvalue_curvilinear_read_from_file.resize(domain->ni_glo,domain->nj_glo);
+        domain->latvalue_curvilinear_read_from_file.resize(ni,nj);
         readFieldVariableValue(domain->latvalue_curvilinear_read_from_file, latName, nBeginLatLon, nSizeLatLon);
       }
@@ -298 +344 @@
       if (SuperClassWriter::hasVariable(lonName))
       {
-        domain->lonvalue_curvilinear_read_from_file.resize(domain->ni_glo,domain->nj_glo);
+        domain->lonvalue_curvilinear_read_from_file.resize(ni,nj);
         readFieldVariableValue(domain->lonvalue_curvilinear_read_from_file, lonName, nBeginLatLon, nSizeLatLon);
       }
@@ -320 +366 @@
 
       std::vector<StdSize> nBeginBndsLatLon(3), nSizeBndsLatLon(3);
-      nBeginBndsLatLon[0] = 0; nSizeBndsLatLon[0] = domain->nj_glo.getValue();
-      nBeginBndsLatLon[1] = 0; nSizeBndsLatLon[1] = domain->ni_glo.getValue();
+      nBeginBndsLatLon[0] = domain->jbegin; nSizeBndsLatLon[0] = domain->nj.getValue();
+      nBeginBndsLatLon[1] = domain->ibegin; nSizeBndsLatLon[1] = domain->ni.getValue();
       nBeginBndsLatLon[2] = 0; nSizeBndsLatLon[2] = nbVertex;
+//      nBeginBndsLatLon[0] = 0; nSizeBndsLatLon[0] = domain->nj_glo.getValue();
+//      nBeginBndsLatLon[1] = 0; nSizeBndsLatLon[1] = domain->ni_glo.getValue();
+//      nBeginBndsLatLon[2] = 0; nSizeBndsLatLon[2] = nbVertex;
 
       if (SuperClassWriter::hasVariable(boundsLatName))
       {
-        domain->bounds_latvalue_curvilinear_read_from_file.resize(nbVertex,domain->ni_glo,domain->nj_glo);
+        domain->bounds_latvalue_curvilinear_read_from_file.resize(nbVertex,ni,nj);
         readFieldVariableValue(domain->bounds_latvalue_curvilinear_read_from_file, boundsLatName, nBeginBndsLatLon, nSizeBndsLatLon);
 
@@ -332 +381 @@
       if (SuperClassWriter::hasVariable(boundsLonName)) 
       {
-        domain->bounds_lonvalue_curvilinear_read_from_file.resize(nbVertex,domain->ni_glo,domain->nj_glo);
+        domain->bounds_lonvalue_curvilinear_read_from_file.resize(nbVertex,ni,nj);
         readFieldVariableValue(domain->bounds_lonvalue_curvilinear_read_from_file, boundsLonName, nBeginBndsLatLon, nSizeBndsLatLon);
       }      
@@ -338 +387 @@
     else if ((CDomain::type_attr::unstructured == domain->type))// || (this->isUnstructured(fieldId)))
     {
+      if (domain->ni.isEmpty())
+      {
+        ERROR("void CNc4DataInput::readDomainAttributeValueFromFile(...)",
+          << " Value of attribute ni should be defined for domain " << domain->getDomainOutputName()
+          << " in file " << this->filename << "."
+          << std::endl);
+      }
+
+      if (domain->ibegin.isEmpty())
+      {
+        ERROR("void CNc4DataInput::readDomainAttributeValueFromFile(...)",
+          << " Value of attribute ibegin should be defined for domain " << domain->getDomainOutputName()
+          << " in file " << this->filename << "."
+          << std::endl);
+      }
+
+      int ni;
       std::vector<StdSize> nBeginLatLon(1,0), nSizeLatLon(1,0);
-      nSizeLatLon[0]  = domain->ni_glo.getValue();
-      CArray<double,1> globalLonLat(domain->ni_glo.getValue());
+
+      ni = domain->ni;
+      nBeginLatLon[0] = domain->ibegin;
+//      ni = domain->ni_glo;
+//      nBeginLatLon[0] = 0;
+      nSizeLatLon[0] = ni;
 
       StdString latName = this->getLatCoordName(fieldId);
       if (SuperClassWriter::hasVariable(latName))
       {
-        domain->latvalue_unstructured_read_from_file.resize(domain->ni_glo);
+        domain->latvalue_unstructured_read_from_file.resize(ni);
         readFieldVariableValue(domain->latvalue_unstructured_read_from_file, latName, nBeginLatLon, nSizeLatLon);  
       }
@@ -352 +422 @@
       if (SuperClassWriter::hasVariable(lonName)) //(0 != lonName.compare(""))
       {
-        // readFieldVariableValue(globalLonLat, lonName, nBeginLatLon, nSizeLatLon);
-        domain->lonvalue_unstructured_read_from_file.resize(domain->ni_glo);
+        domain->lonvalue_unstructured_read_from_file.resize(ni);
         readFieldVariableValue(domain->lonvalue_unstructured_read_from_file, lonName, nBeginLatLon, nSizeLatLon);
       }
@@ -375 +444 @@
 
       std::vector<StdSize> nBeginBndsLatLon(2), nSizeBndsLatLon(2);
-      nBeginBndsLatLon[0] = 0; nSizeBndsLatLon[0] = domain->ni_glo.getValue();
-      nBeginBndsLatLon[1] = 0; nSizeBndsLatLon[1] = nbVertex;
-
-      if (SuperClassWriter::hasVariable(boundsLatName)) 
+
+      nBeginBndsLatLon[0] = 0; nSizeBndsLatLon[0] = domain->ni.getValue();
+      nBeginBndsLatLon[1] = domain->ibegin.getValue(); nSizeBndsLatLon[1] = nbVertex;
+//      nBeginBndsLatLon[0] = 0; nSizeBndsLatLon[0] = domain->ni_glo.getValue();
+//      nBeginBndsLatLon[1] = 0; nSizeBndsLatLon[1] = nbVertex;
+
+        if (SuperClassWriter::hasVariable(boundsLatName))
       {
         domain->bounds_latvalue_unstructured_read_from_file.resize(nSizeBndsLatLon[1], nSizeBndsLatLon[0]);