Consolidation with CDI-PIO (develop)

Generally, this is !11 (merged) rebased onto the develop branch.

This is the first develop-based version accepted by the Buildbot of ICON: https://buildbot.dkrz.de/grid?branch=m300488/cdi-pio-2-integration

src/taxis.c

@@ -15,10 +15,6 @@
 static int DefaultTimeType = TAXIS_ABSOLUTE;
 static int DefaultTimeUnit = TUNIT_HOUR;
 
-static const char Timeunits[][TAXIS_MAX_UNIT_STR_LEN + 1] = {
-  "undefined", "seconds", "minutes", "quarters", "30minutes", "hours", "3hours", "6hours", "12hours", "days", "months", "years",
-};
-
 static int taxisCompareP(void *taxisptr1, void *taxisptr2);
 static void taxisDestroyP(void *taxisptr);
 static void taxisPrintKernel(taxis_t *taxisptr, FILE *fp);
@@ -80,11 +76,17 @@ taxisNamePtr(int taxisID)
 const char *
 tunitNamePtr(int unitID)
 {
+  static const char Timeunits[][TAXIS_MAX_UNIT_STR_LEN + 1] = {
+    "undefined", "seconds", "minutes", "quarters", "30minutes", "hours", "3hours", "6hours", "12hours", "days", "months", "years",
+  };
   enum
   {
-    size = sizeof(Timeunits) / sizeof(*Timeunits)
+    size = sizeof(Timeunits) / sizeof(Timeunits[0])
   };
-  return (unitID > 0 && unitID < size) ? Timeunits[unitID] : Timeunits[0];
+
+  const char *name = unitID > 0 && unitID < size ? Timeunits[unitID] : Timeunits[0];
+
+  return name;
 }
 static void
 taxisDefaultValue(taxis_t *taxisptr)