Skip to content
Snippets Groups Projects
Commit d2d6cf91 authored by Petra Seibert's avatar Petra Seibert
Browse files

remove jasper from makefiles, correct Fortran regression test scripts

parent 2c3c135f
No related branches found
No related tags found
No related merge requests found
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
EXE = calc_etadot_debug.out EXE = calc_etadot_debug.out
ECCODES_LIB= -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm -ljasper ECCODES_LIB= -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm
EMOSLIB=-lemosR64 EMOSLIB=-lemosR64
LIB = $(ECCODES_LIB) $(EMOSLIB) LIB = $(ECCODES_LIB) $(EMOSLIB)
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
EXE = calc_etadot_fast.out EXE = calc_etadot_fast.out
ECCODES_LIB = -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm -ljasper ECCODES_LIB = -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm
EMOSLIB=-lemosR64 EMOSLIB=-lemosR64
LIB = $(ECCODES_LIB) $(EMOSLIB) LIB = $(ECCODES_LIB) $(EMOSLIB)
......
...@@ -18,6 +18,7 @@ rm -f log.run_ref failed ...@@ -18,6 +18,7 @@ rm -f log.run_ref failed
# loop over all reference runs # loop over all reference runs
rm -f log.run_ref rm -f log.run_ref
rm -f Work/*
if [ "$1" = omithigh ]; then # for fast testing, not for production if [ "$1" = omithigh ]; then # for fast testing, not for production
# requires > 16 GB # requires > 16 GB
......
...@@ -31,7 +31,7 @@ else ...@@ -31,7 +31,7 @@ else
fi fi
for ref in $inputs; do for ref in $inputs; do
echo 'Working on test case =' $ref echo 'Working on test case =' $ref | tee -a ../log.run_regr
# loop over debug and fast runs # loop over debug and fast runs
for exe in 'debug' 'fast'; do for exe in 'debug' 'fast'; do
...@@ -61,8 +61,7 @@ for ref in $inputs; do ...@@ -61,8 +61,7 @@ for ref in $inputs; do
# compare reference and current version # compare reference and current version
# omega case also produces fort.25 - need to add this # omega case also produces fort.25 - need to add this
outref='../Outputs/Output_ref_'${ref}'_'${exe}'/'$outfile outref='../Outputs/Output_ref_'${ref}'_'${exe}'/'$outfile
test=$(cmp $outfile $outref) if cmp -s $outfile $outref >/dev/null; then
if $test; then
echo ' '$outfile ' test passed' | tee -a ../log.run_regr echo ' '$outfile ' test passed' | tee -a ../log.run_regr
else else
echo 'WARNING:' $outfile ' test failed' | tee -a ../log.run_regr echo 'WARNING:' $outfile ' test failed' | tee -a ../log.run_regr
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment