Pack: change datatype to int16 if set to CDI_DATATYPE_INT32|CDI_DATATYPE_UINT32

src/Pack.cc

@@ -26,7 +26,7 @@
 #include "field_functions.h"
 
 static int
-get_type_values(const int datatype, double &tmin, double &tmax, double &tmv)
+get_type_values(int datatype, double &tmin, double &tmax, double &tmv)
 {
   int status = 0;
 
@@ -47,7 +47,7 @@ get_type_values(const int datatype, double &tmin, double &tmax, double &tmv)
 }
 
 static int
-compute_scale_and_offset(const int datatype, const double fmin, const double fmax, double &scaleFactor, double &addOffset)
+compute_scale_and_offset(int datatype, double fmin, double fmax, double &scaleFactor, double &addOffset)
 {
   scaleFactor = 1.0;
   addOffset = 0.0;
@@ -131,11 +131,23 @@ public:
     taxisID2 = taxisDuplicate(taxisID1);
     vlistDefTaxis(vlistID2, taxisID2);
 
+    streamID2 = cdo_open_write(1);
+
     varListInit(varList, vlistID1);
 
     nvars = vlistNvars(vlistID1);
 
-    streamID2 = cdo_open_write(1);
+    if (CdoDefault::DataType != CDI_UNDEFID)
+      {
+        // 32-bit float routing error with CDI_DATATYPE_INT32|CDI_DATATYPE_UINT32
+        if (CdoDefault::DataType == CDI_DATATYPE_FLT64 || CdoDefault::DataType == CDI_DATATYPE_FLT32 ||
+            CdoDefault::DataType == CDI_DATATYPE_INT32 || CdoDefault::DataType == CDI_DATATYPE_UINT32)
+          {
+            cdo_warning("Changed default output datatype to int16");
+            CdoDefault::DataType = datatype;
+          }
+        else { datatype = CdoDefault::DataType; }
+      }
   }
 
   void
@@ -168,17 +180,6 @@ public:
 
     auto nts = tsID;
 
-    if (CdoDefault::DataType != CDI_UNDEFID)
-      {
-        if (CdoDefault::DataType == CDI_DATATYPE_FLT64 || CdoDefault::DataType == CDI_DATATYPE_FLT32)
-          {
-            cdo_warning("Changed default output datatype to int16");
-            CdoDefault::DataType = datatype;
-          }
-        else { datatype = CdoDefault::DataType; }
-      }
-
-    CdoDefault::DataType = datatype;
     constexpr double undefValue = 1.0e300;
 
     for (int varID = 0; varID < nvars; ++varID)
@@ -237,10 +238,10 @@ public:
 
         if (hasValidData)
           {
-            auto memTypeIsFloat = (var.memType == MemType::Float);
             double scaleFactor, addOffset;
             if (!compute_scale_and_offset(datatype, fmin, fmax, scaleFactor, addOffset))
               {
+                auto memTypeIsFloat = (var.memType == MemType::Float);
                 cdiDefKeyFloat(vlistID2, varID, CDI_KEY_ADDOFFSET, memTypeIsFloat ? (float) addOffset : addOffset);
                 cdiDefKeyFloat(vlistID2, varID, CDI_KEY_SCALEFACTOR, memTypeIsFloat ? (float) scaleFactor : scaleFactor);
               }
@@ -290,5 +291,6 @@ Pack(void *process)
   pack.init(process);
   pack.run();
   pack.close();
+
   return nullptr;
 }

src/field_memory.cc

@@ -12,7 +12,7 @@
 #include "cdo_options.h"
 
 static void
-fields_from_vlist_kernel(const int vlistID, FieldVector2D &field2D, int ptype, bool lfill, double fillValue)
+fields_from_vlist_kernel(int vlistID, FieldVector2D &field2D, int ptype, bool lfill, double fillValue)
 {
   auto allocateData = (ptype & FIELD_VEC);
   auto nvars = vlistNvars(vlistID);
@@ -70,19 +70,19 @@ fields_from_vlist_kernel(const int vlistID, FieldVector2D &field2D, int ptype, b
 }
 
 void
-fields_from_vlist(const int vlistID, FieldVector2D &field2D)
+fields_from_vlist(int vlistID, FieldVector2D &field2D)
 {
   fields_from_vlist_kernel(vlistID, field2D, 0, false, 0);
 }
 
 void
-fields_from_vlist(const int vlistID, FieldVector2D &field2D, int ptype)
+fields_from_vlist(int vlistID, FieldVector2D &field2D, int ptype)
 {
   fields_from_vlist_kernel(vlistID, field2D, ptype, false, 0);
 }
 
 void
-fields_from_vlist(const int vlistID, FieldVector2D &field2D, int ptype, double fillValue)
+fields_from_vlist(int vlistID, FieldVector2D &field2D, int ptype, double fillValue)
 {
   fields_from_vlist_kernel(vlistID, field2D, ptype, true, fillValue);
 }