Changeset 782 for XIOS/trunk/src/io/nc4_data_input.hpp

Timestamp:

11/12/15 16:33:03 (8 years ago)

Author:

mhnguyen

Message:

Reading attributes of curvilinear grid from file

+) Correct some minor bugs detecting type of grid
+) Use constant string for attributes conforming to CF convention
+) Add part of code to read attributes of curvilinear grid

Test
+) On Curie
+) test_remap passes

File:

• XIOS/trunk/src/io/nc4_data_input.hpp (modified) (2 diffs)

XIOS/trunk/src/io/nc4_data_input.hpp

@@ -50 +50 @@
                                         int elementPosition, const StdString& fieldId);
 
-    void readFieldVariableValue(CArray<double,1>& var, const StdString& varId,
+    template <typename T, int Ndim>
+    void readFieldVariableValue(CArray<T, Ndim>& var, const StdString& varId,
                                 const std::vector<StdSize>& nBegin,
                                 const std::vector<StdSize>& nSize,
@@ -65 +66 @@
     bool isCollective;
   }; // class CNc4DataInput
+
+template <typename T, int Ndim>
+void CNc4DataInput::readFieldVariableValue(CArray<T,Ndim>& var, const StdString& varId,
+                                           const std::vector<StdSize>& nBegin,
+                                           const std::vector<StdSize>& nSize,
+                                           bool forceIndependent)
+{
+  if (SuperClass::type==MULTI_FILE || !isCollective) return;
+
+  bool openCollective = isCollective;
+  if (forceIndependent) openCollective = !isCollective;
+  switch (SuperClass::type)
+  {
+    case MULTI_FILE:
+      ERROR("CINetCDF4::readFieldVariableValue(...)",
+            << "Only support attributes reading with one_file mode");
+      break;
+    case ONE_FILE:
+    {
+      SuperClassWriter::getData(var, varId, openCollective, 0, &nBegin, &nSize);
+      break;
+    }
+  }
+}
 } // namespace xios