Changeset 3935 for BOL

Timestamp:

Jun 15, 2021, 10:16:38 AM (3 years ago)

Author:

Laurent Fairhead

Message:

Rajout d'une option -j au script pour ne faire que les comparaisons sans écriture dans RESUBENCH

File:

• BOL/script_install/check_version.sh (modified) (12 diffs)

BOL/script_install/check_version.sh

@@ -15 +15 @@
 parallel=none
 parallel=mpi_omp
+justcheck=0 # just compare results not writing of results in RESUBENCH
 tmpdir=/tmp/`whoami` ; mkdir -p $tmpdir
 
@@ -51 +52 @@
       "-c")
           compilo="$2" ; shift ; shift ;;
+      "-j")
+          justcheck="$2" ; shift ; shift ;;
       *)
           version="$1" ; shift ; if [ "$#" = 1 ] ; then version_ref=$1 ; shift ; fi ;;
@@ -70 +73 @@
 
 # recuperation de la version a laquelle on compare pour le message final :
-comparea=`ls -l $RESU_D/$version_ref | awk -F/ ' { print $NF } '`
+comparea=`ls -ld $RESU_D/$version_ref | awk -F/ ' { print $NF } '`
 
 #  LANCEMENT D UN CERTAIN NOMBRE DE TESTS
@@ -80 +83 @@
 if [ $diagonly = 0 ] ; then
   \rm -f install_lmdz.sh ; $get/install_lmdz.sh ; chmod +x install_lmdz.sh
-  ./install_lmdz.sh -v $version -d $resolution -SCM -parallel $parallel
+  ./install_lmdz.sh -v $version -d $resolution -SCM -parallel $parallel -veget CMIP6
 fi
 
@@ -88 +91 @@
 outf=$MODEL/1D/EXEC/NPv6.1L79/ARMCU/REF/restartphy.nc
 if [ -f $outf ] ; then
-   mkdir -p $resubench/ARMCU/REF
-   cp $MODEL/1D/EXEC/NPv6.1L79/ARMCU/REF/restartphy.nc $resubench/ARMCU/REF/
-   cmp -s $resubench/ARMCU/REF/restartphy.nc $latest/ARMCU/REF/restartphy.nc
-   if [ $? = 0 ] ; then converge1D=U ; else converge1D=u ; fi
+    if [ $justcheck = 0 ] ; then
+        mkdir -p $resubench/ARMCU/REF
+        cp $MODEL/1D/EXEC/NPv6.1L79/ARMCU/REF/restartphy.nc $resubench/ARMCU/REF/
+    fi
+#   cmp -s $resubench/ARMCU/REF/restartphy.nc $latest/ARMCU/REF/restartphy.nc
+    cmp -s $MODEL/1D/EXEC/NPv6.1L79/ARMCU/REF/restartphy.nc $latest/ARMCU/REF/restartphy.nc
+    if [ $? = 0 ] ; then converge1D=U ; else converge1D=u ; fi
 else
    converge1D=-
@@ -125 +131 @@
 #    Les resultats de la simulation debug sont dans SIMD
 
-   mkdir -p $resubench/$BENCH
+   if [ $justcheck = 0 ] ; then mkdir -p $resubench/$BENCH; fi
    if [ -f restartphy.nc ] ; then
-      ncks -M -m -h -v ps -O restart.nc $resubench/$BENCH/ps.nc
-      cp restart.nc $resubench/$BENCH/restart.nc
-      cmp -s $resubench/$BENCH/restart.nc $latest/$BENCH/restart.nc
+       if [ $justcheck = 0 ] ; then
+           ncks -M -m -h -v ps -O restart.nc $resubench/$BENCH/ps.nc
+           cp restart.nc $resubench/$BENCH/restart.nc
+       fi
+#       cmp -s $resubench/$BENCH/restart.nc $latest/$BENCH/restart.nc
+       cmp -s ./restart.nc $latest/$BENCH/restart.nc
       if [ $? = 0 ] ; then converge=S ; else converge=s ; fi
    else
@@ -143 +152 @@
    suf=NPv5.5
    suf=NPv6.0.14splith
-   cp -f config.def_oraer config.def
+#   cp -f config.def_oraer config.def
+   sed -e 's/VEGET=y/VEGET=n/' config.def_oraer > config.def
    if [ -f physiq.def_$suf ] ; then \cp -f physiq.def_$suf physiq.def ; fi
    if [ $diagonly = 0 ] ; then 
@@ -180 +190 @@
 #   if [ -f restartphy.nc ] ; then  Correction 2017/04/26
    if [ -f SIM1/restartphy.nc ] ; then
-      ncks -M -m -h -v ps -O SIM1/restart.nc $resubench/$BENCH/ps$suf.nc
-      cp SIM1/restart.nc $resubench/$BENCH/restart$suf.nc
-      \rm sechiba_out_2.nc sechiba_history.nc sechiba_rest_out.nc
-      cmp -s $resubench/$BENCH/restart$suf.nc $latest/$BENCH/restart$suf.nc
+       if [ $justcheck = 0 ] ; then
+           ncks -M -m -h -v ps -O SIM1/restart.nc $resubench/$BENCH/ps$suf.nc
+           cp SIM1/restart.nc $resubench/$BENCH/restart$suf.nc
+       fi
+       \rm sechiba_out_2.nc sechiba_history.nc sechiba_rest_out.nc
+#       cmp -s $resubench/$BENCH/restart$suf.nc $latest/$BENCH/restart$suf.nc
+       cmp -s SIM1/restart.nc $latest/$BENCH/restart$suf.nc
       if [ $? = 0 ] ; then convergeNP=N ; else convergeNP=n ; fi
    else
@@ -202 +215 @@
       suf=D
       if [ -f SIMD/restartphy.nc ] ; then
-         ncks -M -m -h -v ps -O SIMD/restart.nc $resubench/$BENCH/ps$suf.nc
-         cp SIMD/restart.nc $resubench/$BENCH/restart$suf.nc
-         cmp -s $resubench/$BENCH/restart$suf.nc $latest/$BENCH/restart$suf.nc
-         if [ $? = 0 ] ; then convergeD=D ; else convergeD=d ; fi
+          if [ $justcheck = 0 ] ; then
+              ncks -M -m -h -v ps -O SIMD/restart.nc $resubench/$BENCH/ps$suf.nc
+              cp SIMD/restart.nc $resubench/$BENCH/restart$suf.nc
+          fi
+          cmp -s SIMD/restart.nc $latest/$BENCH/restart$suf.nc
+          if [ $? = 0 ] ; then convergeD=D ; else convergeD=d ; fi
       else
          convergeD=-
@@ -224 +239 @@
    if [ -f limit.nc ] ; then
       var=Tsoil01srf01
-      mkdir -p $resubench/START$resolution
-      ncks -M -m -h -v $var startphy.nc -O  $resubench/START$resolution/$var.nc
-      cp startphy.nc $resubench/START$resolution/
+      if [ $justcheck = 0 ] ; then
+          mkdir -p $resubench/START$resolution
+          ncks -M -m -h -v $var startphy.nc -O  $resubench/START$resolution/$var.nc
+          cp startphy.nc $resubench/START$resolution/
+      fi
 #!     cmp -s  $resubench/START$resolution/$var.nc  $latest/START$resolution/$var.nc
-      cmp -s  $resubench/START$resolution/startphy.nc  $latest/START$resolution/startphy.nc
+       cmp -s  startphy.nc  $latest/START$resolution/startphy.nc
       if [ $? = 0 ] ; then
           init=OK
@@ -237 +254 @@
       init=-
    fi
+########################################################################
+   echo end of test cases
+########################################################################   
    bench=OK
 else
@@ -243 +263 @@
 fi
 
-latest=$RESU_D/latest
-\rm -f $latest
-ln -sf  $resubench $latest
+if [ $justcheck = 0 ] ; then
+    latest=$RESU_D/latest
+    \rm -f $latest
+    ln -sf  $resubench $latest
+fi
+
 
 cd $MODEL/m*/m*/