Changes in / [652286a:98f09d2] in flex_extract.git

Files:

• Source/Fortran/calc_etadot.f90 (modified) (1 diff)
• Source/Fortran/makefile_debug (modified) (1 diff)
• Source/Fortran/makefile_fast (modified) (1 diff)
• Testing/Regression/FortranEtadot/run_ref.sh (modified) (5 diffs)
• Testing/Regression/FortranEtadot/run_regrtest.sh (modified) (5 diffs)
• Testing/Regression/FortranEtadot/runtimes.imp7 (added)
• Testing/Regression/FortranEtadot/runtimes_imp7.csv (deleted)

Source/Fortran/calc_etadot.f90

@@ -486 +486 @@
   END IF ! MGAUSS
 
-! CREATE FILE VERTICAL.EC NEEDED BY POP MODEL  
-! 2020-06-25 Commented out by PS - not needed anymore
-
-!  OPEN(21,FILE='VERTICAL.EC')
-!  WRITE(21,'(A)')
-!  WRITE(21,'(A)') 'VERTICAL DISCRETIZATION OF POP MODEL'
-!  WRITE(21,'(A)')
-!  write(21,'(i3,a)') MLEVEL,'   number of layers'
-!  WRITE(21,'(A)')
-!  WRITE(21,'(A)') '* A(NLEV+1)'
-!  WRITE(21,'(A)')
-!  DO 205 I=1,MLEVEL+1
-!205 WRITE(21,'(F18.12)') AK(I)
-!  WRITE(21,'(A)')
-!  WRITE(21,'(A)') '* B(NLEV+1)'
-!  WRITE(21,'(A)')
-!  DO 210 I=1,MLEVEL+1
-!210 WRITE(21,'(F18.12)') BK(I)
-!  CLOSE(21)
+!! CREATE FILE VERTICAL.EC NEEDED BY POP MODEL  
+
+  OPEN(21,FILE='VERTICAL.EC')
+  WRITE(21,'(A)')
+  WRITE(21,'(A)') 'VERTICAL DISCRETIZATION OF POP MODEL'
+  WRITE(21,'(A)')
+  write(21,'(i3,a)') MLEVEL,'   number of layers'
+  WRITE(21,'(A)')
+  WRITE(21,'(A)') '* A(NLEV+1)'
+  WRITE(21,'(A)')
+  DO 205 I=1,MLEVEL+1
+205 WRITE(21,'(F18.12)') AK(I)
+  WRITE(21,'(A)')
+  WRITE(21,'(A)') '* B(NLEV+1)'
+  WRITE(21,'(A)')
+  DO 210 I=1,MLEVEL+1
+210 WRITE(21,'(F18.12)') BK(I)
+  CLOSE(21)
 
 !------------------------------------------------------------------

Source/Fortran/makefile_debug

@@ -15 +15 @@
 EXE      =  calc_etadot_debug.out
 
-ECCODES_LIB=  -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm 
+ECCODES_LIB=  -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm -ljasper
 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 
+ECCODES_LIB =  -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm -ljasper
 EMOSLIB=-lemosR64
 LIB =  $(ECCODES_LIB) $(EMOSLIB)
 
-ECCODES_INCLUDE_DIR=/usr/lib/x86_64-linux-gnu/fortran/gfortran-mod-15
-#/usr/local/include/ #oldstable
-
+ECCODES_INCLUDE_DIR=/usr/local/include/
+#/usr/lib/x86_64-linux-gnu/fortran/gfortran-mod-15
 INC = -I. -I$(ECCODES_INCLUDE_DIR)
 
 FC = gfortran 
-OPT = -O3 # -O3 -march=native
+OPT = -O3 -march=native
 FFLAGS =   $(OPT) $(LIB) $(INC) -fdefault-real-8 -fopenmp -fconvert=big-endian 
 LDFLAGS =  $(OPT) $(LIB) -fopenmp

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

Testing/Regression/FortranEtadot/run_regrtest.sh

@@ -17 +17 @@
 exefast=calc_etadot_fast.out
 hash=$(git log --abbrev-commit --pretty=oneline -n 1  --pretty=format:'%h')
-csvfile='runtimes_'${HOST}'.csv'
 exitonfail=true
 numtest=0
@@ -33 +32 @@
 for ref in $inputs; do
 
-  echo 'Working on test case =' $ref | tee -a ../log.run_regr
+  echo 'Working on test case =' $ref
 
   # loop over debug and fast runs
@@ -63 +62 @@
         # omega case also produces fort.25 - need to add this
         outref='../Outputs/Output_ref_'${ref}'_'${exe}'/'$outfile
-        if cmp -s $outfile $outref >/dev/null; then
+        test=$(cmp  $outfile $outref)
+        if $test; then
           echo '    '$outfile '    test passed' | tee -a ../log.run_regr
         else
@@ -85 +85 @@
     user=$(echo $times | grep user | awk '{print $4}')
     sys=$( echo $times | grep sys  | awk '{print $6}')
-    echo $hash, "'"reference"'", "'"${ref}'_'${exe}"'", ${real}, ${user}, ${sys} >> ../${csvfile}
-    tail -1 ../${csvfile} >> log.run_regr
+    echo $hash, "'"reference"'", "'"${ref}'_'${exe}"'", ${real}, ${user}, ${sys} >> ../runtimes.csv
+    tail -1 ../runtimes.csv >> log.run_regr
 
     cd ..
-    rm -f Work/* # this is for being more safe
+    rm Work/* # this is for being more safe
 
   done # end of exe loop
@@ -100 +100 @@
   | tee -a ../log.run_regr
 echo ' More information may be found in log.run_regr' 
-echo ' Runtimes were added to '${csvfile}' under '$hash | tee -a ../log.run_regr
+echo ' Runtimes were added to runtimes.csv under '$hash | tee -a ../log.run_regr
 
 # the following code is executed only if exitonfail is not set to 'true'.