@@ -41,43 +41,21 @@ for i in ${check_PROGRAMS} ; do
4141 export PNETCDF_SAFE_MODE=$j
4242 # echo "set PNETCDF_SAFE_MODE ${PNETCDF_SAFE_MODE}"
4343
44- OPTS=" -l 100 -w 100 -i ${srcdir} /wrf_header.txt"
45- # echo "${MPIRUN} ./$i -q ${OPTS} ${TESTOUTDIR}/$i.nc"
46- ${MPIRUN} ./$i -q ${OPTS} ${TESTOUTDIR} /$i .nc
44+ OPTS=" -y 100 -x 100 -i ${srcdir} /wrf_header.txt"
45+ OPTS=" $OPTS -w ${TESTOUTDIR} /$i .nc -r ${TESTOUTDIR} /$i .nc"
46+ # echo "${MPIRUN} ./$i -q ${OPTS}"
47+ ${MPIRUN} ./$i -q ${OPTS}
4748 if test $? = 0 ; then
4849 echo " PASS: C parallel run on $1 processes --------------- $i "
4950 fi
5051
52+ unset PNETCDF_HINTS
5153 # echo "--- validating file ${TESTOUTDIR}/$i.nc"
5254 ${TESTSEQRUN} ${VALIDATOR} -q ${TESTOUTDIR} /$i .nc
5355 # echo ""
54-
55- if test " x${ENABLE_BURST_BUFFER} " = x1 ; then
56- # echo "test burst buffering feature"
57- saved_PNETCDF_HINTS=${PNETCDF_HINTS}
58- export PNETCDF_HINTS=" ${PNETCDF_HINTS} ;nc_burst_buf=enable;nc_burst_buf_dirname=${TESTOUTDIR} ;nc_burst_buf_overwrite=enable"
59- ${MPIRUN} ./$i -q ${OPTS} ${TESTOUTDIR} /$i .bb.nc
60- if test $? = 0 ; then
61- echo " PASS: C parallel run on $1 processes --------------- $i "
62- fi
63- export PNETCDF_HINTS=${saved_PNETCDF_HINTS}
64-
65- # echo "--- validating file ${TESTOUTDIR}/$i.bb.nc"
66- ${TESTSEQRUN} ${VALIDATOR} -q ${TESTOUTDIR} /$i .bb.nc
67-
68- # echo "--- ncmpidiff $i.nc $i.bb.nc ---"
69- ${MPIRUN} ${NCMPIDIFF} -q ${TESTOUTDIR} /$i .nc ${TESTOUTDIR} /$i .bb.nc
70- fi
71-
72- if test " x${ENABLE_NETCDF4} " = x1 ; then
73- # echo "test netCDF-4 feature"
74- ${MPIRUN} ./$i -q ${OPTS} ${TESTOUTDIR} /$i .nc4 4
75- # Validator does not support nc4
76- fi
7756 done
7857 done
7958 rm -f ${OUTDIR} /$i .nc
80- rm -f ${OUTDIR} /$i .bb.nc
8159 rm -f ${OUTDIR} /$i .nc4
8260done
8361
0 commit comments