Changeset 14d9618 in flex_extract.git


Ignore:
Timestamp:
Jul 1, 2020, 2:40:48 PM (4 years ago)
Author:
pesei <petra.seibert [at ) univie.ac.at>
Branches:
master, ctbto, dev
Children:
e0005c9, 36dbabb
Parents:
d90a529
Message:

update the Fortran regression test and makefile_fast

Files:
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • Source/Fortran/makefile_fast

    rd2d6cf9 r14d9618  
    1919LIB =  $(ECCODES_LIB) $(EMOSLIB)
    2020
    21 ECCODES_INCLUDE_DIR=/usr/local/include/
    22 #/usr/lib/x86_64-linux-gnu/fortran/gfortran-mod-15
     21ECCODES_INCLUDE_DIR=/usr/lib/x86_64-linux-gnu/fortran/gfortran-mod-15
     22#/usr/local/include/ #oldstable
     23
    2324INC = -I. -I$(ECCODES_INCLUDE_DIR)
    2425
    2526FC = gfortran
    26 OPT = -O3 -march=native
     27OPT = -O3 # -O3 -march=native
    2728FFLAGS =   $(OPT) $(LIB) $(INC) -fdefault-real-8 -fopenmp -fconvert=big-endian
    2829LDFLAGS =  $(OPT) $(LIB) -fopenmp
  • Testing/Regression/FortranEtadot/run_ref.sh

    rd2d6cf9 r14d9618  
    1414exefast=calc_etadot_fast.out
    1515hash=$(git log --abbrev-commit --pretty=oneline -n 1  --pretty=format:'%h')
     16csvfile='runtimes_'${HOST}'.csv'
    1617exitonfail=true
    1718rm -f log.run_ref failed
     
    5253      if [ "${exitonfail}" = true ]; then exit; fi
    5354    fi
    54     for outfile in 'fort.15' 'VERTICAL.EC'; do
     55    for outfile in 'fort.15' ; do
    5556      if [ -e $outfile ]; then
    5657        mv ${outfile} ../${outdir}
     
    6970  # compare debug and fast
    7071  # omega case also produces fort.25 - need to add this
    71   for outfile in 'fort.15' 'VERTICAL.EC'; do
     72  for outfile in 'fort.15' ; do
    7273    outdebug='Outputs/Output_ref_'${ref}'_debug/'$outfile
    7374    outfast='Outputs/Output_ref_'${ref}'_fast/'$outfile
    74     test=$(cmp  $outdebug $outfast)
    75     if $test; then
     75    test=$()
     76    if cmp -s $outdebug $outfast >/dev/null; then
    7677      echo $outfile '    equal for debug and fast' >> log.run_ref
    7778    else
     
    8990    user=$(echo $times | grep user | awk '{print $4}')
    9091    sys=$( echo $times | grep sys  | awk '{print $6}')
    91     echo $hash, "'"reference"'", "'"${ref}'_'${exe}"'", ${real}, ${user}, ${sys} >> runtimes.csv
     92    echo $hash, "'"reference"'", "'"${ref}'_'${exe}"'", ${real}, ${user}, ${sys} >> ${csvfile}
    9293    tail -1 runtimes.csv >> log.run_ref
    9394  done
  • Testing/Regression/FortranEtadot/run_regrtest.sh

    rd2d6cf9 r14d9618  
    1717exefast=calc_etadot_fast.out
    1818hash=$(git log --abbrev-commit --pretty=oneline -n 1  --pretty=format:'%h')
     19csvfile='runtimes_'${HOST}'.csv'
    1920exitonfail=true
    2021numtest=0
     
    8485    user=$(echo $times | grep user | awk '{print $4}')
    8586    sys=$( echo $times | grep sys  | awk '{print $6}')
    86     echo $hash, "'"reference"'", "'"${ref}'_'${exe}"'", ${real}, ${user}, ${sys} >> ../runtimes.csv
    87     tail -1 ../runtimes.csv >> log.run_regr
     87    echo $hash, "'"reference"'", "'"${ref}'_'${exe}"'", ${real}, ${user}, ${sys} >> ../${csvfile}
     88    tail -1 ../${csvfile} >> log.run_regr
    8889
    8990    cd ..
    90     rm Work/* # this is for being more safe
     91    rm -f Work/* # this is for being more safe
    9192
    9293  done # end of exe loop
     
    99100  | tee -a ../log.run_regr
    100101echo ' More information may be found in log.run_regr'
    101 echo ' Runtimes were added to runtimes.csv under '$hash | tee -a ../log.run_regr
     102echo ' Runtimes were added to '${csvfile}' under '$hash | tee -a ../log.run_regr
    102103
    103104# the following code is executed only if exitonfail is not set to 'true'.
  • Testing/Regression/FortranEtadot/runtimes_imp7.csv

    r2d1c338 r14d9618  
    1515949379e, 'reference', 'latlonall_debug', 0m0.777s, 0m6.772s, 0m0.620s
    1616949379e, 'reference', 'latlonall_fast', 0m0.687s, 0m7.064s, 0m0.196s
     17d90a529, 'reference', 'etadot_debug', 0m0.504s, 0m0.431s, 0m0.016s
     18d90a529, 'reference', 'etadot_fast', 0m0.442s, 0m0.529s, 0m0.017s
     19d90a529, 'reference', 'etadotall_debug', 0m0.576s, 0m0.603s, 0m0.048s
     20d90a529, 'reference', 'etadotall_fast', 0m0.604s, 0m0.673s, 0m0.028s
     21d90a529, 'reference', 'etadothigh_debug', 17m14.011s, 16m31.983s, 0m18.441s
     22d90a529, 'reference', 'etadothigh_fast', 17m23.426s, 16m31.624s, 0m21.645s
     23d90a529, 'reference', 'gauss_debug', 0m3.348s, 0m7.130s, 0m0.208s
     24d90a529, 'reference', 'gauss_fast', 0m2.403s, 0m5.028s, 0m0.156s
     25d90a529, 'reference', 'gaussall_debug', 0m12.126s, 0m28.251s, 0m0.648s
     26d90a529, 'reference', 'gaussall_fast', 0m9.868s, 0m23.323s, 0m0.880s
     27d90a529, 'reference', 'gausshigh_debug', 5m4.089s, 14m23.018s, 0m12.998s
     28d90a529, 'reference', 'gausshigh_fast', 4m48.049s, 13m11.227s, 0m16.318s
     29d90a529, 'reference', 'latlon_debug', 0m0.657s, 0m0.681s, 0m0.016s
     30d90a529, 'reference', 'latlon_fast', 0m0.485s, 0m0.563s, 0m0.004s
     31d90a529, 'reference', 'latlonall_debug', 0m0.544s, 0m0.613s, 0m0.012s
     32d90a529, 'reference', 'latlonall_fast', 0m0.534s, 0m0.620s, 0m0.020s
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG