Changeset 1392 for XIOS

Timestamp:

01/10/18 11:55:33 (6 years ago)

Author:

oabramkina

Message:

Correcting a bug in case if default_value is given as short int.

Location:

XIOS/dev/XIOS_DEV_CMIP6/src/io

Files:

• nc4_data_output.cpp (modified) (1 diff)
• onetcdf4_decl.cpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_output.cpp

@@ -1989 +1989 @@
            {
               double default_value = field->default_value.getValue();
+              short sdefault_value = (short)default_value;
               float fdefault_value = (float)default_value;
               if (type == NC_DOUBLE)
                  SuperClassWriter::setDefaultValue(fieldid, &default_value);
+              else if (type == NC_SHORT)
+                  SuperClassWriter::setDefaultValue(fieldid, &sdefault_value);
               else
                  SuperClassWriter::setDefaultValue(fieldid, &fdefault_value);

XIOS/dev/XIOS_DEV_CMIP6/src/io/onetcdf4_decl.cpp

@@ -17 +17 @@
  
   template void CONetCDF4::setDefaultValue<double>(const StdString & varname, const double* value) ;
+  template void CONetCDF4::setDefaultValue<short>(const StdString & varname, const short* value) ;
   template void CONetCDF4::setDefaultValue<float>(const StdString & varname, const float* value) ;
 }