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

tests/pio_write.c

@@ -184,7 +184,8 @@ parse_long_option(struct model_config *restrict setup, int pioConfHandle, pioRol
   static const char cacheRedistStr[] = "no-cache-redists", pioRoleSchemeOptionStr[] = "pio-role-scheme",
                     curvilinearGridOptionStr[] = "no-create-curvilinear-grid", uuidCreateOptionStr[] = "no-create-uuid",
                     useDistGridOptionStr[] = "no-use-dist-grid", batchedRmaOptionStr[] = "no-batch-rma",
-                    datatypeOptionStr[] = "datatype", taxistypeOptionStr[] = "taxis-type", taxisunitOptionStr[] = "taxis-unit";
+                    presetDecoOptionStr[] = "no-preset-decomposition", datatypeOptionStr[] = "datatype",
+                    taxistypeOptionStr[] = "taxis-type", taxisunitOptionStr[] = "taxis-unit";
   static const struct string2int datatypeArgMap[] = {
     { "pack", CDI_DATATYPE_PACK },     { "pack1", CDI_DATATYPE_PACK1 },   { "pack2", CDI_DATATYPE_PACK2 },
     { "pack3", CDI_DATATYPE_PACK3 },   { "pack4", CDI_DATATYPE_PACK4 },   { "pack5", CDI_DATATYPE_PACK5 },
@@ -276,6 +277,15 @@ parse_long_option(struct model_config *restrict setup, int pioConfHandle, pioRol
     {
       setup->flags = (setup->flags & ~PIO_WRITE_CONFIG_CREATE_UUID_FLAG) | (bop.value << PIO_WRITE_CONFIG_CREATE_UUID_BIT);
     }
+  else if ((bop = parseBooleanLongOption(sizeof(presetDecoOptionStr), presetDecoOptionStr, str)).matched)
+    {
+#ifdef USE_MPI
+      setup->flags
+          = (setup->flags & ~PIO_WRITE_CONFIG_PRESET_DECOMPOSITION_FLAG) | (bop.value << PIO_WRITE_CONFIG_PRESET_DECOMPOSITION_BIT);
+#else
+      invalidOptionDie("CDI-PIO option -q%s unavailable in non-MPI mode\n", presetDecoOptionStr + (bop.invert ? 0 : 3));
+#endif
+    }
   else if ((bop = parseBooleanLongOption(sizeof(batchedRmaOptionStr), batchedRmaOptionStr, str)).matched)
     {
 #ifdef USE_MPI