Changeset 1422
- Timestamp:
- 02/08/18 16:47:02 (6 years ago)
- Location:
- XIOS/dev/XIOS_DEV_CMIP6/src
- Files:
-
- 1 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_output.cpp.BIS
r1421 r1422 2026 2026 if (!field->default_value.isEmpty()) 2027 2027 { 2028 double default_value = field->default_value.getValue(); 2029 short sdefault_value = (short)default_value; 2030 float fdefault_value = (float)default_value; 2031 if (type == NC_DOUBLE) 2032 SuperClassWriter::setDefaultValue(fieldid, &default_value); 2033 else if (type == NC_SHORT) 2034 SuperClassWriter::setDefaultValue(fieldid, &sdefault_value); 2035 else 2036 SuperClassWriter::setDefaultValue(fieldid, &fdefault_value); 2028 double default_value = field->default_value.getValue(); 2029 if (type == NC_DOUBLE) 2030 { 2031 SuperClassWriter::setDefaultValue(fieldid, &default_value); 2032 } 2033 else if (type == NC_SHORT) 2034 { 2035 short sdefault_value = (short)default_value; 2036 SuperClassWriter::setDefaultValue(fieldid, &sdefault_value); 2037 } 2038 else 2039 { 2040 float fdefault_value = (float)default_value; 2041 SuperClassWriter::setDefaultValue(fieldid, &fdefault_value); 2042 } 2037 2043 } 2038 2044 else -
XIOS/dev/XIOS_DEV_CMIP6/src/node/grid.hpp
r1421 r1422 489 489 { 490 490 int idxTmp = idxLoop[indexMap[i]]; 491 if (idxTmp < (*axisMasks[idx Domain]).numElements())491 if (idxTmp < (*axisMasks[idxAxis]).numElements()) 492 492 maskValue = maskValue && (*axisMasks[idxAxis])(idxTmp); 493 493 else
Note: See TracChangeset
for help on using the changeset viewer.