Changeset 1589 for XIOS/dev/dev_olga/src/io

Timestamp:

11/05/18 13:57:52 (6 years ago)

Author:

oabramkina

Message:

Backporting r1578 and r1586 to dev, cleaning the code before merging it to XIOS 2.5.

Location:

XIOS/dev/dev_olga/src/io

Files:

• nc4_data_input.cpp (modified) (1 diff)
• nc4_data_output.cpp (modified) (3 diffs)

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

@@ -494 +494 @@
       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) ;
+    }
   }
 

XIOS/dev/dev_olga/src/io/nc4_data_output.cpp

@@ -166 +166 @@
            for (int idx = 0; idx < nbWritten; ++idx)
            {
-                  if (indexToWrite(idx) < 0)
-                  {
-              writtenLat(idx) = -1.;   // hole
-              writtenLon(idx) = -1.;
-                  }
-                  else
-                  {
-              writtenLat(idx) = domain->latvalue(indexToWrite(idx));
-              writtenLon(idx) = domain->lonvalue(indexToWrite(idx));
-                  }
-           }
-         
+             if (indexToWrite(idx) < 0)
+             {
+               writtenLat(idx) = -1.;   // hole
+               writtenLon(idx) = -1.;
+             }
+             else
+             {
+               writtenLat(idx) = domain->latvalue(indexToWrite(idx));
+               writtenLon(idx) = domain->lonvalue(indexToWrite(idx));
+             }
+           }
 
            if (domain->hasBounds)
@@ -999 +998 @@
            for (int idx = 0; idx < nbWritten; ++idx)
            {
-                  if (indexToWrite(idx) < 0)
-              writtenArea(idx) = -1.;
-                  else
-                    writtenArea(idx) = domain->areavalue(indexToWrite(idx));
+             if (indexToWrite(idx) < 0)
+               writtenArea(idx) = -1.;
+             else
+               writtenArea(idx) = domain->areavalue(indexToWrite(idx));
            }
          }
@@ -1329 +1328 @@
                       axis_bounds(0, i) = axis->bounds(0, int(indexToWrite(i)));
                       axis_bounds(1, i) = axis->bounds(1, int(indexToWrite(i)));
-
                     }
                   }