Commit 8b92f5db authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Added Remap3.test.in.

parent c37e0714
......@@ -25828,7 +25828,7 @@ ac_config_files="$ac_config_files test/File.test test/Read_grib.test test/Read_n
 
ac_config_files="$ac_config_files test/Comp.test test/Compc.test"
 
ac_config_files="$ac_config_files test/Cat.test test/Gridarea.test test/Genweights.test test/Remap.test test/Remap2.test test/Remapeta.test"
ac_config_files="$ac_config_files test/Cat.test test/Gridarea.test test/Genweights.test test/Remap.test test/Remap2.test test/Remap3.test test/Remapeta.test"
 
ac_config_files="$ac_config_files test/EOF.test test/Select.test test/Spectral.test test/Vertint.test"
 
......@@ -27098,6 +27098,7 @@ do
"test/Genweights.test") CONFIG_FILES="$CONFIG_FILES test/Genweights.test" ;;
"test/Remap.test") CONFIG_FILES="$CONFIG_FILES test/Remap.test" ;;
"test/Remap2.test") CONFIG_FILES="$CONFIG_FILES test/Remap2.test" ;;
"test/Remap3.test") CONFIG_FILES="$CONFIG_FILES test/Remap3.test" ;;
"test/Remapeta.test") CONFIG_FILES="$CONFIG_FILES test/Remapeta.test" ;;
"test/EOF.test") CONFIG_FILES="$CONFIG_FILES test/EOF.test" ;;
"test/Select.test") CONFIG_FILES="$CONFIG_FILES test/Select.test" ;;
......@@ -28792,6 +28793,7 @@ _LT_EOF
"test/Genweights.test":F) chmod a+x "$ac_file" ;;
"test/Remap.test":F) chmod a+x "$ac_file" ;;
"test/Remap2.test":F) chmod a+x "$ac_file" ;;
"test/Remap3.test":F) chmod a+x "$ac_file" ;;
"test/Remapeta.test":F) chmod a+x "$ac_file" ;;
"test/EOF.test":F) chmod a+x "$ac_file" ;;
"test/Select.test":F) chmod a+x "$ac_file" ;;
......
......@@ -293,7 +293,7 @@ AC_PROG_AWK
AC_CONFIG_FILES([test/File.test test/Read_grib.test test/Read_netcdf.test test/Copy_netcdf.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Comp.test test/Compc.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Cat.test test/Gridarea.test test/Genweights.test test/Remap.test test/Remap2.test test/Remapeta.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Cat.test test/Gridarea.test test/Genweights.test test/Remap.test test/Remap2.test test/Remap3.test test/Remapeta.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/EOF.test test/Select.test test/Spectral.test test/Vertint.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Timstat.test test/Timselstat.test test/Seasstat.test test/Timpctl.test test/Runstat.test test/Runpctl.test test/Multiyearstat.test test/Ydrunstat.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Gridboxstat.test test/Vertstat.test test/Fldstat.test test/Fldpctl.test test/Ensstat.test test/Enspctl.test],[chmod a+x "$ac_file"])
......
......@@ -15,8 +15,8 @@ TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
TESTS = threads.test tsformat.test wildcard.test File.test Comp.test Compc.test \
Read_grib.test Read_netcdf.test Copy_netcdf.test Cat.test Gridarea.test \
MapReduce.test Ninfo.test Gradsdes.test \
Detrend.test Genweights.test Remap.test Remap2.test Remapeta.test Select.test Spectral.test \
Ensstat.test Enspctl.test Gridboxstat.test \
Detrend.test Genweights.test Remap.test Remap2.test Remap3.test Remapeta.test \
Select.test Spectral.test Ensstat.test Enspctl.test Gridboxstat.test \
Vertstat.test Fldstat.test Fldpctl.test Merstat.test Zonstat.test \
Timstat.test Timselstat.test Seasstat.test Timpctl.test \
Runstat.test Runpctl.test Multiyearstat.test Ydrunstat.test \
......
......@@ -86,24 +86,25 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(srcdir)/Compc.test.in $(srcdir)/Cat.test.in \
$(srcdir)/Gridarea.test.in $(srcdir)/Genweights.test.in \
$(srcdir)/Remap.test.in $(srcdir)/Remap2.test.in \
$(srcdir)/Remapeta.test.in $(srcdir)/EOF.test.in \
$(srcdir)/Select.test.in $(srcdir)/Spectral.test.in \
$(srcdir)/Vertint.test.in $(srcdir)/Timstat.test.in \
$(srcdir)/Timselstat.test.in $(srcdir)/Seasstat.test.in \
$(srcdir)/Timpctl.test.in $(srcdir)/Runstat.test.in \
$(srcdir)/Runpctl.test.in $(srcdir)/Multiyearstat.test.in \
$(srcdir)/Ydrunstat.test.in $(srcdir)/Gridboxstat.test.in \
$(srcdir)/Vertstat.test.in $(srcdir)/Fldstat.test.in \
$(srcdir)/Fldpctl.test.in $(srcdir)/Ensstat.test.in \
$(srcdir)/Enspctl.test.in $(srcdir)/Merstat.test.in \
$(srcdir)/Zonstat.test.in $(srcdir)/Mergetime.test.in \
$(srcdir)/Afterburner.test.in $(srcdir)/Detrend.test.in \
$(srcdir)/Arithc.test.in $(srcdir)/Arith.test.in \
$(srcdir)/Expr.test.in $(srcdir)/Gradsdes.test.in \
$(srcdir)/Collgrid.test.in $(srcdir)/threads.test.in \
$(srcdir)/tsformat.test.in $(srcdir)/wildcard.test.in \
$(srcdir)/Setmiss.test.in $(srcdir)/Smooth.test.in \
$(srcdir)/MapReduce.test.in $(srcdir)/Ninfo.test.in README
$(srcdir)/Remap3.test.in $(srcdir)/Remapeta.test.in \
$(srcdir)/EOF.test.in $(srcdir)/Select.test.in \
$(srcdir)/Spectral.test.in $(srcdir)/Vertint.test.in \
$(srcdir)/Timstat.test.in $(srcdir)/Timselstat.test.in \
$(srcdir)/Seasstat.test.in $(srcdir)/Timpctl.test.in \
$(srcdir)/Runstat.test.in $(srcdir)/Runpctl.test.in \
$(srcdir)/Multiyearstat.test.in $(srcdir)/Ydrunstat.test.in \
$(srcdir)/Gridboxstat.test.in $(srcdir)/Vertstat.test.in \
$(srcdir)/Fldstat.test.in $(srcdir)/Fldpctl.test.in \
$(srcdir)/Ensstat.test.in $(srcdir)/Enspctl.test.in \
$(srcdir)/Merstat.test.in $(srcdir)/Zonstat.test.in \
$(srcdir)/Mergetime.test.in $(srcdir)/Afterburner.test.in \
$(srcdir)/Detrend.test.in $(srcdir)/Arithc.test.in \
$(srcdir)/Arith.test.in $(srcdir)/Expr.test.in \
$(srcdir)/Gradsdes.test.in $(srcdir)/Collgrid.test.in \
$(srcdir)/threads.test.in $(srcdir)/tsformat.test.in \
$(srcdir)/wildcard.test.in $(srcdir)/Setmiss.test.in \
$(srcdir)/Smooth.test.in $(srcdir)/MapReduce.test.in \
$(srcdir)/Ninfo.test.in README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_cfortran_flags.m4 \
$(top_srcdir)/m4/acx_check_cfortran.m4 \
......@@ -120,10 +121,10 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/config.h
CONFIG_CLEAN_FILES = File.test Read_grib.test Read_netcdf.test \
Copy_netcdf.test Comp.test Compc.test Cat.test Gridarea.test \
Genweights.test Remap.test Remap2.test Remapeta.test EOF.test \
Select.test Spectral.test Vertint.test Timstat.test \
Timselstat.test Seasstat.test Timpctl.test Runstat.test \
Runpctl.test Multiyearstat.test Ydrunstat.test \
Genweights.test Remap.test Remap2.test Remap3.test \
Remapeta.test EOF.test Select.test Spectral.test Vertint.test \
Timstat.test Timselstat.test Seasstat.test Timpctl.test \
Runstat.test Runpctl.test Multiyearstat.test Ydrunstat.test \
Gridboxstat.test Vertstat.test Fldstat.test Fldpctl.test \
Ensstat.test Enspctl.test Merstat.test Zonstat.test \
Mergetime.test Afterburner.test Detrend.test Arithc.test \
......@@ -548,8 +549,8 @@ TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
TESTS = threads.test tsformat.test wildcard.test File.test Comp.test Compc.test \
Read_grib.test Read_netcdf.test Copy_netcdf.test Cat.test Gridarea.test \
MapReduce.test Ninfo.test Gradsdes.test \
Detrend.test Genweights.test Remap.test Remap2.test Remapeta.test Select.test Spectral.test \
Ensstat.test Enspctl.test Gridboxstat.test \
Detrend.test Genweights.test Remap.test Remap2.test Remap3.test Remapeta.test \
Select.test Spectral.test Ensstat.test Enspctl.test Gridboxstat.test \
Vertstat.test Fldstat.test Fldpctl.test Merstat.test Zonstat.test \
Timstat.test Timselstat.test Seasstat.test Timpctl.test \
Runstat.test Runpctl.test Multiyearstat.test Ydrunstat.test \
......@@ -626,6 +627,8 @@ Remap.test: $(top_builddir)/config.status $(srcdir)/Remap.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Remap2.test: $(top_builddir)/config.status $(srcdir)/Remap2.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Remap3.test: $(top_builddir)/config.status $(srcdir)/Remap3.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Remapeta.test: $(top_builddir)/config.status $(srcdir)/Remapeta.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
EOF.test: $(top_builddir)/config.status $(srcdir)/EOF.test.in
......
#! @BASH@
echo 1..8 # Number of tests to be executed.
#
test -n "$CDO" || CDO=cdo
test -n "$DATAPATH" || DATAPATH=./data
#
ABSLIMMAX=0.0001
ABSLIMDIS=0.001
CDOOUT=cout$$
CDOERR=cerr$$
FORMAT="-f srv -b 32"
GRID=global_5
#
IFILE=$DATAPATH/topo_eu5.grb
NTEST=1
#
RMODS="dis nn bil bic con con2 ycon laf"
for RMOD in $RMODS; do
ABSLIM=$ABSLIMMAX
if [ $RMOD = dis ]; then ABSLIM=$ABSLIMDIS; fi
CDOTEST="remap${RMOD} regional"
RSTAT=0
for extra in def off on; do
EXTRA="$extra"
if [ "$EXTRA" = "def" ]; then EXTRA=""; fi
OFILE=topo_eu5_${RMOD}_${extra}$$
RFILE=$DATAPATH/topo_eu5_${RMOD}_${extra}_ref
rm -f Remap2_${RMOD}_${extra}.debug
DEBUG_OUT="--seperateDebugFromLog Remap2_${RMOD}_${extra}.debug"
CDOCOMMAND="$CDO $DEBUG_OUT $FORMAT remap${RMOD},$GRID $IFILE ${OFILE}"
echo "Running test: $NTEST"
echo "$CDOCOMMAND"
REMAP_EXTRAPOLATE=$EXTRA $CDOCOMMAND
test $? -eq 0 || let RSTAT+=1
$CDO $DEBUG_OUT diff,$ABSLIM $OFILE $RFILE > $CDOOUT 2> $CDOERR
test $? -eq 0 || let RSTAT+=1
test -s $CDOOUT && let RSTAT+=1
cat $CDOOUT $CDOERR
rm -f $OFILE
done
test $RSTAT -eq 0 && echo "ok $NTEST - $CDOTEST"
if [ $RMOD = dis ]; then
test $RSTAT -eq 0 || echo "not ok $NTEST - $CDOTEST # TODO check depends on optimization"
else
test $RSTAT -eq 0 || echo "not ok $NTEST - $CDOTEST"
fi
let NTEST+=1
rm -f $OFILE
done
#
rm -f $CDOOUT $CDOERR
#
exit 0
INPUTDATA = ts_mm_5years ts_6h_1mon ts_1d_1year hl_l19.grb t21_geosp_tsurf.grb t21_geosp_tsurf_sea.grb bathy4.grb pl_data pl_data.grb detrend_data \
grib_testfile01.grb grib_testfile02.grb grib_testfile03.grb netcdf_testfile01.nc netcdf_testfile02.nc testfile01c.nc \
datar.nc datac.nc datau.nc datag.nc arith1.srv expr1.srv arithmask.srv psl_DJF_anom.grb tsurf_spain.grb spain.grid
datar.nc datac.nc datau.nc datag.nc arith1.srv expr1.srv arithmask.srv psl_DJF_anom.grb tsurf_spain.grb spain.grid \
topo_eu5.grb
FILE = file_F32_srv_ref
GRIB = grib_testfile01_sinfo_ref grib_testfile01_info_ref grib_testfile02_sinfo_ref grib_testfile02_info_ref grib_testfile03_sinfo_ref grib_testfile03_info_ref
......@@ -36,6 +37,14 @@ REMAP2 = tsurf_spain_bic_def_ref tsurf_spain_bic_off_ref tsurf_spain_b
tsurf_spain_ycon_def_ref tsurf_spain_ycon_off_ref tsurf_spain_ycon_on_ref \
tsurf_spain_con_def_ref tsurf_spain_con_off_ref tsurf_spain_con_on_ref \
tsurf_spain_con2_def_ref tsurf_spain_con2_off_ref tsurf_spain_con2_on_ref
REMAP3 = topo_eu5_bic_def_ref topo_eu5_bic_off_ref topo_eu5_bic_on_ref \
topo_eu5_bil_def_ref topo_eu5_bil_off_ref topo_eu5_bil_on_ref \
topo_eu5_dis_def_ref topo_eu5_dis_off_ref topo_eu5_dis_on_ref \
topo_eu5_nn_def_ref topo_eu5_nn_off_ref topo_eu5_nn_on_ref \
topo_eu5_laf_def_ref topo_eu5_laf_off_ref topo_eu5_laf_on_ref \
topo_eu5_ycon_def_ref topo_eu5_ycon_off_ref topo_eu5_ycon_on_ref \
topo_eu5_con_def_ref topo_eu5_con_off_ref topo_eu5_con_on_ref \
topo_eu5_con2_def_ref topo_eu5_con2_off_ref topo_eu5_con2_on_ref
SELECT = select1_ref select2_ref select3_ref select4_ref select5_ref
DETREND = detrend_ref
EXPR = expr1_ref aexpr1_ref expr2_ref aexpr2_ref
......@@ -50,5 +59,5 @@ SETMISS = setmisstoc_ref setmisstonn_ref setmisstodis_ref
EXTRA_DIST = $(INPUTDATA) $(FILE) $(GRIB) $(NETCDF) $(EOF) $(COMP) $(YDRUNSTAT) $(YMONSTAT) $(YSEASSTAT) $(SEASSTAT) $(TIMPCTL) \
$(RUNSTAT) $(RUNPCTL) $(TIMSTAT) $(YEARSTAT) $(MONSTAT) $(DAYSTAT) $(VERTSTAT) $(FLDSTAT) $(FLDPSTAT) \
$(MERSTAT) $(ZONSTAT) $(ENSPSTAT) $(SPECTRAL) $(VERTINT) $(REMAP) $(REMAP2) $(SELECT) $(DETREND) \
$(MERSTAT) $(ZONSTAT) $(ENSPSTAT) $(SPECTRAL) $(VERTINT) $(REMAP) $(REMAP2) $(REMAP3) $(SELECT) $(DETREND) \
$(THREAD) $(EXPR) $(GRADSDES) $(ARITH) $(MAPREDUCE) $(MERGETIME) $(REMAPETA) $(SMOOTH) $(SETMISS)
......@@ -298,7 +298,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
INPUTDATA = ts_mm_5years ts_6h_1mon ts_1d_1year hl_l19.grb t21_geosp_tsurf.grb t21_geosp_tsurf_sea.grb bathy4.grb pl_data pl_data.grb detrend_data \
grib_testfile01.grb grib_testfile02.grb grib_testfile03.grb netcdf_testfile01.nc netcdf_testfile02.nc testfile01c.nc \
datar.nc datac.nc datau.nc datag.nc arith1.srv expr1.srv arithmask.srv psl_DJF_anom.grb tsurf_spain.grb spain.grid
datar.nc datac.nc datau.nc datag.nc arith1.srv expr1.srv arithmask.srv psl_DJF_anom.grb tsurf_spain.grb spain.grid \
topo_eu5.grb
FILE = file_F32_srv_ref
GRIB = grib_testfile01_sinfo_ref grib_testfile01_info_ref grib_testfile02_sinfo_ref grib_testfile02_info_ref grib_testfile03_sinfo_ref grib_testfile03_info_ref
......@@ -336,6 +337,15 @@ REMAP2 = tsurf_spain_bic_def_ref tsurf_spain_bic_off_ref tsurf_spain_bic_on_
tsurf_spain_con_def_ref tsurf_spain_con_off_ref tsurf_spain_con_on_ref \
tsurf_spain_con2_def_ref tsurf_spain_con2_off_ref tsurf_spain_con2_on_ref
REMAP3 = topo_eu5_bic_def_ref topo_eu5_bic_off_ref topo_eu5_bic_on_ref \
topo_eu5_bil_def_ref topo_eu5_bil_off_ref topo_eu5_bil_on_ref \
topo_eu5_dis_def_ref topo_eu5_dis_off_ref topo_eu5_dis_on_ref \
topo_eu5_nn_def_ref topo_eu5_nn_off_ref topo_eu5_nn_on_ref \
topo_eu5_laf_def_ref topo_eu5_laf_off_ref topo_eu5_laf_on_ref \
topo_eu5_ycon_def_ref topo_eu5_ycon_off_ref topo_eu5_ycon_on_ref \
topo_eu5_con_def_ref topo_eu5_con_off_ref topo_eu5_con_on_ref \
topo_eu5_con2_def_ref topo_eu5_con2_off_ref topo_eu5_con2_on_ref
SELECT = select1_ref select2_ref select3_ref select4_ref select5_ref
DETREND = detrend_ref
EXPR = expr1_ref aexpr1_ref expr2_ref aexpr2_ref
......@@ -349,7 +359,7 @@ SMOOTH = smooth1_ref smooth2_ref smooth3_ref
SETMISS = setmisstoc_ref setmisstonn_ref setmisstodis_ref
EXTRA_DIST = $(INPUTDATA) $(FILE) $(GRIB) $(NETCDF) $(EOF) $(COMP) $(YDRUNSTAT) $(YMONSTAT) $(YSEASSTAT) $(SEASSTAT) $(TIMPCTL) \
$(RUNSTAT) $(RUNPCTL) $(TIMSTAT) $(YEARSTAT) $(MONSTAT) $(DAYSTAT) $(VERTSTAT) $(FLDSTAT) $(FLDPSTAT) \
$(MERSTAT) $(ZONSTAT) $(ENSPSTAT) $(SPECTRAL) $(VERTINT) $(REMAP) $(REMAP2) $(SELECT) $(DETREND) \
$(MERSTAT) $(ZONSTAT) $(ENSPSTAT) $(SPECTRAL) $(VERTINT) $(REMAP) $(REMAP2) $(REMAP3) $(SELECT) $(DETREND) \
$(THREAD) $(EXPR) $(GRADSDES) $(ARITH) $(MAPREDUCE) $(MERGETIME) $(REMAPETA) $(SMOOTH) $(SETMISS)
all: all-am
......
......@@ -5,6 +5,23 @@ CDO=cdo
FORMAT="-f srv -b F32"
########################################################################
#
# Remap regional grid
#
RMODS="bil bic dis nn con con2 ycon laf"
#cdo -f grb topo,europe_5 topo_eu5.grb
IFILE=topo_eu5.grb
$CDO -f grb -topo,europe_5 $IFILE
for RMOD in $RMODS; do
OFILE=topo_eu5_${RMOD}
for extra in def off on; do
EXTRA="$extra"
if [ "$EXTRA" = "def" ]; then EXTRA=""; fi
REMAP_EXTRAPOLATE=$EXTRA $CDO $FORMAT remap${RMOD},global_5 $IFILE ${OFILE}_${extra}_ref
done
done
exit
########################################################################
#
# Timpctl Yearpctl Monstat Daypctl
#
PCTLS="50"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment