Changeset 2689

Timestamp:

12/12/24 10:54:23 (8 weeks ago)

Author:

jderouillat

Message:

Backport fixes from XIOS2 to read attributes

Location:

XIOS3/trunk/src/io

Files:

• inetcdf4.cpp (modified) (2 diffs)
• nc4_data_input.cpp (modified) (1 diff)

XIOS3/trunk/src/io/inetcdf4.cpp

@@ -384 +384 @@
                                  const CVarPath* const path)
   {
-    return this->hasAttribute(CCFKeywords::XIOS_CF_coordinates, &name, path);
+    return ( this->hasAttribute(CCFKeywords::XIOS_CF_coordinates, &name, path) && (this->getAttributeValue(CCFKeywords::XIOS_CF_coordinates, &name, path)!=""));
   }
 
@@ -479 +479 @@
   {
     StdString retvalue;
-    if (this->hasAttribute(CCFKeywords::XIOS_CF_coordinates, &name, path))
+    if (this->hasAttribute(CCFKeywords::XIOS_CF_coordinates, &name, path) && (this->getAttributeValue(CCFKeywords::XIOS_CF_coordinates, &name, path)!="") )
     {
       return this->getAttributeValue(CCFKeywords::XIOS_CF_coordinates, &name, path);

XIOS3/trunk/src/io/nc4_data_input.cpp

@@ -135 +135 @@
     // Verify the compatibility of dimension of declared grid and real grid in file
     int realGridDim = 1;
-    bool isUnstructuredGrid = ((gridDim < 2 || domainP.size()==0) ? false :  SuperClassWriter::isUnstructured(fieldId));
+    bool isUnstructuredGrid( (domainP.size()>0)  );
+    bool domainNotExplicitelyDefined(false);
+    for (int idom=0;idom<domainP.size();idom++)
+    {
+      if ( (!domainP[idom]->type.isEmpty())&& 
+           !(domainP[idom]->type.getValue()==CDomain::type_attr::unstructured || domainP[idom]->type.getValue()==CDomain::type_attr::gaussian))
+      {
+        isUnstructuredGrid = false;
+      }
+      else if (domainP[idom]->type.isEmpty())
+      {
+        domainNotExplicitelyDefined = true;
+      }
+    }
+    if (domainNotExplicitelyDefined)
+    {
+      isUnstructuredGrid = SuperClassWriter::isUnstructured(fieldId);
+    }
     std::map<StdString, StdSize> dimSizeMap = SuperClassWriter::getDimensions(&fieldId);
     std::list<StdString> dimList = SuperClassWriter::getDimensionsList(&fieldId);