Changeset 1487 for XIOS/trunk/src/node

Timestamp:

04/20/18 15:04:38 (6 years ago)

Author:

oabramkina

Message:

Trunk: minor modifications for reading UGRID.

Using attribute nvertex defined by a user and not deduced from metadata of a file being read.
Taking into account the fact that the bounds attribute is not required by UGRID.

Location:

XIOS/trunk/src/node

Files:

• domain.cpp (modified) (1 diff)
• file.cpp (modified) (1 diff)

XIOS/trunk/src/node/domain.cpp

@@ -1369 +1369 @@
                << "Since 'bounds_lat_2d' is defined, 'latvalue_2d' must be defined too." << std::endl);
 
-       hasBounds = true;
+       //hasBounds = true;
+       // In case of reading UGRID bounds values are not required
+       hasBounds = (!bounds_lat_1d.isEmpty() || !bounds_lat_2d.isEmpty() );
      }
      else

XIOS/trunk/src/node/file.cpp

@@ -597 +597 @@
 
       if (isOpen) data_out->closeFile();
-      if (time_counter_name.isEmpty()) data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective));
-      else data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective, time_counter_name));
+      bool ugridConvention = !convention.isEmpty() ? (convention == convention_attr::UGRID) : false;
+      if (time_counter_name.isEmpty()) data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective, ugridConvention));
+      else data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective, ugridConvention, time_counter_name));
       isOpen = true;
     }