Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
cdo
Commits
26651ced
Commit
26651ced
authored
Oct 27, 2017
by
Oliver Heidmann
Browse files
added missing file deletions for seperated debug output
parent
cf634ead
Changes
10
Hide whitespace changes
Inline
Side-by-side
test/Afterburner.test.in
View file @
26651ced
...
@@ -16,7 +16,7 @@ CDOERR=cerr$$
...
@@ -16,7 +16,7 @@ CDOERR=cerr$$
FORMAT=""
FORMAT=""
NTEST=1
NTEST=1
######################################################
######################################################
rm afterburner
_${SELECT}
.debug
rm afterburner.debug
DEBUG_OUT="--seperateDebugFromLog afterburner.debug"
DEBUG_OUT="--seperateDebugFromLog afterburner.debug"
IFILE=$DATAPATH/gp2sp_ref
IFILE=$DATAPATH/gp2sp_ref
RFILE=$DATAPATH/sp2gp_ref
RFILE=$DATAPATH/sp2gp_ref
...
...
test/Collgrid.test.in
View file @
26651ced
...
@@ -16,7 +16,7 @@ for GRIDTYPE in $GRIDTYPES; do
...
@@ -16,7 +16,7 @@ for GRIDTYPE in $GRIDTYPES; do
for DIST in $DISTS; do
for DIST in $DISTS; do
RSTAT=0
RSTAT=0
rm -f Collgrid_${GRIDTYPE}_${DIST}
rm -f Collgrid_${GRIDTYPE}_${DIST}
.debug
DEBUG_OUT="--seperateDebugFromLog Collgrid_${GRIDTYPE}_${DIST}.debug"
DEBUG_OUT="--seperateDebugFromLog Collgrid_${GRIDTYPE}_${DIST}.debug"
GT=$(echo $GRIDTYPE | cut -c1)
GT=$(echo $GRIDTYPE | cut -c1)
FILE=data${GT}.nc
FILE=data${GT}.nc
...
...
test/Copy_netcdf.test.in
View file @
26651ced
...
@@ -15,7 +15,7 @@ for OPERATOR in copy; do
...
@@ -15,7 +15,7 @@ for OPERATOR in copy; do
for FILE in $FILES; do
for FILE in $FILES; do
RSTAT=0
RSTAT=0
rm -f Copy_netcdf_${OPERATOR}_${FILE}
rm -f Copy_netcdf_${OPERATOR}_${FILE}
.debug
DEBUG_OUT="--seperateDebugFromLog Copy_netcdf_${OPERATOR}_${FILE}.debug"
DEBUG_OUT="--seperateDebugFromLog Copy_netcdf_${OPERATOR}_${FILE}.debug"
IFILE=$DATAPATH/${FILE}
IFILE=$DATAPATH/${FILE}
...
...
test/Detrend.test.in
View file @
26651ced
...
@@ -17,7 +17,7 @@ OFILE=detrend_res
...
@@ -17,7 +17,7 @@ OFILE=detrend_res
# detrend
# detrend
#
#
CDOTEST="detrend"
CDOTEST="detrend"
rm -f Det
e
rnd_detrend.debug
rm -f Detr
e
nd_detrend.debug
DEBUG_OUT="--seperateDebugFromLog Detrend_detrend.debug"
DEBUG_OUT="--seperateDebugFromLog Detrend_detrend.debug"
CDOCOMMAND="$CDO $DEBUG_OUT $CDOTEST $IFILE $OFILE"
CDOCOMMAND="$CDO $DEBUG_OUT $CDOTEST $IFILE $OFILE"
...
@@ -41,8 +41,8 @@ rm -f $OFILE
...
@@ -41,8 +41,8 @@ rm -f $OFILE
# trend
# trend
#
#
CDOTEST="trend/subtrend"
CDOTEST="trend/subtrend"
rm -f Det
e
rnd_trend.debug
rm -f Detr
e
nd_trend.debug
DEBUG_OUT="--seperateDebugFromLog trend_trend.debug"
DEBUG_OUT="--seperateDebugFromLog
De
trend_trend.debug"
CDOCOMMAND="$CDO $DEBUG_OUT trend $IFILE ta tb"
CDOCOMMAND="$CDO $DEBUG_OUT trend $IFILE ta tb"
echo "Running test: $NTEST"
echo "Running test: $NTEST"
...
@@ -51,8 +51,8 @@ echo "$CDOCOMMAND"
...
@@ -51,8 +51,8 @@ echo "$CDOCOMMAND"
$CDOCOMMAND
$CDOCOMMAND
test $? -eq 0 || let RSTAT+=1
test $? -eq 0 || let RSTAT+=1
#
#
rm -f Det
e
rnd_subtrend.debug
rm -f Detr
e
nd_subtrend.debug
DEBUG_OUT="--seperateDebugFromLog
sub
trend_subtrend.debug"
DEBUG_OUT="--seperateDebugFromLog
De
trend_subtrend.debug"
CDOCOMMAND="$CDO $DEBUG_OUT subtrend $IFILE ta tb $OFILE"
CDOCOMMAND="$CDO $DEBUG_OUT subtrend $IFILE ta tb $OFILE"
echo "Running test: $NTEST"
echo "Running test: $NTEST"
...
...
test/EOF.test.in
View file @
26651ced
...
@@ -49,7 +49,7 @@ for MODE in jacobi danielson_lanczos; do
...
@@ -49,7 +49,7 @@ for MODE in jacobi danielson_lanczos; do
test -s $CDOOUT && let RSTAT+=1
test -s $CDOOUT && let RSTAT+=1
rm -f EOFCOEFF_DIM_${X}_${MODE}.debug
rm -f EOFCOEFF_DIM_${X}_${MODE}.debug
DEBUG_OUT="--seperateDebugFromLog EOFCOEFF_DIM
-
${X}_${MODE}.debug"
DEBUG_OUT="--seperateDebugFromLog EOFCOEFF_DIM
_
${X}_${MODE}.debug"
CDOCOMMAND="$CDO $DEBUG_OUT $FORMAT eofcoeff${DIM} $OFILE2 $IFILE $OFILE3"
CDOCOMMAND="$CDO $DEBUG_OUT $FORMAT eofcoeff${DIM} $OFILE2 $IFILE $OFILE3"
echo "$CDOCOMMAND"
echo "$CDOCOMMAND"
...
...
test/Ensstat.test.in
View file @
26651ced
...
@@ -10,6 +10,7 @@ STATS="min max range sum avg mean std std1 var var1"
...
@@ -10,6 +10,7 @@ STATS="min max range sum avg mean std std1 var var1"
#
#
IFILE=$DATAPATH/ts_mm_5years
IFILE=$DATAPATH/ts_mm_5years
export CDO_FILE_SUFFIX=NULL
export CDO_FILE_SUFFIX=NULL
rm -f Ensstat_Ifilegeneration.debug
$CDO $DEBUG_OUT --seperateDebugFromLog Ensstat_Ifilegeneration.debug splityear $IFILE ${$}ts_year
$CDO $DEBUG_OUT --seperateDebugFromLog Ensstat_Ifilegeneration.debug splityear $IFILE ${$}ts_year
IFILES="${$}ts_year????"
IFILES="${$}ts_year????"
#
#
...
...
test/Gridboxstat.test.in
View file @
26651ced
...
@@ -21,7 +21,7 @@ for STAT in $STATS; do
...
@@ -21,7 +21,7 @@ for STAT in $STATS; do
OFILE=${TYPE}${STAT}_res
OFILE=${TYPE}${STAT}_res
rm -f Gridboxstat_${STAT}.debug
rm -f Gridboxstat_${STAT}.debug
DEBUG_OUT="--seperateDebugFromLog Grid
B
oxstat_${STAT}.debug"
DEBUG_OUT="--seperateDebugFromLog Grid
b
oxstat_${STAT}.debug"
CDOTEST="${TYPE}$STAT"
CDOTEST="${TYPE}$STAT"
CDOCOMMAND="$CDO $DEBUG_OUT $FORMAT ${TYPE}${STAT},64,32 $IFILE $OFILE"
CDOCOMMAND="$CDO $DEBUG_OUT $FORMAT ${TYPE}${STAT},64,32 $IFILE $OFILE"
...
...
test/Ninfo.test.in
View file @
26651ced
...
@@ -54,6 +54,7 @@ if test 1 -eq $($CDOCOMMAND -topo,global_1) ; then echo "ok $NTEST - $CDOCOMMAN
...
@@ -54,6 +54,7 @@ if test 1 -eq $($CDOCOMMAND -topo,global_1) ; then echo "ok $NTEST - $CDOCOMMAN
# create temporary data
# create temporary data
if [ "@ENABLE_NETCDF@" = yes ] ; then
if [ "@ENABLE_NETCDF@" = yes ] ; then
rm -f Ninfo_tempDataGeneration.debug
$CDO --seperateDebugFromLog Ninfo_tempDataGeneration.debug -O -f nc -temp,r18x9 temp.small
$CDO --seperateDebugFromLog Ninfo_tempDataGeneration.debug -O -f nc -temp,r18x9 temp.small
$CDO --seperateDebugFromLog Ninfo_tempDataGeneration.debug -O -f nc -temp,global_10 temp.global
$CDO --seperateDebugFromLog Ninfo_tempDataGeneration.debug -O -f nc -temp,global_10 temp.global
$CDO --seperateDebugFromLog Ninfo_tempDataGeneration.debug -O -f nc -merge temp.small temp.global temp.2grids
$CDO --seperateDebugFromLog Ninfo_tempDataGeneration.debug -O -f nc -merge temp.small temp.global temp.2grids
...
...
test/Remap2.test.in
View file @
26651ced
...
@@ -27,7 +27,7 @@ for RMOD in $RMODS; do
...
@@ -27,7 +27,7 @@ for RMOD in $RMODS; do
OFILE=tsurf_spain_${RMOD}_${extra}$$
OFILE=tsurf_spain_${RMOD}_${extra}$$
RFILE=$DATAPATH/tsurf_spain_${RMOD}_${extra}_ref
RFILE=$DATAPATH/tsurf_spain_${RMOD}_${extra}_ref
-
rm -f Remap2_${RMOD}_${extra}.debug
rm -f Remap2_${RMOD}_${extra}.debug
DEBUG_OUT="--seperateDebugFromLog Remap2_${RMOD}_${extra}.debug"
DEBUG_OUT="--seperateDebugFromLog Remap2_${RMOD}_${extra}.debug"
CDOCOMMAND="$CDO $DEBUG_OUT $FORMAT remap${RMOD},$GRID $IFILE ${OFILE}"
CDOCOMMAND="$CDO $DEBUG_OUT $FORMAT remap${RMOD},$GRID $IFILE ${OFILE}"
...
...
test/Remapeta.test.in
View file @
26651ced
...
@@ -18,7 +18,7 @@ for X in 1 2; do
...
@@ -18,7 +18,7 @@ for X in 1 2; do
OFILE=remapeta_res
OFILE=remapeta_res
CDOTEST="remapeta"
CDOTEST="remapeta"
rm -f Remapeta_{X}.debug
rm -f Remapeta_
$
{X}.debug
DEBUG_OUT="--seperateDebugFromLog Remapeta_${X}.debug"
DEBUG_OUT="--seperateDebugFromLog Remapeta_${X}.debug"
CDOCOMMAND="$CDO $DEBUG_OUT remapeta,$VCT $IFILE $OFILE"
CDOCOMMAND="$CDO $DEBUG_OUT remapeta,$VCT $IFILE $OFILE"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment