Changeset 652286a in flex_extract.git for Testing/Regression/FortranEtadot/run_ref.sh

Timestamp:

Jul 7, 2020, 4:08:49 PM (4 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

e0005c9

Parents:

98f09d2 (diff), 14d9618 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'dev' of ​https://www.flexpart.eu/git/flex_extract into dev
Changes due to Manuscript review for Fortran part (Petra)

File:

• Testing/Regression/FortranEtadot/run_ref.sh (modified) (5 diffs)

Testing/Regression/FortranEtadot/run_ref.sh

@@ -14 +14 @@
 exefast=calc_etadot_fast.out
 hash=$(git log --abbrev-commit --pretty=oneline -n 1  --pretty=format:'%h')
+csvfile='runtimes_'${HOST}'.csv'
 exitonfail=true
 rm -f log.run_ref failed
@@ -19 +20 @@
 # loop over all reference runs
 rm -f log.run_ref
+rm -f Work/*
 
 if [ "$1" = omithigh ]; then # for fast testing, not for production
@@ -51 +53 @@
       if [ "${exitonfail}" = true ]; then exit; fi
     fi
-    for outfile in 'fort.15' 'VERTICAL.EC'; do
+    for outfile in 'fort.15' ; do
       if [ -e $outfile ]; then
         mv ${outfile} ../${outdir}
@@ -68 +70 @@
   # compare debug and fast
   # omega case also produces fort.25 - need to add this
-  for outfile in 'fort.15' 'VERTICAL.EC'; do
+  for outfile in 'fort.15' ; do
     outdebug='Outputs/Output_ref_'${ref}'_debug/'$outfile
     outfast='Outputs/Output_ref_'${ref}'_fast/'$outfile
-    test=$(cmp  $outdebug $outfast)
-    if $test; then
+    test=$()
+    if cmp -s $outdebug $outfast >/dev/null; then
       echo $outfile '    equal for debug and fast' >> log.run_ref
     else
@@ -88 +90 @@
     user=$(echo $times | grep user | awk '{print $4}')
     sys=$( echo $times | grep sys  | awk '{print $6}')
-    echo $hash, "'"reference"'", "'"${ref}'_'${exe}"'", ${real}, ${user}, ${sys} >> runtimes.csv
+    echo $hash, "'"reference"'", "'"${ref}'_'${exe}"'", ${real}, ${user}, ${sys} >> ${csvfile}
     tail -1 runtimes.csv >> log.run_ref
   done