S. Riette 10 Mar 2023: small bugfixes for rain_ice_old testprog

src/testprogs/rain_ice_old/main_rain_ice_old.F90

@@ -508,7 +508,7 @@ subroutine print_diff_1(array, ref)
     absval = max(abs(array(i)), abs(ref(i)))
     if (absval .gt. 0.) then
       if (abs(array(i) - ref(i))/absval .gt. threshold) then
-        write(output_unit, '(2i4, 4e16.6)') i, array(i), ref(i), abs(array(i) - ref(i)), abs(array(i) - ref(i))/absval 
+        write(output_unit, '(1i4, 4e16.6)') i, array(i), ref(i), abs(array(i) - ref(i)), abs(array(i) - ref(i))/absval 
       endif
     endif
   enddo

tools/check_commit_testprogs.sh

@@ -263,8 +263,8 @@ if [ $check -eq 1 ]; then
     fi
     if [ $te -eq 0 ]; then
       set +e
-      mess=$(cmp <(cat $file1 | sed 's/\.\.//g' | sed 's/~=//g' | sed 's/!=//g') \
-                 <(cat $file2 | sed 's/\.\.//g' | sed 's/~=//g' | sed 's/!=//g') 246 246 2>&1)
+      mess=$(cmp <(cat $file1 | sed 's/\.\.//g' | sed 's/~=//g' | sed 's/!=//g' | grep -v 'Total time: ') \
+                 <(cat $file2 | sed 's/\.\.//g' | sed 's/~=//g' | sed 's/!=//g' | grep -v 'Total time: ') 246 246 2>&1)
       te=$?
       set -e
       #The use of "<()" bash syntax replaces the actual file name seen by cmp