Set max mpi_task_num to 6

config/default

@@ -63,14 +63,23 @@ case "${HOSTNAME}" in
 	            CC=gcc CFLAGS="-g -pipe -D_REENTRANT -Wall -W -Wfloat-equal -pedantic -O2"
 	;;
     hama*)
-        CDILIBS="--disable-iso-c-interface \
+        CDILIBS="--enable-iso-c-interface \
                  --enable-maintainer-mode \
+                 --enable-swig \
+                 --enable-python \
                  --with-szlib=/opt/local/lib/libaec \
                  --with-eccodes=/opt/local \
                  --with-netcdf=/opt/local"
         PREFIX="--prefix=$HOME/local/cdi"
         # LD_ADD="-Wl,-rpath,$HOME/local/eccodes-2.32.0/lib"
-        if  test "$COMP" = clang ; then
+        if  test "$COMP" = mpicc ; then
+          MPI_LAUNCH="$(which mpirun)"
+          YAXT_ROOT='/Users/m214003/local/yaxt-0.10.0'
+          ${CONFPATH}configure --enable-mpi $CONFIG_OPTS $CDILIBS LDFLAGS="$LD_ADD $LDFLAGS" \
+	             CC=mpicc CFLAGS="-g -pipe -D_REENTRANT -Wall -Wwrite-strings -W -Wfloat-equal -pedantic -O3" \
+                     MPI_LAUNCH="${MPI_LAUNCH}" \
+                     PKG_CONFIG_PATH="${YAXT_ROOT}/lib/pkgconfig"
+        elif  test "$COMP" = clang ; then
           ${CONFPATH}configure $CONFIG_OPTS $PREFIX $CDILIBS LDFLAGS="$LD_ADD $LDFLAGS" \
 	             CC=clang CFLAGS="-g -pipe -D_REENTRANT -Wall -Wwrite-strings -W -Wfloat-equal -pedantic -O3"
 	else

tests/pio_cksum_asynch.run.in

 #!@SHELL@
 
 pio_write_args="-p PIO_ASYNCH -w 3"
-mpi_task_num=7
+#mpi_task_num=7
+mpi_task_num=6
 
 . ./pio_write.run
 ( . ./pio_write_dist_array.run ) || test $? -eq 77

tests/pio_cksum_grb2.run.in

@@ -2,7 +2,8 @@
 
 suffix=grb2
 pio_write_args="-w 3"
-mpi_task_num=8
+#mpi_task_num=8
+mpi_task_num=6
 
 . ./pio_write.run
 ( . ./pio_write_dist_array.run ) || test $? -eq 77

tests/pio_cksum_nc2.run.in

@@ -2,7 +2,8 @@
 
 suffix=nc2
 pio_write_args="-w 3 -qtaxis-type=relative"
-mpi_task_num=8
+#mpi_task_num=8
+mpi_task_num=6
 
 . ./pio_write.run
 ( . ./pio_write_dist_array.run ) || test $? -eq 77

tests/pio_cksum_nc4.run.in

@@ -2,7 +2,8 @@
 
 suffix=nc4
 pio_write_args="-w 3 -qtaxis-type=relative"
-mpi_task_num=7
+#mpi_task_num=7
+mpi_task_num=6
 
 . ./pio_write.run
 ( . ./pio_write_dist_array.run ) || test $? -eq 77

tests/pio_cksum_writer.run.in

 #!@SHELL@
 
-pio_write_args="-p PIO_WRITER -w 4"
-mpi_task_num=8
+#pio_write_args="-p PIO_WRITER -w 4"
+pio_write_args="-p PIO_WRITER -w 3"
+#mpi_task_num=8
+mpi_task_num=6
 
 . ./pio_write.run
 ( . ./pio_write_dist_array.run ) || test $? -eq 77