diff --git a/Source/Fortran/makefile_debug b/Source/Fortran/makefile_debug index 538a3b3e00edba49892c0e1b8047444b06a5e195..93d4a09032e1fd05a1805eec40ad69f32230b6a8 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 2e12c9c4746491a9dc5d4f2f347bc9534505b8c1..914cc185a307222e752882b418c72c6eb55eb271 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 eb064de9e34d9ceba90ee9569fa1ec3bec638bb0..d48bc32166d176b434a7b9680b1f8e3e679f93d8 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 e00a47e26bc0f6541e6347eafef17af49a30b6f7..65e811f7972ed0a123fce7365f0f8c817314a88e 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