/[MITgcm]/MITgcm/tools/tst_2+2

Diff of /MITgcm/tools/tst_2+2

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-revision 1.1 by jmc,
Tue Dec 25 22:07:54 2007 UTC
+revision 1.10 by jmc,
Fri Nov  4 17:42:32 2011 UTC
 Line 7 
 rnp_loc()
  {
  #   rnp_loc arg_1 arg_2
  #   rename files with prefix = 'arg_1' to files with prefix = 'arg_2'
-     echo ' rnp_loc:' $1 $2
+     if [ $prt -ge 1 ] ; then echo '  rnp_loc:' $1 $2 ; fi
  #   rnp -s $1 $2
      listY=`ls -1 $1*`
      for yy in $listY
      do
        zz=`echo $yy | sed "s/^$1/$2/"`
-       mv $yy $zz
+       if [ $prt -ge 2 ] ; then echo '   '$cmdMV $yy $zz ; fi
+       if test $action = 1 ; then    $cmdMV $yy $zz ; fi
      done
  }
- #---------------------------
+ #-----------
- #- default:
+ move_outp()
- Nit=2
+ {
- prt=1    # 1 = print some informations ; 2 = print more informations
+ #   move_outp arg_1
- action=1
+ #   move mitgcm output files to directory 'arg_1'
- cmd='mv -f'
+     if [ $prt -ge 1 ] ; then echo ' move_outp:' $1 ; fi
- tmpDir='temp_tst'
+     mv *.data *.meta $1
+     listF=`ls -1 *.txt STD???.00?? 2> /dev/null`
+     if test "x$listF" != x ; then mv $listF $1 ; fi
+     #- move back sym link:
+     listL=`find $1 -type l`
+     ttd=`echo $listL | wc -w`
+     #echo "ttd=$ttd"
+     if test $ttd != 0 ; then
+       #echo "listL='$listL'"
+       if [ $prt -ge 2 ] ; then echo "  mv back:" $listL | sed "s/$1\///g" ; fi
+       mv $listL .
+     fi
+ }
- #- executable:
+ #---------------------------
- mpi=0
- if [ $mpi -ge 1 ]
- then gcmExc=run_ifc_mpi
- else gcmExc=mitgcmuv
- fi
  #- exit status:
  # 0 -> test is successful
  # 1 -> fail in 1rst run
  # 2 -> fail in 2nd  run
  # 3 -> fail in 3rd  run
  # 4 -> pickup*.data (written at the end of 2+2 & 4 it run) are different
  # 5 -> pickup*.meta (written at the end of 2+2 & 4 it run) are different
  # 6 -> missing 'data.tst' file (removed or not yet generated ?)
- # 7 -> missing standard output from previous run
+ # 7 -> missing executable or standard output from previous run
  # 8 -> missing information (in standard output of previous run) about pickup
  # 9 -> error in argument list
+ #- default:
+ Nit=2
+ prt=1    # 1 = print some informations ; 2 = print more informations
+ action=1
+ cmdMV='mv -f'
+ tmpDir='temp_tst'
+ wait2run=0  # if needs sometime for file system syncro on all nodes
+ #- default executable, command-line , using MPI:
+ gcmEXE=./mitgcmuv
+ cmdEXE=
+ mpi=0
  nArg=$#
- if [ $nArg -ge 3 ]
+ prev=
- then
+ for xx ; do
-  if test $2 = '-exe' ; then gcmExc=$3 ; nArg=`expr $nArg - 2` ; fi
+   #echo "xx='$xx'"
-  if test $1 = '-exe' ; then gcmExc=$2 ; shift ; shift ; nArg=$# ; fi
+   # If the previous option needs an argument, assign it.
- fi
+   if test -n "$prev"; then
+     eval "$prev=\$xx"
+     prev=
+     nArg=`expr $nArg - 2`
+     continue
+   fi
+   case $xx in
+   -mpi     ) mpi=1 ; nArg=`expr $nArg - 1` ;;
+   -exe     ) prev=gcmEXE ;;
+   -command ) prev=cmdEXE ;;
+           *) flag=$xx ;;
+   esac
+ done
+ #echo "cmdEXE='$cmdEXE'"
+ #echo "nArg=$nArg ; mpi=$mpi ; flag='$flag'"
  case $nArg in
 ) ;;
-    *) echo "Usage: `basename $0` flag [-exe EXECUTABLE]"
+    *) echo "Usage: `basename $0` flag [-mpi] [-exe EXECUTABLE] [-command COMMAND]"
        echo " Check restart: compare 1 run of 2 x $Nit it long"
        echo "     with 2 consecutive runs of $Nit it long each"
        echo " where: flag = 0 -> prepare (from a previous run) pickup & data files"
-       echo "        flag = 1 -> do the 3 runs (with EXECUTABLE, default=mitgcmuv)"
+       echo "        flag = 1 -> do the 3 runs (using COMMAND"
+       echo "                         or simply using EXECUTABLE, default=$gcmEXE)"
        echo "        flag = 2 -> compare std_outp"
        echo "        flag = 3 -> compare pickup files"
        echo "        flag = 4 -> clean-up output files"
+       echo "       flag = NC -> do 0,1,2,3 sequentially (no cleaning)"
        echo "      flag = All -> do 0,1,2,3,4 sequentially"
        exit 9 ;;
  esac
- flag=$1
+ if test $flag = 'NC' -o $flag = 'All' ; then Multi=1 ; else Multi=0 ; fi
+ #-- set the run-command :
+ if test "x$cmdEXE" = x
+ then
+   if [ $mpi -ge 1 ] ; then
+     cmdEXE="mpirun -machinefile ../../mf -v -np 2 $gcmEXE"
+   else
+     cmdEXE=$gcmEXE
+   fi
+ fi
+ echo "cmdEXE='$cmdEXE'"
  #=========================
- if test $flag = '0' -o $flag = 'All' ; then
+ if test $flag = '0' -o $Multi = '1' ; then
  #----------------------------------------------------------------------
+ # check for executable:
+ if test ! -x $gcmEXE
+   echo "file '$gcmEXE' does not exist or is not executable"
+   exit 7
+ fi
  # last pickup written (from previous run):
  if [ $mpi -ge 1 ]
  then outpRun='STDOUT.0000'
  else outpRun='output.txt'
  fi
  if test -r $outpRun
  then
  # grep ' %CHECKPOINT ' $outpRun | tail -1
    lastPick=`grep ' %CHECKPOINT ' $outpRun | sed 's/^.*%CHECKPOINT //' | tail -1`
    if test "x$lastPick" = x
    then
      echo "no pickup information written in '$outpRun' from previous run"
      exit 8
    else
      iter=`echo $lastPick | awk '{print $1}'`
-     zz=`echo $lastPick | awk '{print $2}'`
+     sufx=`echo $lastPick | awk '{print $2}'`
-     echo "from previous run std.outp, lastPick='$lastPick' ; iter='$iter' ; zz='$zz'"
+     echo "from previous run std.outp, lastPick='$lastPick' ; iter='$iter' ; sufx='$sufx'"
    fi
  else
    echo "no standard output file '$outpRun' from previous run"
    exit 7
  fi
- #- rename pickup (if needed)
- sufx=`printf "%10.10i\n" $iter`
- if test $zz = $sufx
- then
-  echo "no need to change pickup sufix"
- else
- # echo "rename pickup sufix: $zz -> $sufx"
-  listP=`ls pickup*.${zz}* 2> /dev/null | sed 's/\..*//g' | uniq`
-  if test "x$listP" = x
-  then echo ' rename' $zz  '->' $sufx ': no file to rename'
-  else
-   if [ $prt -ge 1 ] ; then echo ' rename' $zz  '->' $sufx 'for all:' $listP ; fi
-   for yy in $listP
-   do
-     listF=`ls -1 $yy.${zz}*`
-     for xx in $listF
-     do
-       new=`echo $xx | sed "s/^$yy\.$zz/$yy\.$sufx/"`
-       if [ $prt -ge 2 ] ; then echo '  '$cmd $xx $new ; fi
-       if test $action = 1 ; then    $cmd $xx $new ; fi
-     done
-   done
-  fi
- fi
  #-------------------------
  echo "prepare parameter file 'data.tst' :"
  cp -p -f data data.tst
- listOut='startTime endTime nIter0 nTimeSteps nEndIter chkPtFreq pChkPtFreq globalFiles'
+ listOut='startTime endTime nIter0 nTimeSteps nEndIter chkPtFreq pChkPtFreq'
- listOut=$listOut' useSingleCpuIO pickupSuff usePickupBeforeC54 mdsioLocalDir'
+ listOut=$listOut' pickupSuff usePickupBeforeC54 mdsioLocalDir pickupStrictlyMatch'
  #- comment out (in data.tst) all parameters from list: 'listOut'
  for yy in $listOut
  do
-Line 149 
 mv -f data.tmp_$$ data.tst
+Line 178 
 mv -f data.tmp_$$ data.tst
  sed "/^ *\&PARM03/a \ nIter0=$iter," data.tst > data.tmp_$$
  mv -f data.tmp_$$ data.tst
  echo "prepare file 'data.tst' : done"
  if  [ $prt -ge 1 ] ; then
    echo ' diff data.tst data' ; diff data.tst data ; echo ' ' ;
  fi
  #---- clean up current dir: move output to temp_tst dir:
-Line 158 
 if test $action = 1 ; then
+Line 187 
 if test $action = 1 ; then
   mkdir $tmpDir
   mv -f *.data $tmpDir
   mv -f *.meta $tmpDir
-  mv -f *.txt $tmpDir
+  mv -f *.txt $tmpDir 2> /dev/null
-  listS=`ls $tmpDir/pickup*.${sufx}* 2> /dev/null | head -1`
+  mv -f STD???.0[0-9][0-9][0-9] $tmpDir
-  if test "x$listS" != x ; then mv $tmpDir/pickup*.${sufx}* . ; fi
  #- move main parameter file "data":
   mv -f data $tmpDir
  #- do not deal with MNC pickup at all:
-Line 177 
 if test $action = 1 ; then
+Line 205 
 if test $action = 1 ; then
      for ll in $listN
      do
        sed "$ll s/^./#&/" data.pkg > data.tmp_$$
        if  [ $prt -ge 1 ] ; then echo ' changes in data.pkg'
          diff data.tmp_$$ data.pkg ; echo ' ' ; fi
        mv -f data.tmp_$$ data.pkg
      done
    else if [ $prt -ge 2 ] ; then echo ' : not found' ; echo ' ' ; fi
    fi
  fi
+ #-------------------------
+ #-- link back pickup files
+  listS=`ls $tmpDir/pickup*.${sufx}* 2> /dev/null | head -1`
+  if test "x$listS" != x ; then
+    if [ $prt -ge 1 ] ; then echo ' link back:' $tmpDir'/pickup*.'${sufx}'*' ; fi
+    if test $action = 1 ; then ln -s $tmpDir/pickup*.${sufx}* . ; fi
+  fi
+ #- rename pickup (if needed)
+ nIt0c=`printf "%10.10i\n" $iter`
+ if test $sufx = $nIt0c
+ then
+  echo "no need to change pickup sufix"
+ else
+  listP=`ls pickup*.${sufx}* 2> /dev/null | sed 's/\..*//g' | uniq`
+  if test "x$listP" = x
+  then echo ' rename' $sufx  '->' $nIt0c ': no file to rename'
+  else
+   if [ $prt -ge 1 ] ; then echo ' rename' $sufx  '->' $nIt0c 'for all:' $listP ; fi
+   for yy in $listP
+   do
+     rnp_loc $yy.${sufx} $yy.$nIt0c
+   done
+  fi
+ fi
  #----------------------------------------------------------------------
  fi
-Line 213 
 num1c=`printf "%10.10i\n" $num1`
+Line 265 
 num1c=`printf "%10.10i\n" $num1`
  num2c=`printf "%10.10i\n" $num2`
  echo " start-end iter: $num0 , $num1 , $num2"
  echo " sufix: '$num0c' '$num1c' '$num2c'"
- echo ' gcmExc='$gcmExc
+ echo ' cmdEXE='$cmdEXE
  #exit
  #---------------------------
- if test $flag = '1' -o $flag = 'All' ; then
+ if test $flag = '1' -o $Multi = '1' ; then
  #----------------------------------------------------------------------
  #- check at the end of each run for pickup with prefix:
  pref='pickup'
-Line 238 
 rm -f STDERR.0000
+Line 290 
 rm -f STDERR.0000
  cp -p data.tst data
  echo '==> START RUN 2 x' $Nit 'it'
  if [ $mpi -ge 1 ]
- then ./$gcmExc std_outp.2it > TTT.out.2it 2>&1
+ then
- else ./$gcmExc > std_outp.2it
+      sleep $wait2run
+      $cmdEXE > TTT.out.2it 2>&1
+      mv STDOUT.0000 std_outp.2it
+      cat TTT.out.2it
+ else $cmdEXE > std_outp.2it
  fi
  mv STDERR.0000 std__err.2it
  out=`egrep -c 'STOP ABNORMAL END' std_outp.2it`
  if test $out != 0
  then echo "==> RUN 2 x $Nit it : ABNORMAL END => exit" ; exit 1 ; fi
- if test -f $pref.ckptA.001.001.data
+ listF=`ls -1 $pref.ckptA*.data 2> /dev/null`
- then echo "==>  END  RUN 2 x $Nit it"
+ if test "x$listF" = x
- else echo "==> RUN 2 x $Nit it STOP without writing $pref => exit" ; exit 1 ; fi
+ then echo "==> RUN 2 x $Nit it STOP without writing $pref => exit" ; exit 1
+ else echo "==>  END  RUN 2 x $Nit it" ; fi
  listP=`ls pickup*.ckptA* | sed 's/\..*//g' | uniq`
  echo ' listP=' $listP
  for xx in $listP
  do
    rnp_loc $xx.ckptA $xx.$num2c
  done
- mv *.0??.0??.* $dir1
+ move_outp $dir1
- txtF=`ls -1 *.txt 2> /dev/null`
- mv R?.data R?.meta DR?.data DR?.meta $txtF $dir1
- listS=`ls $dir1/pickup*.${num0c}* 2> /dev/null | head -1`
- if test "x$listS" != x ; then mv $dir1/pickup*.${num0c}* . ; fi
  #---  2nd run ( Nit iter , restart from same Iter = num0 as 1rst run )
- sed "s/^ nTimeSteps=$Dbl/ nTimeSteps=$Nit/g" data.tst > data
+ sed "s/^ nTimeSteps=$Dbl/ nTimeSteps=$Nit/g" data.tst > data.tmp
+ mv -f data.tmp data
  echo '==> START RUN 1iA'
  if [ $mpi -ge 1 ]
- then ./$gcmExc std_outp.1iA > TTT.out.1iA 2>&1
+ then
- else ./$gcmExc > std_outp.1iA
+      sleep $wait2run
+      $cmdEXE > TTT.out.1iA 2>&1
+      mv STDOUT.0000 std_outp.1iA
+      cat TTT.out.1iA
+ else $cmdEXE > std_outp.1iA
  fi
  mv STDERR.0000 std__err.1iA
  out=`egrep -c 'STOP ABNORMAL END' std_outp.1iA`
  if test $out != 0
  then echo "==> RUN 1iA : ABNORMAL END => exit" ; exit 2 ; fi
- if test -f $pref.ckptA.001.001.data
+ listF=`ls -1 $pref.ckptA*.data 2> /dev/null`
- then echo "==>  END  RUN 1iA"
+ if test "x$listF" = x
- else echo "==> RUN 1iA STOP without writing $pref => exit" ; exit 2 ; fi
+ then echo "==> RUN 1iA STOP without writing $pref => exit" ; exit 2
+ else echo "==>  END  RUN 1iA" ; fi
  for xx in $listP
  do
   rnp_loc $xx.ckptA $xx.$num1c
  done
- mv *.0??.0??.* $dir2
+ move_outp $dir2
- txtF=`ls -1 *.txt 2> /dev/null`
- mv R?.data R?.meta DR?.data DR?.meta $txtF $dir2
- listS=`ls $dir2/pickup*.${num0c}* 2> /dev/null | head -1`
- if test "x$listS" != x ; then mv $dir2/pickup*.${num0c}* . ; fi
  #---  3rd run ( Nit iter , restart from 2nd )
  ln -s $dir2/pickup*.$num1c.* .
  sed "s/^ nIter0=$num0/ nIter0=$num1/g" data > data.tmp
  mv -f data.tmp data
  echo '==> START RUN 1iB'
  if [ $mpi -ge 1 ]
- then ./$gcmExc std_outp.1iB > TTT.out.1iB 2>&1
+ then
- else ./$gcmExc > std_outp.1iB
+      sleep $wait2run
+      $cmdEXE > TTT.out.1iB 2>&1
+      mv STDOUT.0000 std_outp.1iB
+      cat TTT.out.1iB
+ else $cmdEXE > std_outp.1iB
  fi
  mv STDERR.0000 std__err.1iB
  out=`egrep -c 'STOP ABNORMAL END' std_outp.1iB`
  if test $out != 0
  then echo "==> RUN 1iB : ABNORMAL END => exit" ; exit 3 ; fi
- if test -f $pref.ckptA.001.001.data
+ listF=`ls -1 $pref.ckptA*.data 2> /dev/null`
- then echo "==>  END  RUN 1iB"
+ if test "x$listF" = x
- else echo "==> RUN 1iB STOP without writing $pref => exit" ; exit 3 ; fi
+ then echo "==> RUN 1iB STOP without writing $pref => exit" ; exit 3
+ else echo "==>  END  RUN 1iB" ; fi
  for xx in $listP
  do
   rnp_loc $xx.ckptA $xx.$num2c
  done
- mv *.0??.0??.* $dir3
+ # remove pickup*.$mun1c* sym-link:
- txtF=`ls -1 *.txt 2> /dev/null`
+ find . ! -name . -prune -type l -name 'pickup*.'${num1c}'*' -exec rm {} \;
- mv R?.data R?.meta DR?.data DR?.meta $txtF $dir3
+ move_outp $dir3
- listS=`ls $dir3/pickup*.${num0c}* 2> /dev/null | head -1`
- if test "x$listS" != x ; then mv $dir3/pickup*.${num0c}* . ; fi
- rm $dir3/pickup*.$num1c.*
  rm data
  #----------------------------------------------------------------------
  fi
- if test $flag = '2' -o $flag = 'All' ; then
+ if test $flag = '2' -o $Multi = '1' ; then
  #----------------------------------------------------------------------
- echo ' ' ; echo '== compare cg2d_init_res :'
+ listCGini="2"
- echo ' run 1iA:'
+ #-- check if using 3-D solver
-  grep "cg2d_init_res" std_outp.1iA \
+   nn=`grep -i -c "^ *nonHydrostatic *= *\.TRUE\." data.tst`
-       | sed 's/.* cg2d_init_res =//'
+  if [ $nn -eq 0 ] ; then
- echo ' run 1iB:'
+   nn=`grep -i -c "^ *implicitIntGravWave *= *\.TRUE\." data.tst`
-  grep "cg2d_init_res" std_outp.1iB \
+  fi
-       | sed 's/.* cg2d_init_res =//'
+ if [ $nn -ge 1 ] ; then listCGini="$listCGini 3"; fi
- echo ' run 2it:'
+ for nn in $listCGini
-  grep "cg2d_init_res" std_outp.2it \
+ do
-       | sed 's/.* cg2d_init_res =//'
+   echo ' ' ; echo "== compare cg${nn}d_init_res :"
+   echo ' run 1iA:'
+    grep "cg${nn}d_init_res" std_outp.1iA \
+         | sed "s/.* cg${nn}d_init_res =//"
+   echo ' run 1iB:'
+    grep "cg${nn}d_init_res" std_outp.1iB \
+         | sed "s/.* cg${nn}d_init_res =//"
+   echo ' run 2it:'
+    grep "cg${nn}d_init_res" std_outp.2it \
+         | sed "s/.* cg${nn}d_init_res =//"
+ done
  #----------------------------------------------------------------------
  fi
- if test $flag = '3' -o $flag = 'All' ; then
+ if test $flag = '3' -o $Multi = '1' ; then
  #----------------------------------------------------------------------
  echo ' '
  echo "== diff pickup files : end of 1rst run (2x$Nit it) & end of 3rd run (2nd $Nit it)"
  listP=`( cd $dir1 ; ls pickup*.$num2c* | sed 's/\..*//g' | uniq )`
  chkmeta='Y'
  for yy in $listP
  do
-  listY=`(cd $dir1 ; ls $yy.$num2c.*.data | sed "s/$yy\.$num2c\.//" | sed "s/\.data//")`
+  listY=`(cd $dir1 ; ls $yy.$num2c*.data | sed "s/$yy\.$num2c//" | sed "s/data$//")`
   zz=$yy.$num2c
   echo '--> file='$zz', listY='$listY
   for xx in $listY
   do
-    echo ' diff' $dir1/$zz.$xx.data $dir3
+    echo ' diff' $dir1/$zz${xx}data $dir3
-    diff $dir1/$zz.$xx.data $dir3
+    diff $dir1/$zz${xx}data $dir3
     out=$?
     if test $out != 0 ; then
      echo 'Diff outp=' $out ' ==> stop'
      exit 4
     fi
-    if test $chkmeta = 'Y' -a -f $dir1/$zz.$xx.meta ; then
+    if test $chkmeta = 'Y' -a -f $dir1/$zz${xx}meta ; then
-     echo ' diff' $dir1/$zz.$xx.meta $dir3
+     echo ' diff' $dir1/$zz${xx}meta $dir3
-     diff $dir1/$zz.$xx.meta $dir3
+     diff $dir1/$zz${xx}meta $dir3
      out=$?
      if test $out != 0 ; then
       echo 'Diff outp=' $out ' ==> stop'
       exit 5
      fi
-Line 363 
 fi
+Line 430 
 fi
  if test $flag = '4' -o $flag = 'All' ; then
  #-------------
  echo ' '
  echo "== clean-up and reset :"
+  echo '--> remove pickup*.'$num0c'* sym-links:'
+ #find . ! -name . -prune -type l -name 'pickup*.'${num0c}'*' -exec rm {} \;
+  listS=`find . ! -name . -prune -type l -name 'pickup*.'${num0c}'*'`
+  if [ $prt -ge 2 ] ; then echo ' rm' $listS ; fi
+  rm -f $listS
   echo '--> remove output dir and output files:'
   echo ' rm -rf' $dir1 $dir2 $dir3
   rm -rf $dir1 $dir2 $dir3
   echo ' rm -f' std_????.?i?
   rm -f std_????.?i?
+  rm -f TTT.out.?i? 2> /dev/null
   echo ' rm -f' data.pkg data.tst
   rm -f data.pkg data.tst
  #- move back files from temp_tst dir:

 Legend:



Removed from v.1.1
 


changed lines


 
Added in v.1.10
 Legend:



Removed from v.1.1
 


changed lines


 
Added in v.1.10
-Removed from v.1.1
+Added in v.1.10

	ViewVC Help
Powered by ViewVC 1.1.22