Changeset 686 for XIOS/trunk/src/io/netCdfInterface_decl.cpp

Timestamp:

09/15/15 15:15:57 (9 years ago)

Author:

rlacroix

Message:

Use the NetCDF wrapper for inputs for better error checking.

File:

• XIOS/trunk/src/io/netCdfInterface_decl.cpp (modified) (1 diff)

XIOS/trunk/src/io/netCdfInterface_decl.cpp

@@ -12 +12 @@
 namespace xios
 {
-#define  macroPutAtt(type) \
-  template int CNetCdfInterface::putAttType(int ncid, int varid, const StdString& attrName, \
-                                            StdSize numVal, const type* op);
+#define macroAtt(type) \
+  template int CNetCdfInterface::getAttType(int ncid, int varid, const StdString& attrName, type* data); \
+  template int CNetCdfInterface::putAttType(int ncid, int varid, const StdString& attrName,              \
+                                            StdSize numVal, const type* data);
 
-  macroPutAtt(double);
-  macroPutAtt(float);
-  macroPutAtt(int);
-  macroPutAtt(long);
-  macroPutAtt(short);
+  macroAtt(double)
+  macroAtt(float)
+  macroAtt(int)
+  macroAtt(long)
+  macroAtt(short)
+  macroAtt(char)
 
-#define  macroPutVar(type) \
+#define macroPutVar(type) \
+ template int CNetCdfInterface::getVaraType(int ncid, int varId, const StdSize* start, \
+                                            const StdSize* count, type* data);         \
  template int CNetCdfInterface::putVaraType(int ncid, int varId, const StdSize* start, \
-                                            const StdSize* count, const type* op);
-  macroPutVar(double);
-  macroPutVar(float);
-  macroPutVar(int);
+                                            const StdSize* count, const type* data);
+
+  macroPutVar(double)
+  macroPutVar(float)
+  macroPutVar(int)
+
+#define macroType(type, ncType) \
+  template<> nc_type CNetCdfInterface::getNcType<type>() { return ncType; }
+
+  macroType(double, NC_DOUBLE)
+  macroType(float, NC_FLOAT)
+  macroType(int, NC_INT)
+  macroType(long, NC_LONG)
+  macroType(short, NC_SHORT)
+  macroType(char, NC_CHAR)
 }