Changeset 5461 for BOL/script_install/check_version.sh

Timestamp:

Dec 31, 2024, 12:29:57 PM (5 days ago)

Author:

fhourdin

Message:

Quality control improvements

File:

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

BOL/script_install/check_version.sh

@@ -105 +105 @@
 fi
 
+if [ -d $MODEL ] ; then
+   mv $MODEL ${MODEL}_$$
+fi
+
 echo version $version $branche $datelmdz
 RESU_D=~/WWW/RESUBENCH/$branche/$compilo
@@ -127 +131 @@
    cd $tmpdir
    if [ "$rel_svn" = "" ] ; then opt_svn="" ; else opt_svn="-r $rel_svn" ; fi
-   \rm -f install_lmdz.sh ; $get/pub/install_lmdz.sh ; chmod +x install_lmdz.sh
+#   \rm -f install_lmdz.sh ; $get/pub/install_lmdz.sh ; chmod +x install_lmdz.sh
+# Le temps de confirmer la bascule
+   \rm -f install_lmdz.sh ; $get/pub/install_lmdz_old.sh ; \mv install_lmdz_old.sh install_lmdz.sh ; chmod +x install_lmdz.sh
    # On install sans les bench pour que les benchs soient faits à la main
    # ./install_lmdz.sh -v $version $opt_svn -d $resolution -SCM -parallel $parallel -veget CMIP6
@@ -168 +174 @@
 cd $BENCH ; $get/pub/3DBenchs/BENCHCMIP6.tar.gz . ;  tar xvf BENCHCMIP6.tar.gz 
 sed -i'' -e "s:VEGET=n:VEGET=y:" config.def
-./compilegcm_fcm.sh ; ./bench.sh > out.bench 2>&1
+./compilegcm_fcm.sh  -v orchidee2.0 ; ./bench.sh > out.bench 2>&1
 
 
@@ -243 +249 @@
 
    cd $LMDZdir/$BENCH
-   if [ -f compilegcm.sh -a $check_compile = 1 ] ; then
+   if [ -f compilegcm_fcm.sh -a $check_compile = 1 ] ; then
       \rm -f gcm.e
-      ./compilegcm.sh -debug
+      ./compilegcm_fcm.sh -debug
       mkdir SIMD
       cd SIMD
@@ -333 +339 @@
       pwd
       $get/Distrib/initialisation.sh
-      sed -e 's/grid_resolution=48x36x39/grid_resolution='$resolution'/' initialisation.sh > ini.sh
-      chmod +x ini.sh ; ./ini.sh
+      sed -e 's/grid_resolution=48x36x39/grid_resolution='$resolution'/' \
+          -e 's/makelmdz/makelmdz_fcm -arch $arch/' initialisation.sh > ini_fcm.sh
+      chmod +x ini_fcm.sh ; ./ini_fcm.sh
       if [ -f limit.nc ] ; then
          var=Tsoil01srf01
@@ -384 +391 @@
 
 ccc=$converge$convergeNP$convergeD$converge1D$convergeI
-if [ "$ccc" = "SNDUI" ] ; then ccc="OK " ;  fi
+if [ "$ccc" = "SNDUI" ] ; then ccc="OK " 
+        elif [ "$ccc" = "SNDUx" ] ; then
+                ccc="OKx"
+fi
 
 
@@ -441 +451 @@
   \rm -rf $tmpdir/LMDZ$version
 fi
-
+grep -q 'OK     SNDUx   OK2     OK' tmp.resu
+RET=$?
+if [ ${RET} -eq 0 ] ; then
+  echo "Quality control checks out for version $version"
+  echo "We cleanup $tmpdir/LMDZ$version"
+  echo "\rm -rf $tmpdir/LMDZ$version"
+  \rm -rf $tmpdir/LMDZ$version
+fi