From 0ce28eb01911c68f6a59499e610fbb8493df1c73 Mon Sep 17 00:00:00 2001 From: Ed Hartnett Date: Fri, 2 Nov 2018 10:04:06 -0600 Subject: [PATCH] undid some unnecessary changes --- debug/cf.cmake | 4 +-- nc_test/run_diskless2.sh | 62 ++++++++++++++++++++-------------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/debug/cf.cmake b/debug/cf.cmake index 65adc4707..a2b31fc13 100644 --- a/debug/cf.cmake +++ b/debug/cf.cmake @@ -1,8 +1,8 @@ # Visual Studio # Is netcdf-4 and/or DAP enabled? -#NC4=1 -#DAP=1 +NC4=1 +DAP=1 #CDF5=1 #HDF4=1 diff --git a/nc_test/run_diskless2.sh b/nc_test/run_diskless2.sh index 6c235a788..3c1a67f01 100755 --- a/nc_test/run_diskless2.sh +++ b/nc_test/run_diskless2.sh @@ -16,42 +16,42 @@ OS=`uname` FILE4=tst_diskless4.nc # Compute the file size for tst_diskless4 -SIZE=1000000000 -# case $CPU in -# *_64*) SIZE=3000000000;; -# *) SIZE=1000000000;; -# esac +SIZE=0 +case $CPU in +*_64*) SIZE=3000000000;; +*) SIZE=1000000000;; +esac -# # Create the reference ncdump output for tst_diskless4 -# rm -fr tst_diskless4.cdl -# echo "netcdf tst_diskless4 {" >>tst_diskless4.cdl -# echo "dimensions:" >>tst_diskless4.cdl -# echo " dim = 1000000000 ;" >>tst_diskless4.cdl -# echo "variables:" >>tst_diskless4.cdl -# echo " byte var0(dim) ;" >>tst_diskless4.cdl -# if test $SIZE = 3000000000 ; then -# echo " byte var1(dim) ;" >>tst_diskless4.cdl -# echo " byte var2(dim) ;" >>tst_diskless4.cdl -# fi -# echo "}" >>tst_diskless4.cdl +# Create the reference ncdump output for tst_diskless4 +rm -fr tst_diskless4.cdl +echo "netcdf tst_diskless4 {" >>tst_diskless4.cdl +echo "dimensions:" >>tst_diskless4.cdl +echo " dim = 1000000000 ;" >>tst_diskless4.cdl +echo "variables:" >>tst_diskless4.cdl +echo " byte var0(dim) ;" >>tst_diskless4.cdl +if test $SIZE = 3000000000 ; then +echo " byte var1(dim) ;" >>tst_diskless4.cdl +echo " byte var2(dim) ;" >>tst_diskless4.cdl +fi +echo "}" >>tst_diskless4.cdl -# echo "" -# rm -f $FILE4 -# time ./tst_diskless4 $SIZE create -# # Validate it -# ${NCDUMP} -h $FILE4 |diff -w - tst_diskless4.cdl +echo "" +rm -f $FILE4 +time ./tst_diskless4 $SIZE create +# Validate it +${NCDUMP} -h $FILE4 |diff -w - tst_diskless4.cdl -# echo "" -# rm -f $FILE4 -# time ./tst_diskless4 $SIZE creatediskless -# # Validate it -# ${NCDUMP} -h $FILE4 |diff -w - tst_diskless4.cdl +echo "" +rm -f $FILE4 +time ./tst_diskless4 $SIZE creatediskless +# Validate it +${NCDUMP} -h $FILE4 |diff -w - tst_diskless4.cdl -# echo "" -# time ./tst_diskless4 $SIZE open +echo "" +time ./tst_diskless4 $SIZE open -# echo "" -# time ./tst_diskless4 $SIZE opendiskless +echo "" +time ./tst_diskless4 $SIZE opendiskless # cleanup rm -f $FILE4 tst_diskless4.cdl