Changeset d2d6cf9 in flex_extract.git

Timestamp:

Jun 25, 2020, 2:48:58 PM (4 years ago)

Author:

Petra Seibert <petra.seibert [at) univie.ac.at>

Branches:

master, ctbto, dev

Children:

d90a529

Parents:

2c3c135

Message:

remove jasper from makefiles, correct Fortran regression test scripts

Files:

• Source/Fortran/makefile_debug (modified) (1 diff)
• Source/Fortran/makefile_fast (modified) (1 diff)
• Testing/Regression/FortranEtadot/run_ref.sh (modified) (1 diff)
• Testing/Regression/FortranEtadot/run_regrtest.sh (modified) (2 diffs)

Source/Fortran/makefile_debug

@@ -15 +15 @@
 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)

Source/Fortran/makefile_fast

@@ -15 +15 @@
 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)

Testing/Regression/FortranEtadot/run_ref.sh

@@ -19 +19 @@
 # loop over all reference runs
 rm -f log.run_ref
+rm -f Work/*
 
 if [ "$1" = omithigh ]; then # for fast testing, not for production

Testing/Regression/FortranEtadot/run_regrtest.sh

@@ -32 +32 @@
 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
@@ -62 +62 @@
         # 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