From d2d6cf918895f938ac0288f15d1b1032d4323b03 Mon Sep 17 00:00:00 2001
From: Petra Seibert <petra.seibert [at) univie.ac.at>
Date: Thu, 25 Jun 2020 16:48:58 +0200
Subject: [PATCH] remove jasper from makefiles, correct Fortran regression test
scripts
---
Source/Fortran/makefile_debug | 2 +-
Source/Fortran/makefile_fast | 2 +-
Testing/Regression/FortranEtadot/run_ref.sh | 1 +
Testing/Regression/FortranEtadot/run_regrtest.sh | 5 ++---
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Source/Fortran/makefile_debug b/Source/Fortran/makefile_debug
index 538a3b3..93d4a09 100644
--- a/Source/Fortran/makefile_debug
+++ b/Source/Fortran/makefile_debug
@@ -14,7 +14,7 @@
EXE = calc_etadot_debug.out
-ECCODES_LIB= -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm -ljasper
+ECCODES_LIB= -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm
EMOSLIB=-lemosR64
LIB = $(ECCODES_LIB) $(EMOSLIB)
diff --git a/Source/Fortran/makefile_fast b/Source/Fortran/makefile_fast
index 2e12c9c..914cc18 100644
--- a/Source/Fortran/makefile_fast
+++ b/Source/Fortran/makefile_fast
@@ -14,7 +14,7 @@
EXE = calc_etadot_fast.out
-ECCODES_LIB = -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm -ljasper
+ECCODES_LIB = -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm
EMOSLIB=-lemosR64
LIB = $(ECCODES_LIB) $(EMOSLIB)
diff --git a/Testing/Regression/FortranEtadot/run_ref.sh b/Testing/Regression/FortranEtadot/run_ref.sh
index eb064de..d48bc32 100755
--- a/Testing/Regression/FortranEtadot/run_ref.sh
+++ b/Testing/Regression/FortranEtadot/run_ref.sh
@@ -18,6 +18,7 @@ rm -f log.run_ref failed
# loop over all reference runs
rm -f log.run_ref
+rm -f Work/*
if [ "$1" = omithigh ]; then # for fast testing, not for production
# requires > 16 GB
diff --git a/Testing/Regression/FortranEtadot/run_regrtest.sh b/Testing/Regression/FortranEtadot/run_regrtest.sh
index e00a47e..65e811f 100755
--- a/Testing/Regression/FortranEtadot/run_regrtest.sh
+++ b/Testing/Regression/FortranEtadot/run_regrtest.sh
@@ -31,7 +31,7 @@ else
fi
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
for exe in 'debug' 'fast'; do
@@ -61,8 +61,7 @@ for ref in $inputs; do
# compare reference and current version
# omega case also produces fort.25 - need to add this
outref='../Outputs/Output_ref_'${ref}'_'${exe}'/'$outfile
- test=$(cmp $outfile $outref)
- if $test; then
+ if cmp -s $outfile $outref >/dev/null; then
echo ' '$outfile ' test passed' | tee -a ../log.run_regr
else
echo 'WARNING:' $outfile ' test failed' | tee -a ../log.run_regr
--
GitLab