Changeset 527 for XIOS/trunk/src/output/nc4_data_output.cpp

Timestamp:

12/03/14 11:41:54 (9 years ago)

Author:

rlacroix

Message:

Make the variable typing stricter.

The type must now be one of:

• bool
• int or int32
• int16
• int64
• float
• double
• string

WARNING: The variable type was previously not checked and using an unsupported type did not lead to any error message. Be aware that this change can make your existing configuration files invalid. However the adjustments required to adapt existing files should be minor.

File:

• XIOS/trunk/src/output/nc4_data_output.cpp (modified) (2 diffs)

XIOS/trunk/src/output/nc4_data_output.cpp

@@ -803 +803 @@
         try
         {
-          if (var->getVarType()==CVariable::t_int) addAttribute(name,var->getData<int>(),&fieldId) ;
-          else if (var->getVarType()==CVariable::t_short_int) addAttribute(name,var->getData<short int>(),&fieldId) ;
-          else if (var->getVarType()==CVariable::t_long_int) addAttribute(name,var->getData<long int>(),&fieldId) ;
-          else if (var->getVarType()==CVariable::t_float) addAttribute(name,var->getData<float>(),&fieldId) ;
-          else if (var->getVarType()==CVariable::t_double) addAttribute(name,var->getData<double>(),&fieldId) ;
-          else addAttribute(name,var->getData<string>(),&fieldId) ;
+          if (var->type.getValue() == CVariable::type_attr::t_int || var->type.getValue() == CVariable::type_attr::t_int32)
+            addAttribute(name, var->getData<int>(), &fieldId);
+          else if (var->type.getValue() == CVariable::type_attr::t_int16)
+            addAttribute(name, var->getData<short int>(), &fieldId);
+          else if (var->type.getValue() == CVariable::type_attr::t_float)
+            addAttribute(name, var->getData<float>(), &fieldId);
+          else if (var->type.getValue() == CVariable::type_attr::t_double)
+            addAttribute(name, var->getData<double>(), &fieldId);
+          else if (var->type.getValue() == CVariable::type_attr::t_string)
+            addAttribute(name, var->getData<string>(), &fieldId);
+          else
+            ERROR("CNc4DataOutput::writeAttribute_ (CVariable* var, const string& fieldId)",
+                  << "Unsupported variable of type " << var->type.getStringValue());
         }
        catch (CNetCdfException& e)
@@ -830 +837 @@
         try
         {
-          if (var->getVarType()==CVariable::t_int) addAttribute(name,var->getData<int>()) ;
-          else if (var->getVarType()==CVariable::t_short_int) addAttribute(name,var->getData<short int>()) ;
-          else if (var->getVarType()==CVariable::t_long_int) addAttribute(name,var->getData<long int>()) ;
-          else if (var->getVarType()==CVariable::t_float) addAttribute(name,var->getData<float>()) ;
-          else if (var->getVarType()==CVariable::t_double) addAttribute(name,var->getData<double>()) ;
-          else addAttribute(name,var->getData<string>()) ;
+          if (var->type.getValue() == CVariable::type_attr::t_int || var->type.getValue() == CVariable::type_attr::t_int32)
+            addAttribute(name, var->getData<int>());
+          else if (var->type.getValue() == CVariable::type_attr::t_int16)
+            addAttribute(name, var->getData<short int>());
+          else if (var->type.getValue() == CVariable::type_attr::t_float)
+            addAttribute(name, var->getData<float>());
+          else if (var->type.getValue() == CVariable::type_attr::t_double)
+            addAttribute(name, var->getData<double>());
+          else if (var->type.getValue() == CVariable::type_attr::t_string)
+            addAttribute(name, var->getData<string>());
+          else
+            ERROR("CNc4DataOutput::writeAttribute_ (CVariable* var)",
+                  << "Unsupported variable of type " << var->type.getStringValue());
         }
        catch (CNetCdfException& e)