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,7 +15,7 @@
 static int DefaultTimeType = TAXIS_ABSOLUTE;
 static int DefaultTimeUnit = TUNIT_HOUR;
 
-static const char *Timeunits[] = {
+static const char Timeunits[][TAXIS_MAX_UNIT_STR_LEN + 1] = {
   "undefined", "seconds", "minutes", "quarters", "30minutes", "hours", "3hours", "6hours", "12hours", "days", "months", "years",
 };
 
@@ -80,7 +80,10 @@ taxisNamePtr(int taxisID)
 const char *
 tunitNamePtr(int unitID)
 {
-  const int size = sizeof(Timeunits) / sizeof(*Timeunits);
+  enum
+  {
+    size = sizeof(Timeunits) / sizeof(*Timeunits)
+  };
   return (unitID > 0 && unitID < size) ? Timeunits[unitID] : Timeunits[0];
 }
 static void